Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 6bfa4d87 by Tony Chemit at 2022-11-25T12:33:07+01:00 Proportions d'affichage changeantes sur le formulaire PS / observations / Echantillons - Closes #2542 - - - - - 8 changed files: - 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/observation/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIHandler.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/i18nLabels.properties Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -209,7 +209,9 @@ observe.data.ps.observation.Route.startLogValue observe.data.ps.observation.Sample.message.cantAdd observe.data.ps.observation.SampleMeasure.count observe.data.ps.observation.SampleMeasure.length +observe.data.ps.observation.SampleMeasure.lengthCountWeight observe.data.ps.observation.SampleMeasure.picturesReferences +observe.data.ps.observation.SampleMeasure.picturesReferencesTagNumber observe.data.ps.observation.SampleMeasure.weight observe.data.ps.observation.SchoolEstimate.meanWeight observe.data.ps.observation.SchoolEstimate.species ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx ===================================== @@ -69,110 +69,87 @@ text="observe.data.ps.observation.Sample.message.cantAdd"/> <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean"> - - <!-- acquisition mode - species - measure types --> - <row> + <row> <cell columns="2"> - <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}"> - <JRadioButton id='acquisitionModeNumber'/> - <JRadioButton id='acquisitionModeIndividual'/> + <JPanel layout="{new BorderLayout()}"> + <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}" constraints='BorderLayout.WEST'> + <JRadioButton id='acquisitionModeNumber'/> + <JRadioButton id='acquisitionModeIndividual'/> + </JPanel> + <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints='BorderLayout.CENTER'> + <row> + <cell> + <JLabel id='speciesLabel' styleClass="i18n"/> + </cell> + <cell weightx="1"> + <FilterableComboBox id='species' genericType='SpeciesReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> + </cell> + <cell> + <FilterableComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> + </cell> + <cell> + <FilterableComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> + </cell> + </row> + </Table> </JPanel> </cell> - <cell columns="2" weightx='1' anchor='east'> - <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'> - <row> - <cell> - <JLabel id='speciesLabel' styleClass="i18n"/> - </cell> - <cell weightx="1"> - <FilterableComboBox id='species' genericType='SpeciesReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <FilterableComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <FilterableComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> - </cell> - </row> - </Table> - </cell> </row> - - <!-- length --> - <!-- count --> <row> <cell> - <JLabel id='lengthLabel'/> + <JLabel id='lengthCountWeightLabel'/> </cell> <cell weightx='1' anchor='east'> - <NumberEditor id='length' styleClass="float1"/> - </cell> - <cell> - <JLabel id='countLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='count' styleClass="int6"/> + <JPanel layout="{new GridLayout(1, 0)}"> + <NumberEditor id='length' styleClass="float1"/> + <NumberEditor id='count' styleClass="int6"/> + <NumberEditor id='weight' styleClass="float2"/> + </JPanel> </cell> </row> - - <!-- weight --> - <!-- weightMeasureMethod --> <row> - <cell> - <JLabel id='weightLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='weight' styleClass="float2"/> - </cell> <cell> <JLabel id='weightMeasureMethodLabel'/> </cell> - <cell weightx='1' anchor='east'> + <cell weightx='0.5' anchor='east'> <FilterableComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> - - <!-- sex --> - <!-- speciesFate --> <row> <cell> <JLabel id='sexLabel'/> </cell> - <cell weightx='1' anchor='east'> + <cell weightx='0.5' anchor='east'> <FilterableComboBox id='sex' genericType='SexReference'/> </cell> + </row> + <row> <cell> <JLabel id='speciesFateLabel'/> </cell> - <cell weightx='1' anchor='east'> + <cell weightx='0.5' anchor='east'> <FilterableComboBox id='speciesFate' genericType='SpeciesFateReference'/> </cell> </row> - - <!-- reference pĥoto --> - <!-- tagNumber --> <row> <cell> - <JLabel id='picturesReferencesLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NormalTextEditor id='picturesReferences'/> - </cell> - <cell anchor='west'> - <JLabel id='tagNumberLabel'/> + <JLabel id='picturesReferencesTagNumberLabel'/> </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='tagNumber'/> + <cell weightx='0.5' anchor='east'> + <JPanel layout="{new GridLayout(1, 0)}"> + <NormalTextEditor id='picturesReferences'/> + <NormalTextEditor id='tagNumber'/> + </JPanel> </cell> </row> </Table> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIHandler.java ===================================== @@ -326,7 +326,7 @@ public class SampleUIHandler extends GeneratedSampleUIHandler { if (notPersisted && !withPrevious) { return ui.getSpecies(); } - return ui.getSex(); + return ui.getLength(); } public void resetIsWeightComputed() { ===================================== core/api/services/src/main/i18n/getters/labels.getter ===================================== @@ -1132,8 +1132,10 @@ observe.data.ps.observation.SampleMeasure.count observe.data.ps.observation.SampleMeasure.count.short observe.data.ps.observation.SampleMeasure.length observe.data.ps.observation.SampleMeasure.length.short +observe.data.ps.observation.SampleMeasure.lengthCountWeight observe.data.ps.observation.SampleMeasure.picturesReferences observe.data.ps.observation.SampleMeasure.picturesReferences.short +observe.data.ps.observation.SampleMeasure.picturesReferencesTagNumber observe.data.ps.observation.SampleMeasure.speciesFate.short observe.data.ps.observation.SampleMeasure.title observe.data.ps.observation.SampleMeasure.type ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1355,8 +1355,10 @@ observe.data.ps.observation.SampleMeasure.count.short=Count observe.data.ps.observation.SampleMeasure.length=Length observe.data.ps.observation.SampleMeasure.length.short=Length observe.data.ps.observation.SampleMeasure.length.validation.required=Weight or size must be filled. +observe.data.ps.observation.SampleMeasure.lengthCountWeight=Length / Count / Individual weight (in kg) observe.data.ps.observation.SampleMeasure.picturesReferences=Pictures references observe.data.ps.observation.SampleMeasure.picturesReferences.short=Pictures references +observe.data.ps.observation.SampleMeasure.picturesReferencesTagNumber=Pictures references / Tag number observe.data.ps.observation.SampleMeasure.speciesFate.short=Species fate observe.data.ps.observation.SampleMeasure.title=Samples observe.data.ps.observation.SampleMeasure.type=Sample measure ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1355,8 +1355,10 @@ observe.data.ps.observation.SampleMeasure.count.short=Grupo de tallas observe.data.ps.observation.SampleMeasure.length=Talla observe.data.ps.observation.SampleMeasure.length.short=Talla observe.data.ps.observation.SampleMeasure.length.validation.required=TODO +observe.data.ps.observation.SampleMeasure.lengthCountWeight=Talla / Grupo de tallas / Peso individual (en kg) observe.data.ps.observation.SampleMeasure.picturesReferences=Referencia foto observe.data.ps.observation.SampleMeasure.picturesReferences.short=Ref. foto +observe.data.ps.observation.SampleMeasure.picturesReferencesTagNumber=Referencia foto / Tag number observe.data.ps.observation.SampleMeasure.speciesFate.short=Species fate observe.data.ps.observation.SampleMeasure.title=Sample measures observe.data.ps.observation.SampleMeasure.type=Sample measures ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1355,8 +1355,10 @@ observe.data.ps.observation.SampleMeasure.count.short=Effectif observe.data.ps.observation.SampleMeasure.length=Longueur observe.data.ps.observation.SampleMeasure.length.short=Longueur observe.data.ps.observation.SampleMeasure.length.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée. +observe.data.ps.observation.SampleMeasure.lengthCountWeight=Longueur / Effectif / Poids individuel (en kg) observe.data.ps.observation.SampleMeasure.picturesReferences=référence photo observe.data.ps.observation.SampleMeasure.picturesReferences.short=Ref photo +observe.data.ps.observation.SampleMeasure.picturesReferencesTagNumber=Référence photo / Id marque observe.data.ps.observation.SampleMeasure.speciesFate.short=Devenir observe.data.ps.observation.SampleMeasure.title=Échantillons observe.data.ps.observation.SampleMeasure.type=Échantillon ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -89,7 +89,7 @@ data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus data.ps.observation.ObjectSchoolEstimate=species,totalWeight,weightMeasureMethod data.ps.observation.Route=activity,comment,date,endLogValue,startLogValue,choice.create.fin.veille.activity,choice.not.create.fin.veille.activity.and.continue,message.need.fin.veille.activity,action.move.all,action.move.all.choose.parent.message,action.move.all.choose.parent.title data.ps.observation.Sample=species,sampleMeasure,speciesFate,length.computed.tip,length.observed.tip,message.cantAdd,weight.computed.tip,weight.observed.tip -data.ps.observation.SampleMeasure=comment,count,length,lengthMeasureMethod,picturesReferences,sex,sizeMeasureType,species,speciesFate,tagNumber,weight,weightMeasureMethod,weightMeasureType,type +data.ps.observation.SampleMeasure=comment,count,length,lengthMeasureMethod,picturesReferences,sex,sizeMeasureType,species,speciesFate,tagNumber,weight,weightMeasureMethod,weightMeasureType,type,lengthCountWeight,picturesReferencesTagNumber data.ps.observation.SchoolEstimate=meanWeight,species,totalWeight,weightMeasureMethod data.ps.observation.Set=currentDirection,currentMeasureDepth,currentSpeed,endDate,endTime,endTimeStamp,haulingEndTimeStamp,haulingStartTimeStamp,maxGearDepth,reasonForNullSet,schoolMeanDepth,schoolThickness,schoolTopDepth,schoolType,startTime,supportVesselName,generalTab,measurementsTab,message.information.schoolType,schoolType.not.fill,sonarUsedAvantSet data.ps.observation.TransmittingBuoy=comment,code,transmittingBuoyOwnership,transmittingBuoyType,transmittingBuoyOperation,country,vessel,latitude,longitude,quadrant View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6bfa4d87cf45380c9ae40505ac... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6bfa4d87cf45380c9ae40505ac... You're receiving this email because of your account on gitlab.com.