Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
c5863db8
by Tony Chemit at 2022-11-25T12:33:22+01:00
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:
| ... | ... | @@ -213,7 +213,9 @@ observe.data.ps.observation.Route.startLogValue |
| 213 | 213 | observe.data.ps.observation.Sample.message.cantAdd
|
| 214 | 214 | observe.data.ps.observation.SampleMeasure.count
|
| 215 | 215 | observe.data.ps.observation.SampleMeasure.length
|
| 216 | +observe.data.ps.observation.SampleMeasure.lengthCountWeight
|
|
| 216 | 217 | observe.data.ps.observation.SampleMeasure.picturesReferences
|
| 218 | +observe.data.ps.observation.SampleMeasure.picturesReferencesTagNumber
|
|
| 217 | 219 | observe.data.ps.observation.SampleMeasure.weight
|
| 218 | 220 | observe.data.ps.observation.SchoolEstimate.meanWeight
|
| 219 | 221 | observe.data.ps.observation.SchoolEstimate.species
|
| ... | ... | @@ -69,110 +69,87 @@ |
| 69 | 69 | text="observe.data.ps.observation.Sample.message.cantAdd"/>
|
| 70 | 70 | |
| 71 | 71 | <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean">
|
| 72 | - |
|
| 73 | - <!-- acquisition mode - species - measure types -->
|
|
| 74 | - <row>
|
|
| 72 | + <row>
|
|
| 75 | 73 | <cell columns="2">
|
| 76 | - <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}">
|
|
| 77 | - <JRadioButton id='acquisitionModeNumber'/>
|
|
| 78 | - <JRadioButton id='acquisitionModeIndividual'/>
|
|
| 74 | + <JPanel layout="{new BorderLayout()}">
|
|
| 75 | + <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}" constraints='BorderLayout.WEST'>
|
|
| 76 | + <JRadioButton id='acquisitionModeNumber'/>
|
|
| 77 | + <JRadioButton id='acquisitionModeIndividual'/>
|
|
| 78 | + </JPanel>
|
|
| 79 | + <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints='BorderLayout.CENTER'>
|
|
| 80 | + <row>
|
|
| 81 | + <cell>
|
|
| 82 | + <JLabel id='speciesLabel' styleClass="i18n"/>
|
|
| 83 | + </cell>
|
|
| 84 | + <cell weightx="1">
|
|
| 85 | + <FilterableComboBox id='species' genericType='SpeciesReference'/>
|
|
| 86 | + </cell>
|
|
| 87 | + </row>
|
|
| 88 | + <row>
|
|
| 89 | + <cell>
|
|
| 90 | + <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
|
|
| 91 | + </cell>
|
|
| 92 | + <cell>
|
|
| 93 | + <FilterableComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/>
|
|
| 94 | + </cell>
|
|
| 95 | + </row>
|
|
| 96 | + <row>
|
|
| 97 | + <cell>
|
|
| 98 | + <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/>
|
|
| 99 | + </cell>
|
|
| 100 | + <cell>
|
|
| 101 | + <FilterableComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/>
|
|
| 102 | + </cell>
|
|
| 103 | + </row>
|
|
| 104 | + </Table>
|
|
| 79 | 105 | </JPanel>
|
| 80 | 106 | </cell>
|
| 81 | - <cell columns="2" weightx='1' anchor='east'>
|
|
| 82 | - <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'>
|
|
| 83 | - <row>
|
|
| 84 | - <cell>
|
|
| 85 | - <JLabel id='speciesLabel' styleClass="i18n"/>
|
|
| 86 | - </cell>
|
|
| 87 | - <cell weightx="1">
|
|
| 88 | - <FilterableComboBox id='species' genericType='SpeciesReference'/>
|
|
| 89 | - </cell>
|
|
| 90 | - </row>
|
|
| 91 | - <row>
|
|
| 92 | - <cell>
|
|
| 93 | - <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
|
|
| 94 | - </cell>
|
|
| 95 | - <cell>
|
|
| 96 | - <FilterableComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/>
|
|
| 97 | - </cell>
|
|
| 98 | - </row>
|
|
| 99 | - <row>
|
|
| 100 | - <cell>
|
|
| 101 | - <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/>
|
|
| 102 | - </cell>
|
|
| 103 | - <cell>
|
|
| 104 | - <FilterableComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/>
|
|
| 105 | - </cell>
|
|
| 106 | - </row>
|
|
| 107 | - </Table>
|
|
| 108 | - </cell>
|
|
| 109 | 107 | </row>
|
| 110 | - |
|
| 111 | - <!-- length -->
|
|
| 112 | - <!-- count -->
|
|
| 113 | 108 | <row>
|
| 114 | 109 | <cell>
|
| 115 | - <JLabel id='lengthLabel'/>
|
|
| 110 | + <JLabel id='lengthCountWeightLabel'/>
|
|
| 116 | 111 | </cell>
|
| 117 | 112 | <cell weightx='1' anchor='east'>
|
| 118 | - <NumberEditor id='length' styleClass="float1"/>
|
|
| 119 | - </cell>
|
|
| 120 | - <cell>
|
|
| 121 | - <JLabel id='countLabel'/>
|
|
| 122 | - </cell>
|
|
| 123 | - <cell weightx='1' anchor='east'>
|
|
| 124 | - <NumberEditor id='count' styleClass="int6"/>
|
|
| 113 | + <JPanel layout="{new GridLayout(1, 0)}">
|
|
| 114 | + <NumberEditor id='length' styleClass="float1"/>
|
|
| 115 | + <NumberEditor id='count' styleClass="int6"/>
|
|
| 116 | + <NumberEditor id='weight' styleClass="float2"/>
|
|
| 117 | + </JPanel>
|
|
| 125 | 118 | </cell>
|
| 126 | 119 | </row>
|
| 127 | - |
|
| 128 | - <!-- weight -->
|
|
| 129 | - <!-- weightMeasureMethod -->
|
|
| 130 | 120 | <row>
|
| 131 | - <cell>
|
|
| 132 | - <JLabel id='weightLabel'/>
|
|
| 133 | - </cell>
|
|
| 134 | - <cell weightx='1' anchor='east'>
|
|
| 135 | - <NumberEditor id='weight' styleClass="float2"/>
|
|
| 136 | - </cell>
|
|
| 137 | 121 | <cell>
|
| 138 | 122 | <JLabel id='weightMeasureMethodLabel'/>
|
| 139 | 123 | </cell>
|
| 140 | - <cell weightx='1' anchor='east'>
|
|
| 124 | + <cell weightx='0.5' anchor='east'>
|
|
| 141 | 125 | <FilterableComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/>
|
| 142 | 126 | </cell>
|
| 143 | 127 | </row>
|
| 144 | - |
|
| 145 | - <!-- sex -->
|
|
| 146 | - <!-- speciesFate -->
|
|
| 147 | 128 | <row>
|
| 148 | 129 | <cell>
|
| 149 | 130 | <JLabel id='sexLabel'/>
|
| 150 | 131 | </cell>
|
| 151 | - <cell weightx='1' anchor='east'>
|
|
| 132 | + <cell weightx='0.5' anchor='east'>
|
|
| 152 | 133 | <FilterableComboBox id='sex' genericType='SexReference'/>
|
| 153 | 134 | </cell>
|
| 135 | + </row>
|
|
| 136 | + <row>
|
|
| 154 | 137 | <cell>
|
| 155 | 138 | <JLabel id='speciesFateLabel'/>
|
| 156 | 139 | </cell>
|
| 157 | - <cell weightx='1' anchor='east'>
|
|
| 140 | + <cell weightx='0.5' anchor='east'>
|
|
| 158 | 141 | <FilterableComboBox id='speciesFate' genericType='SpeciesFateReference'/>
|
| 159 | 142 | </cell>
|
| 160 | 143 | </row>
|
| 161 | - |
|
| 162 | - <!-- reference pĥoto -->
|
|
| 163 | - <!-- tagNumber -->
|
|
| 164 | 144 | <row>
|
| 165 | 145 | <cell>
|
| 166 | - <JLabel id='picturesReferencesLabel'/>
|
|
| 167 | - </cell>
|
|
| 168 | - <cell weightx='1' anchor='east'>
|
|
| 169 | - <NormalTextEditor id='picturesReferences'/>
|
|
| 170 | - </cell>
|
|
| 171 | - <cell anchor='west'>
|
|
| 172 | - <JLabel id='tagNumberLabel'/>
|
|
| 146 | + <JLabel id='picturesReferencesTagNumberLabel'/>
|
|
| 173 | 147 | </cell>
|
| 174 | - <cell anchor='east' weightx="1" fill="both">
|
|
| 175 | - <NormalTextEditor id='tagNumber'/>
|
|
| 148 | + <cell weightx='0.5' anchor='east'>
|
|
| 149 | + <JPanel layout="{new GridLayout(1, 0)}">
|
|
| 150 | + <NormalTextEditor id='picturesReferences'/>
|
|
| 151 | + <NormalTextEditor id='tagNumber'/>
|
|
| 152 | + </JPanel>
|
|
| 176 | 153 | </cell>
|
| 177 | 154 | </row>
|
| 178 | 155 | </Table>
|
| ... | ... | @@ -326,7 +326,7 @@ public class SampleUIHandler extends GeneratedSampleUIHandler { |
| 326 | 326 | if (notPersisted && !withPrevious) {
|
| 327 | 327 | return ui.getSpecies();
|
| 328 | 328 | }
|
| 329 | - return ui.getSex();
|
|
| 329 | + return ui.getLength();
|
|
| 330 | 330 | }
|
| 331 | 331 | |
| 332 | 332 | public void resetIsWeightComputed() {
|
| ... | ... | @@ -1169,8 +1169,10 @@ observe.data.ps.observation.SampleMeasure.count |
| 1169 | 1169 | observe.data.ps.observation.SampleMeasure.count.short
|
| 1170 | 1170 | observe.data.ps.observation.SampleMeasure.length
|
| 1171 | 1171 | observe.data.ps.observation.SampleMeasure.length.short
|
| 1172 | +observe.data.ps.observation.SampleMeasure.lengthCountWeight
|
|
| 1172 | 1173 | observe.data.ps.observation.SampleMeasure.picturesReferences
|
| 1173 | 1174 | observe.data.ps.observation.SampleMeasure.picturesReferences.short
|
| 1175 | +observe.data.ps.observation.SampleMeasure.picturesReferencesTagNumber
|
|
| 1174 | 1176 | observe.data.ps.observation.SampleMeasure.speciesFate.short
|
| 1175 | 1177 | observe.data.ps.observation.SampleMeasure.title
|
| 1176 | 1178 | observe.data.ps.observation.SampleMeasure.type
|
| ... | ... | @@ -1398,8 +1398,10 @@ observe.data.ps.observation.SampleMeasure.count.short=Count |
| 1398 | 1398 | observe.data.ps.observation.SampleMeasure.length=Length
|
| 1399 | 1399 | observe.data.ps.observation.SampleMeasure.length.short=Length
|
| 1400 | 1400 | observe.data.ps.observation.SampleMeasure.length.validation.required=Weight or size must be filled.
|
| 1401 | +observe.data.ps.observation.SampleMeasure.lengthCountWeight=Length / Count / Individual weight (in kg)
|
|
| 1401 | 1402 | observe.data.ps.observation.SampleMeasure.picturesReferences=Pictures references
|
| 1402 | 1403 | observe.data.ps.observation.SampleMeasure.picturesReferences.short=Pictures references
|
| 1404 | +observe.data.ps.observation.SampleMeasure.picturesReferencesTagNumber=Pictures references / Tag number
|
|
| 1403 | 1405 | observe.data.ps.observation.SampleMeasure.speciesFate.short=Species fate
|
| 1404 | 1406 | observe.data.ps.observation.SampleMeasure.title=Samples
|
| 1405 | 1407 | observe.data.ps.observation.SampleMeasure.type=Sample measure
|
| ... | ... | @@ -1398,8 +1398,10 @@ observe.data.ps.observation.SampleMeasure.count.short=Grupo de tallas |
| 1398 | 1398 | observe.data.ps.observation.SampleMeasure.length=Talla
|
| 1399 | 1399 | observe.data.ps.observation.SampleMeasure.length.short=Talla
|
| 1400 | 1400 | observe.data.ps.observation.SampleMeasure.length.validation.required=TODO
|
| 1401 | +observe.data.ps.observation.SampleMeasure.lengthCountWeight=Talla / Grupo de tallas / Peso individual (en kg)
|
|
| 1401 | 1402 | observe.data.ps.observation.SampleMeasure.picturesReferences=Referencia foto
|
| 1402 | 1403 | observe.data.ps.observation.SampleMeasure.picturesReferences.short=Ref. foto
|
| 1404 | +observe.data.ps.observation.SampleMeasure.picturesReferencesTagNumber=Referencia foto / Tag number
|
|
| 1403 | 1405 | observe.data.ps.observation.SampleMeasure.speciesFate.short=Species fate
|
| 1404 | 1406 | observe.data.ps.observation.SampleMeasure.title=Sample measures
|
| 1405 | 1407 | observe.data.ps.observation.SampleMeasure.type=Sample measures
|
| ... | ... | @@ -1398,8 +1398,10 @@ observe.data.ps.observation.SampleMeasure.count.short=Effectif |
| 1398 | 1398 | observe.data.ps.observation.SampleMeasure.length=Longueur
|
| 1399 | 1399 | observe.data.ps.observation.SampleMeasure.length.short=Longueur
|
| 1400 | 1400 | observe.data.ps.observation.SampleMeasure.length.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée.
|
| 1401 | +observe.data.ps.observation.SampleMeasure.lengthCountWeight=Longueur / Effectif / Poids individuel (en kg)
|
|
| 1401 | 1402 | observe.data.ps.observation.SampleMeasure.picturesReferences=référence photo
|
| 1402 | 1403 | observe.data.ps.observation.SampleMeasure.picturesReferences.short=Ref photo
|
| 1404 | +observe.data.ps.observation.SampleMeasure.picturesReferencesTagNumber=Référence photo / Id marque
|
|
| 1403 | 1405 | observe.data.ps.observation.SampleMeasure.speciesFate.short=Devenir
|
| 1404 | 1406 | observe.data.ps.observation.SampleMeasure.title=Échantillons
|
| 1405 | 1407 | observe.data.ps.observation.SampleMeasure.type=Échantillon
|
| ... | ... | @@ -91,7 +91,7 @@ data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus |
| 91 | 91 | data.ps.observation.ObjectSchoolEstimate=species,totalWeight,weightMeasureMethod
|
| 92 | 92 | 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
|
| 93 | 93 | data.ps.observation.Sample=species,sampleMeasure,speciesFate,length.computed.tip,length.observed.tip,message.cantAdd,weight.computed.tip,weight.observed.tip
|
| 94 | -data.ps.observation.SampleMeasure=comment,count,length,lengthMeasureMethod,picturesReferences,sex,sizeMeasureType,species,speciesFate,tagNumber,weight,weightMeasureMethod,weightMeasureType,type
|
|
| 94 | +data.ps.observation.SampleMeasure=comment,count,length,lengthMeasureMethod,picturesReferences,sex,sizeMeasureType,species,speciesFate,tagNumber,weight,weightMeasureMethod,weightMeasureType,type,lengthCountWeight,picturesReferencesTagNumber
|
|
| 95 | 95 | data.ps.observation.SchoolEstimate=meanWeight,species,totalWeight,weightMeasureMethod
|
| 96 | 96 | 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
|
| 97 | 97 | data.ps.observation.TransmittingBuoy=comment,code,transmittingBuoyOwnership,transmittingBuoyType,transmittingBuoyOperation,country,vessel,latitude,longitude,quadrant
|