Tony CHEMIT pushed to branch feature/issue-2549 at ultreiaio / ird-observe

Commits:

22 changed files:

Changes:

  • client/configuration/src/main/config/Client.ini
    ... ... @@ -846,6 +846,12 @@ key = ui.map.ps.style.logbook.point.color
    846 846 
     type = color
    847 847 
     defaultValue = java.awt.Color[r=255,g=0,b=0]
    848 848
    849 
    +[option mapPsStyleLogbookWithSamplingPointColor]
    850 
    +description = observe.config.map.ps.style.logbook.withSampling.point.color
    851 
    +key = ui.map.ps.style.logbook.withSampling.point.color
    852 
    +type = color
    853 
    +defaultValue = java.awt.Color[r=255,g=255,b=0]
    854 
    +
    849 855 
     [option mapPsStyleLogbookTextColor]
    850 856 
     description = observe.config.map.ps.style.logbook.text.color
    851 857 
     key = ui.map.ps.style.logbook.text.color

  • client/configuration/src/main/i18n/getters/config.getter
    ... ... @@ -86,6 +86,7 @@ observe.config.map.ps.style.logbook.point.color
    86 86 
     observe.config.map.ps.style.logbook.text.color
    87 87 
     observe.config.map.ps.style.logbook.text.size
    88 88 
     observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color
    89 
    +observe.config.map.ps.style.logbook.withSampling.point.color
    89 90 
     observe.config.map.ps.style.observations.line.color
    90 91 
     observe.config.map.ps.style.observations.point.color
    91 92 
     observe.config.map.ps.style.observations.text.color

  • client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java
    ... ... @@ -36,6 +36,7 @@ import org.nuiton.converter.NuitonConverter;
    36 36 
      *
    37 37 
      * @author Tony Chemit - dev@tchemit.fr
    38 38 
      */
    39 
    +@SuppressWarnings("rawtypes")
    39 40 
     @AutoService(NuitonConverter.class)
    40 41 
     public class SeineBycatchObservedSystemConfigConverter implements NuitonConverter<SeineBycatchObservedSystemConfig> {
    41 42

  • client/core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java
    ... ... @@ -38,6 +38,7 @@ import static io.ultreia.java4all.i18n.I18n.t;
    38 38 
      * @author Tony Chemit - dev@tchemit.fr
    39 39 
      * @since ?
    40 40 
      */
    41 
    +@SuppressWarnings("rawtypes")
    41 42 
     @AutoService(MainUIBodyContent.class)
    42 43 
     public class H2ServerBodyContent extends MainUIBodyContent<H2ServerUI> implements WithClientUIContextApi {
    43 44

  • client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsBodyContent.java
    ... ... @@ -29,6 +29,7 @@ import fr.ird.observe.client.main.body.MainUIBodyContent;
    29 29 
      * @author Tony Chemit - dev@tchemit.fr
    30 30 
      * @since 8
    31 31 
      */
    32 
    +@SuppressWarnings("rawtypes")
    32 33 
     @AutoService(MainUIBodyContent.class)
    33 34 
     public class RemotePresetsBodyContent extends MainUIBodyContent<RemotePresetsUI> {
    34 35

  • client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigBodyContent.java
    ... ... @@ -33,6 +33,7 @@ import java.util.function.Supplier;
    33 33 
      * @author Tony Chemit - dev@tchemit.fr
    34 34 
      * @since 8
    35 35 
      */
    36 
    +@SuppressWarnings("rawtypes")
    36 37 
     @AutoService(MainUIBodyContent.class)
    37 38 
     public class ClientConfigBodyContent extends MainUIBodyContent<ClientConfigUI> implements WithClientUIContextApi {
    38 39

  • client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java
    ... ... @@ -334,6 +334,7 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext
    334 334 
             helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_TEXT_SIZE);
    335 335 
             helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_LINE_COLOR);
    336 336 
             helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_POINT_COLOR);
    337 
    +        helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_WITH_SAMPLING_POINT_COLOR);
    337 338 
             helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_TRANSMITTING_BUOY_LOST_POINT_COLOR);
    338 339 
             helper.addOption(ClientConfigOption.MAP_LL_STYLE_FILE);
    339 340 
             helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_LINE_TRIP_COLOR);

  • client/core/src/main/java/fr/ird/observe/client/main/body/NoBodyContent.java
    ... ... @@ -28,6 +28,7 @@ import com.google.auto.service.AutoService;
    28 28 
      * @author Tony Chemit - dev@tchemit.fr
    29 29 
      * @since 8
    30 30 
      */
    31 
    +@SuppressWarnings("rawtypes")
    31 32 
     @AutoService(MainUIBodyContent.class)
    32 33 
     public class NoBodyContent extends MainUIBodyContent<NoBodyContentComponent> {
    33 34

  • client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java
    ... ... @@ -55,6 +55,7 @@ import java.util.function.Supplier;
    55 55 
      * @author Tony Chemit - dev@tchemit.fr
    56 56 
      * @since 8
    57 57 
      */
    58 
    +@SuppressWarnings("rawtypes")
    58 59 
     @AutoService(MainUIBodyContent.class)
    59 60 
     public class AdminUIBodyContent extends MainUIBodyContent<AdminUI> implements WithClientUIContextApi {
    60 61

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java
    ... ... @@ -37,7 +37,7 @@ public class ObserveKeyStrokesEditorApi extends ObserveKeyStrokesSupport {
    37 37 
         //FIXME Let's design a nice new API to register KeyStroke (a new annotation, processed to generate KeyStroke resources)
    38 38 
         // Navigation
    39 39
    40 
    -    public static final KeyStroke KEY_STROKE_MAP_CONFIGURE = KeyStroke.getKeyStroke("alt pressed F2");
    40 
    +    public static final KeyStroke KEY_STROKE_MAP_CONFIGURE = KeyStroke.getKeyStroke("ctrl pressed F2");
    41 41 
         public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE = KeyStroke.getKeyStroke("pressed F12");
    42 42
    43 43 
         public static final KeyStroke KEY_STROKE_STORAGE_MENU_LEFT = KeyStroke.getKeyStroke("pressed F1");

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java
    ... ... @@ -68,6 +68,7 @@ import java.nio.file.Path;
    68 68 
     import java.text.SimpleDateFormat;
    69 69 
     import java.util.ArrayList;
    70 70 
     import java.util.Arrays;
    71 
    +import java.util.Comparator;
    71 72 
     import java.util.Date;
    72 73 
     import java.util.EnumMap;
    73 74 
     import java.util.HashSet;
    ... ... @@ -77,6 +78,7 @@ import java.util.List;
    77 78 
     import java.util.Map;
    78 79 
     import java.util.Optional;
    79 80 
     import java.util.Set;
    81 
    +import java.util.stream.Collectors;
    80 82
    81 83 
     /**
    82 84 
      * @author Tony Chemit - dev@tchemit.fr
    ... ... @@ -266,9 +268,10 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil
    266 268 
                 mapContent.addLayer(pointsLayer);
    267 269 
             }
    268 270
    269 
    -        Set<TripMapPointType> notValidTypes = new LinkedHashSet<>(notValidPoints.keySet());
    271 
    +        Set<TripMapPointType> notValidTypes = notValidPoints.keySet().stream().sorted(Comparator.comparing(TripMapPointType::getLabel)).collect(Collectors.toCollection(LinkedHashSet::new));
    270 272
    271 
    -        for (TripMapPointType type : pointTypeInLegend) {
    273 
    +        List<TripMapPointType> sortedPointTypeInLegend = pointTypeInLegend.stream().sorted(Comparator.comparing(TripMapPointType::getLabel)).collect(Collectors.toList());
    274 
    +        for (TripMapPointType type : sortedPointTypeInLegend) {
    272 275 
                 List<TripMapPoint> notValidPointsForType = notValidPoints.get(type);
    273 276 
                 String label = type.getLabel();
    274 277 
                 if (notValidPointsForType != null && !notValidPointsForType.isEmpty()) {

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java
    ... ... @@ -63,9 +63,12 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit
    63 63 
                     TripMapPointType.psActivityObsWithFreeSchoolType,
    64 64 
                     TripMapPointType.psActivityObsWithObjectSchoolType,
    65 65 
                     TripMapPointType.psActivityLogbook,
    66 
    +                TripMapPointType.psActivityLogbookWithSampling,
    66 67 
                     TripMapPointType.psActivityLogbookInHarbour,
    67 68 
                     TripMapPointType.psActivityLogbookWithFreeSchoolType,
    69 
    +                TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling,
    68 70 
                     TripMapPointType.psActivityLogbookWithObjectSchoolType,
    71 
    +                TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling,
    69 72 
                     TripMapPointType.psTransmittingBuoyLostLogbook
    70 73 
             )), createLineBuilder(true));
    71 74 
         }
    ... ... @@ -81,6 +84,7 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit
    81 84 
             result.add("mapPsStyleLogbookTextSize");
    82 85 
             result.add("mapPsStyleLogbookLineColor");
    83 86 
             result.add("mapPsStyleLogbookPointColor");
    87 
    +        result.add("mapPsStyleLogbookWithSamplingPointColor");
    84 88 
             result.add("mapPsStyleLogbookTransmittingBuoyLostPointColor");
    85 89 
             return result;
    86 90 
         }

  • client/datasource/editor/ps/src/main/resources/map/ps-style.xml
    ... ... @@ -318,6 +318,33 @@
    318 318 
             </Rule>
    319 319 
           </FeatureTypeStyle>
    320 320
    321 
    +      <FeatureTypeStyle>
    322 
    +        <Rule>
    323 
    +          <Name>Other (with sampling)</Name>
    324 
    +          <ogc:Filter>
    325 
    +            <ogc:PropertyIsEqualTo>
    326 
    +              <ogc:PropertyName>pointType</ogc:PropertyName>
    327 
    +              <ogc:Literal>psActivityLogbookWithSampling</ogc:Literal>
    328 
    +            </ogc:PropertyIsEqualTo>
    329 
    +          </ogc:Filter>
    330 
    +          <PointSymbolizer>
    331 
    +            <Graphic>
    332 
    +              <Mark>
    333 
    +                <WellKnownName>ttf://Serif#U+2299</WellKnownName>
    334 
    +                <Fill>
    335 
    +                  <CssParameter name="fill">${mapPsStyleLogbookWithSamplingPointColor}</CssParameter>
    336 
    +                </Fill>
    337 
    +                <Stroke>
    338 
    +                  <CssParameter name="stroke">#000000</CssParameter>
    339 
    +                  <CssParameter name="stroke-width">1</CssParameter>
    340 
    +                </Stroke>
    341 
    +              </Mark>
    342 
    +              <Size>16</Size>
    343 
    +            </Graphic>
    344 
    +          </PointSymbolizer>
    345 
    +        </Rule>
    346 
    +      </FeatureTypeStyle>
    347 
    +
    321 348 
           <FeatureTypeStyle>
    322 349 
             <Rule>
    323 350 
               <Name>With free school type</Name>
    ... ... @@ -345,6 +372,33 @@
    345 372 
             </Rule>
    346 373 
           </FeatureTypeStyle>
    347 374
    375 
    +      <FeatureTypeStyle>
    376 
    +        <Rule>
    377 
    +          <Name>With free school type (with sampling)</Name>
    378 
    +          <ogc:Filter>
    379 
    +            <ogc:PropertyIsEqualTo>
    380 
    +              <ogc:PropertyName>pointType</ogc:PropertyName>
    381 
    +              <ogc:Literal>psActivityLogbookWithFreeSchoolTypeWithSampling</ogc:Literal>
    382 
    +            </ogc:PropertyIsEqualTo>
    383 
    +          </ogc:Filter>
    384 
    +          <PointSymbolizer>
    385 
    +            <Graphic>
    386 
    +              <Mark>
    387 
    +                <WellKnownName>ttf://Serif#U+25C8</WellKnownName>
    388 
    +                <Fill>
    389 
    +                  <CssParameter name="fill">${mapPsStyleLogbookWithSamplingPointColor}</CssParameter>
    390 
    +                </Fill>
    391 
    +                <Stroke>
    392 
    +                  <CssParameter name="stroke">#000000</CssParameter>
    393 
    +                  <CssParameter name="stroke-width">1</CssParameter>
    394 
    +                </Stroke>
    395 
    +              </Mark>
    396 
    +              <Size>16</Size>
    397 
    +            </Graphic>
    398 
    +          </PointSymbolizer>
    399 
    +        </Rule>
    400 
    +      </FeatureTypeStyle>
    401 
    +
    348 402 
           <FeatureTypeStyle>
    349 403 
             <Rule>
    350 404 
               <Name>With object school type</Name>
    ... ... @@ -366,7 +420,34 @@
    366 420 
                       <CssParameter name="stroke-width">1</CssParameter>
    367 421 
                     </Stroke>
    368 422 
                   </Mark>
    369 
    -              <Size>12</Size>
    423 
    +              <Size>16</Size>
    424 
    +            </Graphic>
    425 
    +          </PointSymbolizer>
    426 
    +        </Rule>
    427 
    +      </FeatureTypeStyle>
    428 
    +
    429 
    +      <FeatureTypeStyle>
    430 
    +        <Rule>
    431 
    +          <Name>With object school type (with sampling)</Name>
    432 
    +          <ogc:Filter>
    433 
    +            <ogc:PropertyIsEqualTo>
    434 
    +              <ogc:PropertyName>pointType</ogc:PropertyName>
    435 
    +              <ogc:Literal>psActivityLogbookWithObjectSchoolTypeWithSampling</ogc:Literal>
    436 
    +            </ogc:PropertyIsEqualTo>
    437 
    +          </ogc:Filter>
    438 
    +          <PointSymbolizer>
    439 
    +            <Graphic>
    440 
    +              <Mark>
    441 
    +                <WellKnownName>ttf://Serif#U+2295</WellKnownName>
    442 
    +                <Fill>
    443 
    +                  <CssParameter name="fill">${mapPsStyleLogbookWithSamplingPointColor}</CssParameter>
    444 
    +                </Fill>
    445 
    +                <Stroke>
    446 
    +                  <CssParameter name="stroke">#000000</CssParameter>
    447 
    +                  <CssParameter name="stroke-width">1</CssParameter>
    448 
    +                </Stroke>
    449 
    +              </Mark>
    450 
    +              <Size>16</Size>
    370 451 
                 </Graphic>
    371 452 
               </PointSymbolizer>
    372 453 
             </Rule>

  • client/runner/src/main/i18n/translations/client-runner_en_GB.properties
    ... ... @@ -103,6 +103,7 @@ observe.config.map.ps.style.logbook.point.color=[PS - Logbook] Color for points
    103 103 
     observe.config.map.ps.style.logbook.text.color=[PS - Logbook] Color for text
    104 104 
     observe.config.map.ps.style.logbook.text.size=[PS - Logbook] Size for text
    105 105 
     observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color=[PS - Logbook] Color for transmitting buoy lost points
    106 
    +observe.config.map.ps.style.logbook.withSampling.point.color=[PS - Logbook] Color for points (with sampling)
    106 107 
     observe.config.map.ps.style.observations.line.color=[PS - Observations] Color for lines
    107 108 
     observe.config.map.ps.style.observations.point.color=[PS - Observations] Color for points
    108 109 
     observe.config.map.ps.style.observations.text.color=[PS - Observations] Color for text

  • client/runner/src/main/i18n/translations/client-runner_es_ES.properties
    ... ... @@ -103,6 +103,7 @@ observe.config.map.ps.style.logbook.point.color=[PS - Logbook] Color for points
    103 103 
     observe.config.map.ps.style.logbook.text.color=[PS - Logbook] Color for text
    104 104 
     observe.config.map.ps.style.logbook.text.size=[PS - Logbook] Size for text
    105 105 
     observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color=[PS - Logbook] Color for transmitting buoy lost points
    106 
    +observe.config.map.ps.style.logbook.withSampling.point.color=[PS - Logbook] Color for points (with sampling) \#TODO
    106 107 
     observe.config.map.ps.style.observations.line.color=[PS - Observations] Color for lines
    107 108 
     observe.config.map.ps.style.observations.point.color=[PS - Observations] Color for points
    108 109 
     observe.config.map.ps.style.observations.text.color=[PS - Observations] Color for text

  • client/runner/src/main/i18n/translations/client-runner_fr_FR.properties
    ... ... @@ -103,6 +103,7 @@ observe.config.map.ps.style.logbook.point.color=[Senne - Livre de bord] Couleur
    103 103 
     observe.config.map.ps.style.logbook.text.color=[Senne - Livre de bord] Couleur pour les textes
    104 104 
     observe.config.map.ps.style.logbook.text.size=[Senne - Livre de bord] Taille pour les textes
    105 105 
     observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color=[Senne - Observations] Couleur pour la fin de transmission de balise
    106 
    +observe.config.map.ps.style.logbook.withSampling.point.color=[Senne - Livre de bord] Couleur pour les points (avec échantillonnage)
    106 107 
     observe.config.map.ps.style.observations.line.color=[Senne - Observations] Couleur pour les traces
    107 108 
     observe.config.map.ps.style.observations.point.color=[Senne - Observations] Couleur pour les points
    108 109 
     observe.config.map.ps.style.observations.text.color=[Senne - Observations] Couleur pour les textes

  • core/api/dto/src/main/i18n/getters/java-enumeration.getter
    ... ... @@ -33,7 +33,10 @@ observe.constant.TripMapPointType.llTripLandingHarbour
    33 33 
     observe.constant.TripMapPointType.psActivityLogbook
    34 34 
     observe.constant.TripMapPointType.psActivityLogbookInHarbour
    35 35 
     observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType
    36 
    +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling
    36 37 
     observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType
    38 
    +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling
    39 
    +observe.constant.TripMapPointType.psActivityLogbookWithSampling
    37 40 
     observe.constant.TripMapPointType.psActivityObs
    38 41 
     observe.constant.TripMapPointType.psActivityObsInHarbour
    39 42 
     observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType

  • core/api/dto/src/main/java/fr/ird/observe/dto/data/TripMapPointType.java
    ... ... @@ -43,9 +43,12 @@ public enum TripMapPointType {
    43 43 
         psActivityObsWithObjectSchoolType,
    44 44
    45 45 
         psActivityLogbook,
    46 
    +    psActivityLogbookWithSampling,
    46 47 
         psActivityLogbookInHarbour,
    47 48 
         psActivityLogbookWithFreeSchoolType,
    49 
    +    psActivityLogbookWithFreeSchoolTypeWithSampling,
    48 50 
         psActivityLogbookWithObjectSchoolType,
    51 
    +    psActivityLogbookWithObjectSchoolTypeWithSampling,
    49 52 
         psTransmittingBuoyLostLogbook,
    50 53
    51 54 
         llTripDepartureHarbour,

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java
    ... ... @@ -94,7 +94,8 @@ public class TripMapBuilder {
    94 94 
                               /* 03 */ " a.latitude," +
    95 95 
                               /* 04 */ " a.longitude," +
    96 96 
                               /* 05 */ " a.vesselActivity," +
    97 
    -                          /* 06 */ " a.schoolType" +
    97 
    +                          /* 06 */ " a.schoolType," +
    98 
    +                          /* 07 */ " (SELECT count(*) FROM ps_logbook.sampleActivity sa WHERE sa.activity = a.topiaId)" +
    98 99 
                               " FROM ps_logbook.route r" +
    99 100 
                               " INNER JOIN ps_logbook.activity a ON a.route = r.topiaId" +
    100 101 
                               " WHERE r.trip = ?" +
    ... ... @@ -106,15 +107,25 @@ public class TripMapBuilder {
    106 107 
                 String schoolType = resultSet.getString(6);
    107 108 
                 String vesselActivityId = resultSet.getString(5);
    108 109 
                 TripMapPointType type = TripMapPointType.psActivityLogbook;
    110 
    +            boolean withSample = resultSet.getInt(7) > 0;
    111 
    +            if (withSample) {
    112 
    +                type = TripMapPointType.psActivityLogbookWithSampling;
    113 
    +            }
    109 114 
                 if (ProtectedIdsPs.PS_COMMON_ACTIVITY_HARBOUR_ID.equals(vesselActivityId)) {
    110 115 
                     type = TripMapPointType.psActivityLogbookInHarbour;
    111 116 
                 } else if (schoolType != null) {
    112 117 
                     switch (schoolType) {
    113 118 
                         case ProtectedIdsPs.PS_COMMON_SCHOOL_TYPE_FREE_ID:
    114 119 
                             type = TripMapPointType.psActivityLogbookWithFreeSchoolType;
    120 
    +                        if (withSample) {
    121 
    +                            type = TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling;
    122 
    +                        }
    115 123 
                             break;
    116 124 
                         case ProtectedIdsPs.PS_COMMON_SCHOOL_TYPE_OBJECT_ID:
    117 125 
                             type = TripMapPointType.psActivityLogbookWithObjectSchoolType;
    126 
    +                        if (withSample) {
    127 
    +                            type = TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling;
    128 
    +                        }
    118 129 
                             break;
    119 130 
                     }
    120 131 
                 }

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -460,7 +460,10 @@ observe.constant.TripMapPointType.llTripLandingHarbour=Port landing
    460 460 
     observe.constant.TripMapPointType.psActivityLogbook=Logbook - Other activity
    461 461 
     observe.constant.TripMapPointType.psActivityLogbookInHarbour=Logbook - In port
    462 462 
     observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Logbook - Free School type
    463 
    +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling=Logbook - Free School type (with sampling)
    463 464 
     observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Logbook - Object School type
    465 
    +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling=Logbook - Object School type (with sampling)
    466 
    +observe.constant.TripMapPointType.psActivityLogbookWithSampling=Logbook - Other activity (with sampling)
    464 467 
     observe.constant.TripMapPointType.psActivityObs=Observation - Other activity
    465 468 
     observe.constant.TripMapPointType.psActivityObsInHarbour=Observation - In port
    466 469 
     observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Observation - Free School type

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -460,7 +460,10 @@ observe.constant.TripMapPointType.llTripLandingHarbour=Puerto de llegada
    460 460 
     observe.constant.TripMapPointType.psActivityLogbook=Logbook - Otro Actividad
    461 461 
     observe.constant.TripMapPointType.psActivityLogbookInHarbour=Logbook - En puerto
    462 462 
     observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Logbook - Banco libre
    463 
    +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling=Logbook - Banco libre (with sampling) \#TODO
    463 464 
     observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Logbook - Banco a objeto
    465 
    +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling=Logbook - Banco a objeto (with sampling) \#TODO
    466 
    +observe.constant.TripMapPointType.psActivityLogbookWithSampling=Logbook - Otro Actividad (with sampling) \#TODO
    464 467 
     observe.constant.TripMapPointType.psActivityObs=Observation - Otro Actividad
    465 468 
     observe.constant.TripMapPointType.psActivityObsInHarbour=Observation - En puerto
    466 469 
     observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Observation - Banco libre

  • core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -457,10 +457,13 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin
    457 457 
     observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Début de filage
    458 458 
     observe.constant.TripMapPointType.llTripDepartureHarbour=Port de départ
    459 459 
     observe.constant.TripMapPointType.llTripLandingHarbour=Port d'arrivée
    460 
    -observe.constant.TripMapPointType.psActivityLogbook=Livre de Bord - Autre activité
    461 
    -observe.constant.TripMapPointType.psActivityLogbookInHarbour=Livre de Bord - Au port
    462 
    -observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Livre de Bord - Banc libre
    463 
    -observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Livre de Bord - Banc objet
    460 
    +observe.constant.TripMapPointType.psActivityLogbook=Livre de bord - Autre activité
    461 
    +observe.constant.TripMapPointType.psActivityLogbookInHarbour=Livre de bord - Au port
    462 
    +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Livre de bord - Banc libre
    463 
    +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling=Livre de bord - Banc libre (avec échantillonnage)
    464 
    +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Livre de bord - Banc objet
    465 
    +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling=Livre de bord - Banc objet (avec échantillonnage)
    466 
    +observe.constant.TripMapPointType.psActivityLogbookWithSampling=Livre de bord - Autre activité (avec échantillonnage)
    464 467 
     observe.constant.TripMapPointType.psActivityObs=Observation - Autre activité
    465 468 
     observe.constant.TripMapPointType.psActivityObsInHarbour=Observation - Au port
    466 469 
     observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Observation - Banc libre

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