Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 915255f5 by Tony Chemit at 2022-11-16T16:14:03+01:00 Ordonner les colonnes du tableau captures selon l'ordre des champs sur le formulaire - Closes #2535 - - - - - 7 changed files: - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java - core/api/services/src/main/i18n/getters/labels.getter - 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/containerChildDataDtoProperties.properties Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/navigation.getter ===================================== @@ -6,6 +6,7 @@ observe.Common.fate observe.Common.fate.short observe.Common.fateVessel observe.Common.fateVessel.short +observe.Common.informationSource observe.Common.list.message.none observe.Common.measuredCount observe.Common.measuredCount.short @@ -23,6 +24,7 @@ observe.Common.usedInTrip observe.Common.usedInTrip.short observe.Common.weightCategory observe.Common.weightCategory.short +observe.Common.weightMeasureMethod observe.Common.well observe.Common.well.short observe.data.GearUseFeatures.action.create @@ -186,6 +188,7 @@ observe.data.ps.observation.Catch.action.save observe.data.ps.observation.Catch.action.save.tip observe.data.ps.observation.Catch.catchWeight observe.data.ps.observation.Catch.catchWeight.short +observe.data.ps.observation.Catch.informationSource.short observe.data.ps.observation.Catch.maxWeight observe.data.ps.observation.Catch.maxWeight.short observe.data.ps.observation.Catch.meanLength @@ -201,6 +204,7 @@ observe.data.ps.observation.Catch.title observe.data.ps.observation.Catch.totalCount observe.data.ps.observation.Catch.totalCount.short observe.data.ps.observation.Catch.type +observe.data.ps.observation.Catch.weightMeasureMethod.short observe.data.ps.observation.FloatingObject.action.add observe.data.ps.observation.FloatingObject.action.add.tip observe.data.ps.observation.FloatingObject.navigation.unsaved ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java ===================================== @@ -121,13 +121,27 @@ class SetCatchUITableModel extends GeneratedSetCatchUITableModel { @Override public void initTableUISize(JTable table) { + // species + // speciesFate + // reasonForDiscard + // catchWeight UIHelper.fixTableColumnWidth(table, 3, 55); - UIHelper.fixTableColumnWidth(table, 4, 65); - UIHelper.fixTableColumnWidth(table, 5, 75); - UIHelper.fixTableColumnWidth(table, 6, 55); + // totalCount + UIHelper.fixTableColumnWidth(table, 4, 55); + // weightMeasureMethod + // minWeight + UIHelper.fixTableColumnWidth(table, 6, 50); + // maxWeight UIHelper.fixTableColumnWidth(table, 7, 50); + // meanWeight UIHelper.fixTableColumnWidth(table, 8, 50); + // meanLength UIHelper.fixTableColumnWidth(table, 9, 50); + // well + UIHelper.fixTableColumnWidth(table, 10, 50); + // informationSource + // comment + UIHelper.fixTableColumnWidth(table, 12, 50); } @Override ===================================== core/api/services/src/main/i18n/getters/labels.getter ===================================== @@ -1066,6 +1066,7 @@ observe.data.ps.observation.Catch.catchWeight.short observe.data.ps.observation.Catch.catchWeightComputed.computed.tip observe.data.ps.observation.Catch.catchWeightComputed.observed.tip observe.data.ps.observation.Catch.catchWeightTotalCount +observe.data.ps.observation.Catch.informationSource.short observe.data.ps.observation.Catch.maxWeight observe.data.ps.observation.Catch.maxWeight.short observe.data.ps.observation.Catch.meanLength @@ -1090,6 +1091,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip observe.data.ps.observation.Catch.totalCountComputed.observed.tip observe.data.ps.observation.Catch.type observe.data.ps.observation.Catch.weightMeasureMethod +observe.data.ps.observation.Catch.weightMeasureMethod.short observe.data.ps.observation.FloatingObject.action.add observe.data.ps.observation.FloatingObject.action.add.tip observe.data.ps.observation.FloatingObject.buoysTab ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1276,6 +1276,7 @@ observe.data.ps.observation.Catch.catchWeight.validation.required=Weight or esti observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Catch weight was computed (%s) observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Catch weight was observed observe.data.ps.observation.Catch.catchWeightTotalCount=Total weight estimated (in t) / Estimated count +observe.data.ps.observation.Catch.informationSource.short=Information source observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg) observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg) observe.data.ps.observation.Catch.meanLength=Mean length (in cm) @@ -1304,6 +1305,7 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Count was obse observe.data.ps.observation.Catch.type=Catch observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species. observe.data.ps.observation.Catch.weightMeasureMethod=Total weight measure method +observe.data.ps.observation.Catch.weightMeasureMethod.short=Total weight measure method observe.data.ps.observation.FloatingObject.action.add=Add FAD observe.data.ps.observation.FloatingObject.action.add.tip=Add a FAD to the activity observe.data.ps.observation.FloatingObject.buoysTab=Beacon ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1276,6 +1276,7 @@ observe.data.ps.observation.Catch.catchWeight.validation.required=Debe seleccion observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Peso estimado calculado observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Peso estimado observado observe.data.ps.observation.Catch.catchWeightTotalCount=Pesos total estimados (en t) / Número estimado +observe.data.ps.observation.Catch.informationSource.short=Information source TODO observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg) TODO observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg) observe.data.ps.observation.Catch.meanLength=Talla media (en cm) @@ -1291,7 +1292,7 @@ observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=El peso medio observe.data.ps.observation.Catch.meanWeightMeanLength=Peso medio (en kg) / Talla media (en cm) observe.data.ps.observation.Catch.minMaxWeight=Lower / upper weight limit (in kg) TODO observe.data.ps.observation.Catch.minWeight=Lower weight limit (in kg) TODO -observe.data.ps.observation.Catch.minWeight.short=Max weight (in kg) +observe.data.ps.observation.Catch.minWeight.short=Max weight observe.data.ps.observation.Catch.reasonForDiscard=Razón del descarte observe.data.ps.observation.Catch.reasonForDiscard.short=Razón del descarte observe.data.ps.observation.Catch.speciesFate.short=Devenir @@ -1304,6 +1305,7 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip=El número est observe.data.ps.observation.Catch.type=Captura observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species. \#TODO observe.data.ps.observation.Catch.weightMeasureMethod=Método de medición de total peso +observe.data.ps.observation.Catch.weightMeasureMethod.short=Método de medición de total peso observe.data.ps.observation.FloatingObject.action.add=Añadir un FOB observe.data.ps.observation.FloatingObject.action.add.tip=Añadir un objeto flotante a la actividad observe.data.ps.observation.FloatingObject.buoysTab=Baliza ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1276,22 +1276,23 @@ observe.data.ps.observation.Catch.catchWeight.validation.required=Une des deux v observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Le poids estimé a été calculé (%s) observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Le poids estimé a été observé observe.data.ps.observation.Catch.catchWeightTotalCount=Poids total estimé (en t) / Nombre estimé +observe.data.ps.observation.Catch.informationSource.short=Origine de l'information observe.data.ps.observation.Catch.maxWeight=Borne de poids supérieure (en kg) -observe.data.ps.observation.Catch.maxWeight.short=Poids max (en kg) +observe.data.ps.observation.Catch.maxWeight.short=P max observe.data.ps.observation.Catch.meanLength=Taille moyenne (en cm) observe.data.ps.observation.Catch.meanLength.short=Taille observe.data.ps.observation.Catch.meanLength.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=La taille moyenne a été calculée (%s) observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=La taille moyenne a été observée observe.data.ps.observation.Catch.meanWeight=Poids moyen (en kg) -observe.data.ps.observation.Catch.meanWeight.short=Poids moy +observe.data.ps.observation.Catch.meanWeight.short=P moy observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s) observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=Le poids moyen a été observé observe.data.ps.observation.Catch.meanWeightMeanLength=Poids moyen (en kg) / Taille moyenne (en cm) observe.data.ps.observation.Catch.minMaxWeight=Borne de poids inférieure / supérieure (en kg) observe.data.ps.observation.Catch.minWeight=Borne de poids inférieure (en kg) -observe.data.ps.observation.Catch.minWeight.short=Poids min (en kg) +observe.data.ps.observation.Catch.minWeight.short=P min observe.data.ps.observation.Catch.reasonForDiscard=Raison rejet observe.data.ps.observation.Catch.reasonForDiscard.short=Raison rejet observe.data.ps.observation.Catch.speciesFate.short=Devenir @@ -1304,6 +1305,7 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Le nombre esti observe.data.ps.observation.Catch.type=Captures observe.data.ps.observation.Catch.validation.missing.observedSystem=Un des systèmes observés %s doit être sélectionné pour l'espèce sélectionnée. observe.data.ps.observation.Catch.weightMeasureMethod=Méthode de mesure du poids total +observe.data.ps.observation.Catch.weightMeasureMethod.short=Méthode de mesure du poids total observe.data.ps.observation.FloatingObject.action.add=Ajouter un DCP observe.data.ps.observation.FloatingObject.action.add.tip=Ajouter un objet flottant à l'activité observe.data.ps.observation.FloatingObject.buoysTab=Balise ===================================== model/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties ===================================== @@ -42,7 +42,7 @@ data.ps.localmarket.SampleSpecies=species,sizeMeasureType,measuredCount,comment data.ps.logbook.Catch=species,weightCategory,speciesFate,well,weight,count,comment data.ps.logbook.SampleSpecies=subSampleNumber,species,sizeMeasureType,measuredCount,totalCount,comment data.ps.logbook.WellActivity=activity,wellActivitySpecies -data.ps.observation.Catch=species,speciesFate,reasonForDiscard,well,catchWeight,totalCount,minWeight,meanWeight,maxWeight,meanLength,comment +data.ps.observation.Catch=species,speciesFate,reasonForDiscard,catchWeight,totalCount,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource,comment data.ps.observation.NonTargetCatchRelease=species,sex,speciesGroupReleaseMode,conformity,releasingTime,length,comment data.ps.observation.ObjectObservedSpecies=species,speciesStatus,count data.ps.observation.ObjectSchoolEstimate=species,totalWeight View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/915255f5ba4087b948be0519fb... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/915255f5ba4087b948be0519fb... You're receiving this email because of your account on gitlab.com.