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

Commits:

16 changed files:

Changes:

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java
    ... ... @@ -342,7 +342,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler {
    342 342 
             ui.getFoodAndSexualTab().setEnabled(newValue);
    343 343 
             ui.getSizeMeasuresTab().setEnabled(newValue);
    344 344 
             ui.getWeightMeasuresTab().setEnabled(newValue);
    345 
    -        boolean enableInlineModels = newValue && ui.getModel().getStates().isEditing();
    345 
    +        boolean enableInlineModels = newValue && (ui.getModel().getStates().isReadingMode() || ui.getModel().getStates().isEditing());
    346 346 
             getTableModel().inlineModels().keySet().forEach(i -> {
    347 347 
                 i.setEditable(enableInlineModels);
    348 348 
                 if (!enableInlineModels) {

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx
    ... ... @@ -134,13 +134,13 @@
    134 134 
             <Table id='generateTabForm' fill='both' insets='1'>
    135 135 
               <!-- canGenerate -->
    136 136 
               <row>
    137 
    -            <cell anchor='west' fill="both">
    137 
    +            <cell anchor='west'>
    138 138 
                   <BeanCheckBox id='canGenerate' beanScope="states"/>
    139 139 
                 </cell>
    140 140 
               </row>
    141 141 
               <row>
    142 
    -            <cell fill="both">
    143 
    -              <JTextPane id='templateInformation' styleClass="italic"/>
    142 
    +            <cell anchor='west' fill="both">
    143 
    +              <JLabel id='templateInformation' styleClass="information"/>
    144 144 
                 </cell>
    145 145 
               </row>
    146 146 
               <!-- sectionTemplates -->

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss
    ... ... @@ -41,13 +41,6 @@
    41 41 
       selected:{states.isCanGenerate()};
    42 42 
     }
    43 43
    44 
    -#templateInformation {
    45 
    -  editable:false;
    46 
    -  focusable:false;
    47 
    -  contentType:"text/html";
    48 
    -  font-size:11;
    49 
    -}
    50 
    -
    51 44 
     #sectionTemplatesTableModel {
    52 45 
        editable: {states.isCanGenerate()};
    53 46 
     }

  • client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter
    ... ... @@ -211,6 +211,9 @@ observe.data.ps.observation.SchoolEstimate.meanWeight
    211 211 
     observe.data.ps.observation.SchoolEstimate.species
    212 212 
     observe.data.ps.observation.SchoolEstimate.totalWeight
    213 213 
     observe.data.ps.observation.Set.currentMeasureDepth
    214 
    +observe.data.ps.observation.Set.endTimeStamp
    215 
    +observe.data.ps.observation.Set.haulingEndTimeStamp
    216 
    +observe.data.ps.observation.Set.haulingStartTimeStamp
    214 217 
     observe.data.ps.observation.Set.maxGearDepth
    215 218 
     observe.data.ps.observation.Set.measurementsTab
    216 219 
     observe.data.ps.observation.Set.message.information.schoolType
    ... ... @@ -218,6 +221,7 @@ observe.data.ps.observation.Set.schoolMeanDepth
    218 221 
     observe.data.ps.observation.Set.schoolThickness
    219 222 
     observe.data.ps.observation.Set.schoolTopDepth
    220 223 
     observe.data.ps.observation.Set.sonarUsedAvantSet
    224 
    +observe.data.ps.observation.Set.startTime
    221 225 
     observe.data.ps.observation.TransmittingBuoy.code
    222 226 
     observe.referential.ps.common.AcquisitionStatus.advancedSampling
    223 227 
     observe.referential.ps.common.AcquisitionStatus.atLeastOneSelected

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jcss
    ... ... @@ -34,6 +34,7 @@
    34 34 
     #haulingStartTimeStamp {
    35 35 
       propertyDayDate: {SetDto.PROPERTY_HAULING_START_DATE};
    36 36 
       propertyTimeDate: {SetDto.PROPERTY_HAULING_START_TIME};
    37 
    +  showReset:true;
    37 38 
     }
    38 39
    39 40 
     #haulingEndTimeStamp {

  • client/runner/src/main/i18n/translations/client-runner_en_GB.properties
    ... ... @@ -229,7 +229,7 @@ observe.data.Data.type=<html><body>Data of type <i>%s</i>
    229 229 
     observe.data.ll.common.Trip.departureLandingHarbour=Departure / Landing Port
    230 230 
     observe.data.ll.common.Trip.homeIdErsId=HomeId / ERS Id
    231 231 
     observe.data.ll.common.Trip.startEndDate=Start / end date
    232 
    -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body><p>Templates must conform to syntax 'L1/L2/L3/Ln\:u' where <p/><ul><li>L1..Ln are floatlines length</li><li>u the selected length unit (among values\: m km nm or fmt)</li></ul>
    232 
    +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Templates must conform to syntax <strong><code>L1/L2/L3/Ln\:u</code></strong> where <ul><li>L1..Ln are floatlines length</li><li>u is the selected length unit (among values\: <code>m km nm</code> or <code>fmt</code>)</li></ul>
    233 233 
     observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Templates are not valid, see tooltip on error cells
    234 234 
     observe.data.message.will.delete.sub.data=If you confirm save, some data could be deleted\!\n\nFollowing data need to be removed\:
    235 235 
     observe.data.message.will.delete.sub.data.type=Object %1$s (id %2$s)

  • client/runner/src/main/i18n/translations/client-runner_es_ES.properties
    ... ... @@ -229,7 +229,7 @@ observe.data.Data.type=<html><body>Dato de tipo <i>%s</i>
    229 229 
     observe.data.ll.common.Trip.departureLandingHarbour=Departure / Landing harbour
    230 230 
     observe.data.ll.common.Trip.homeIdErsId=HomeId / ERS Id
    231 231 
     observe.data.ll.common.Trip.startEndDate=Date de début / fin
    232 
    -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body><p>Templates must conform to syntax 'L1/L2/L3/Ln\:u' where <p/><ul><li>L1..Ln are floatlines length</li><li>u the selected length unit (among values\: m km nm or fmt)</li></ul>\#TODO
    232 
    +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Templates must conform to syntax <strong><code>L1/L2/L3/Ln\:u</code></strong> where <ul><li>L1..Ln are floatlines length</li><li>u is the selected length unit (among values\: <code>m km nm</code> or <code>fmt</code>)</li></ul>\#TODO
    233 233 
     observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Templates are not valid, see tooltip on error cells
    234 234 
     observe.data.message.will.delete.sub.data=If you confirm save, following data will be deleted\!\:
    235 235 
     observe.data.message.will.delete.sub.data.type=Objet %1$s (identifiant %2$s)

  • client/runner/src/main/i18n/translations/client-runner_fr_FR.properties
    ... ... @@ -229,7 +229,7 @@ observe.data.Data.type=<html><body>Donnée de type <i>%s</i>
    229 229 
     observe.data.ll.common.Trip.departureLandingHarbour=Port de départ / d'arrivée
    230 230 
     observe.data.ll.common.Trip.homeIdErsId=Identifiant / Id ERS
    231 231 
     observe.data.ll.common.Trip.startEndDate=Date de début / fin
    232 
    -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body><p>Les patrons doivent se conformer à la syntaxe 'L1/L2/L3/Ln\:u' où </p><ul><li><strong>L1..Ln</strong> sont les longueurs des orins</li><li><strong>u</strong> l'unité de longueur sélectionée (valeurs possibles \: m km nm ou fmt)
    232 
    +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Les patrons doivent se conformer à la syntaxe <strong><code>L1/L2/L3/Ln\:u</code></strong> où <ul><li><strong>L1..Ln</strong> sont les longueurs des orins</li><li><strong>u</strong> est l'unité de longueur sélectionnée (valeurs possibles \: <code>m km nm</code> ou <code>fmt</code>)
    233 233 
     observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Les templates ne sont pas valides, passer en revue les cellules en erreur
    234 234 
     observe.data.message.will.delete.sub.data=En confirmant la sauvegarde les données suivantes seront supprimées \:
    235 235 
     observe.data.message.will.delete.sub.data.type=Objet %1$s (identifiant %2$s)

  • core/api/services/src/main/i18n/getters/labels.getter
    ... ... @@ -1146,6 +1146,9 @@ observe.data.ps.observation.SchoolEstimate.type
    1146 1146 
     observe.data.ps.observation.Set.action.add
    1147 1147 
     observe.data.ps.observation.Set.action.add.tip
    1148 1148 
     observe.data.ps.observation.Set.currentMeasureDepth
    1149 
    +observe.data.ps.observation.Set.endTimeStamp
    1150 
    +observe.data.ps.observation.Set.haulingEndTimeStamp
    1151 
    +observe.data.ps.observation.Set.haulingStartTimeStamp
    1149 1152 
     observe.data.ps.observation.Set.maxGearDepth
    1150 1153 
     observe.data.ps.observation.Set.measurementsTab
    1151 1154 
     observe.data.ps.observation.Set.message.information.schoolType
    ... ... @@ -1155,6 +1158,7 @@ observe.data.ps.observation.Set.schoolThickness
    1155 1158 
     observe.data.ps.observation.Set.schoolTopDepth
    1156 1159 
     observe.data.ps.observation.Set.schoolType.not.fill
    1157 1160 
     observe.data.ps.observation.Set.sonarUsedAvantSet
    1161 
    +observe.data.ps.observation.Set.startTime
    1158 1162 
     observe.data.ps.observation.Set.title
    1159 1163 
     observe.data.ps.observation.Set.type
    1160 1164 
     observe.data.ps.observation.SetCatch.type

  • core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties
    ... ... @@ -20,7 +20,7 @@
    20 20 
     # #L%
    21 21 
     ###
    22 22 
     #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo
    23 
    -#Wed Sep 07 13:23:50 CEST 2022
    23 
    +#Mon Oct 17 14:55:03 CEST 2022
    24 24 
     observe.Business.createDate=observe.Common.createDate
    25 25 
     observe.Business.homeId=observe.Common.homeId
    26 26 
     observe.Business.id=observe.Common.id
    ... ... @@ -1742,17 +1742,13 @@ observe.data.ps.observation.Set.currentDirection=observe.Common.currentDirection
    1742 1742 
     observe.data.ps.observation.Set.currentSpeed=observe.Common.currentSpeed
    1743 1743 
     observe.data.ps.observation.Set.endDate=observe.Common.endDate
    1744 1744 
     observe.data.ps.observation.Set.endTime=observe.Common.endTime
    1745 
    -observe.data.ps.observation.Set.endTimeStamp=observe.Common.endTimeStamp
    1746 1745 
     observe.data.ps.observation.Set.generalTab=observe.Common.generalTab
    1747 
    -observe.data.ps.observation.Set.haulingEndTimeStamp=observe.Common.haulingEndTimeStamp
    1748 
    -observe.data.ps.observation.Set.haulingStartTimeStamp=observe.Common.haulingStartTimeStamp
    1749 1746 
     observe.data.ps.observation.Set.homeId=observe.Common.homeId
    1750 1747 
     observe.data.ps.observation.Set.id=observe.Common.id
    1751 1748 
     observe.data.ps.observation.Set.label=observe.Common.label
    1752 1749 
     observe.data.ps.observation.Set.lastUpdateDate=observe.Common.lastUpdateDate
    1753 1750 
     observe.data.ps.observation.Set.reasonForNullSet=observe.Common.reasonForNullSet
    1754 1751 
     observe.data.ps.observation.Set.schoolType=observe.Common.schoolType
    1755 
    -observe.data.ps.observation.Set.startTime=observe.Common.startTime
    1756 1752 
     observe.data.ps.observation.Set.supportVesselName=observe.Common.supportVesselName
    1757 1753 
     observe.data.ps.observation.Set.version=observe.Common.version
    1758 1754 
     observe.data.ps.observation.SetCatch.comment=observe.Common.comment

  • core/api/validation/src/main/i18n/getters/eugene.getter
    ... ... @@ -327,10 +327,12 @@ observe.data.ps.observation.SchoolEstimate.totalWeight
    327 327 
     observe.data.ps.observation.Set.currentMeasureDepth
    328 328 
     observe.data.ps.observation.Set.haulingEndDate
    329 329 
     observe.data.ps.observation.Set.haulingEndTime
    330 
    +observe.data.ps.observation.Set.haulingStartTimeStamp
    330 331 
     observe.data.ps.observation.Set.maxGearDepth
    331 332 
     observe.data.ps.observation.Set.schoolMeanDepth
    332 333 
     observe.data.ps.observation.Set.schoolThickness
    333 334 
     observe.data.ps.observation.Set.schoolTopDepth
    335 
    +observe.data.ps.observation.Set.startTime
    334 336 
     observe.data.ps.observation.SetCatch.catches
    335 337 
     observe.data.ps.observation.SetSchoolEstimate.schoolEstimate
    336 338 
     observe.data.ps.observation.TransmittingBuoy.code

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -1372,8 +1372,11 @@ observe.data.ps.observation.Set.action.add=Add a Set
    1372 1372 
     observe.data.ps.observation.Set.action.add.tip=Add the set to the activity
    1373 1373 
     observe.data.ps.observation.Set.catchesStat=Count of catches
    1374 1374 
     observe.data.ps.observation.Set.currentMeasureDepth=Current measure depth (m)
    1375 
    +observe.data.ps.observation.Set.endTimeStamp=Set end
    1375 1376 
     observe.data.ps.observation.Set.haulingEndDate=Hauling end date
    1376 1377 
     observe.data.ps.observation.Set.haulingEndTime=Hauling end time
    1378 
    +observe.data.ps.observation.Set.haulingEndTimeStamp=Hauling end
    1379 
    +observe.data.ps.observation.Set.haulingStartTimeStamp=Hauling start
    1377 1380 
     observe.data.ps.observation.Set.maxGearDepth=Max gear depth (m)
    1378 1381 
     observe.data.ps.observation.Set.measurementsTab=Measurements
    1379 1382 
     observe.data.ps.observation.Set.message.information.schoolType=School type
    ... ... @@ -1386,6 +1389,7 @@ observe.data.ps.observation.Set.schoolThickness=School thickness (m)
    1386 1389 
     observe.data.ps.observation.Set.schoolTopDepth=School top depth (m)
    1387 1390 
     observe.data.ps.observation.Set.schoolType.not.fill=Not filled
    1388 1391 
     observe.data.ps.observation.Set.sonarUsedAvantSet=Usage of sonar
    1392 
    +observe.data.ps.observation.Set.startTime=Set start
    1389 1393 
     observe.data.ps.observation.Set.title=Set
    1390 1394 
     observe.data.ps.observation.Set.type=Set
    1391 1395 
     observe.data.ps.observation.Set.validation.endDate.after.haulingEndDate=End date (%2$s) must be after pursing date (%1$s).

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -1372,8 +1372,11 @@ observe.data.ps.observation.Set.action.add=Añadir un lance
    1372 1372 
     observe.data.ps.observation.Set.action.add.tip=Añadir el lance de la actividad
    1373 1373 
     observe.data.ps.observation.Set.catchesStat=Count of catches
    1374 1374 
     observe.data.ps.observation.Set.currentMeasureDepth=Profundidad de corriente (m)
    1375 
    +observe.data.ps.observation.Set.endTimeStamp=Set end
    1375 1376 
     observe.data.ps.observation.Set.haulingEndDate=Fecha de fin de calado de la red
    1376 1377 
     observe.data.ps.observation.Set.haulingEndTime=Hora de fin de calado de la red
    1378 
    +observe.data.ps.observation.Set.haulingEndTimeStamp=Hauling end
    1379 
    +observe.data.ps.observation.Set.haulingStartTimeStamp=Hauling start
    1377 1380 
     observe.data.ps.observation.Set.maxGearDepth=Profundidad de cierre del arte (m)
    1378 1381 
     observe.data.ps.observation.Set.measurementsTab=Parámetros
    1379 1382 
     observe.data.ps.observation.Set.message.information.schoolType=Tipo de banco calculado a partir de los sistemas observados de su actividad.
    ... ... @@ -1386,6 +1389,7 @@ observe.data.ps.observation.Set.schoolThickness=Esperor del banco (m)
    1386 1389 
     observe.data.ps.observation.Set.schoolTopDepth=Profundidad comienzo (m)
    1387 1390 
     observe.data.ps.observation.Set.schoolType.not.fill=vacío
    1388 1391 
     observe.data.ps.observation.Set.sonarUsedAvantSet=Utilización del sonar antes del lance
    1392 
    +observe.data.ps.observation.Set.startTime=Set start
    1389 1393 
     observe.data.ps.observation.Set.title=Lance
    1390 1394 
     observe.data.ps.observation.Set.type=Lance
    1391 1395 
     observe.data.ps.observation.Set.validation.endDate.after.haulingEndDate=El día de fin (%2$s) debe ser superior o igual a la dia de final de recogida de la jareta (%1$s).

  • core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -1372,8 +1372,11 @@ observe.data.ps.observation.Set.action.add=Ajouter la calée
    1372 1372 
     observe.data.ps.observation.Set.action.add.tip=Ajouter la calée de l'activité
    1373 1373 
     observe.data.ps.observation.Set.catchesStat=Nombre de captures
    1374 1374 
     observe.data.ps.observation.Set.currentMeasureDepth=Profondeur de mesure du courant (m)
    1375 
    +observe.data.ps.observation.Set.endTimeStamp=Fin de calée
    1375 1376 
     observe.data.ps.observation.Set.haulingEndDate=Date de fin coulissage
    1376 1377 
     observe.data.ps.observation.Set.haulingEndTime=Heure de fin coulissage
    1378 
    +observe.data.ps.observation.Set.haulingEndTimeStamp=Fin de coulissage
    1379 
    +observe.data.ps.observation.Set.haulingStartTimeStamp=Début de coulissage
    1377 1380 
     observe.data.ps.observation.Set.maxGearDepth=Profondeur maximum (m)
    1378 1381 
     observe.data.ps.observation.Set.measurementsTab=Mesures
    1379 1382 
     observe.data.ps.observation.Set.message.information.schoolType=Type de banc
    ... ... @@ -1386,6 +1389,7 @@ observe.data.ps.observation.Set.schoolThickness=Épaisseur du banc (m)
    1386 1389 
     observe.data.ps.observation.Set.schoolTopDepth=Profondeur sommet (m)
    1387 1390 
     observe.data.ps.observation.Set.schoolType.not.fill=Non renseigné
    1388 1391 
     observe.data.ps.observation.Set.sonarUsedAvantSet=Utilisation du sonar
    1392 
    +observe.data.ps.observation.Set.startTime=Début de calée
    1389 1393 
     observe.data.ps.observation.Set.title=Calée
    1390 1394 
     observe.data.ps.observation.Set.type=Calée
    1391 1395 
     observe.data.ps.observation.Set.validation.endDate.after.haulingEndDate=La date de fin (%2$s) doit être supérieure ou égal à la date de fin de coulissage (%1$s).

  • model/src/main/models/Observe/dto/class/i18nOverrideLabels.properties
    ... ... @@ -24,4 +24,5 @@ data.ll.landing.Landing=vessel
    24 24 
     data.ps.localmarket.Sample=well
    25 25 
     data.ps.logbook.Catch=weightMeasureMethod.validation.required
    26 26 
     data.ps.observation.SchoolEstimate=species
    27 
    +data.ps.observation.Set=startTime,haulingStartTimeStamp,haulingEndTimeStamp,endTimeStamp
    27 28 
     referential.common.Species=codeAndHomeId

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23 
       <parent>
    24 24 
         <groupId>io.ultreia.maven</groupId>
    25 25 
         <artifactId>pom</artifactId>
    26 
    -    <version>2022.90</version>
    26 
    +    <version>2022.91</version>
    27 27 
       </parent>
    28 28 
       <groupId>fr.ird.observe</groupId>
    29 29 
       <artifactId>ird-observe</artifactId>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help