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

Commits:

5 changed files:

Changes:

  • client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
    ... ... @@ -141,9 +141,9 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig
    141 141 
          *
    142 142 
          * @since 1.5
    143 143 
          */
    144 
    -    private final String[] doNotSave = new String[]{
    144 
    +    private final Set<String> doNotSave = Set.of(
    145 145 
     //            ClientConfigOption.OBSTUNA_PASSWORD.getKey(),
    146 
    -            ClientConfigOption.H2_PASSWORD.getKey(), ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey(),};
    146 
    +            ClientConfigOption.H2_PASSWORD.getKey(), ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey());
    147 147
    148 148 
         private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm z");
    149 149 
         /**

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java
    ... ... @@ -72,9 +72,10 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus
    72 72 
             GearUseFeaturesMeasurementsTableModelSupport<E, P> model = (GearUseFeaturesMeasurementsTableModelSupport<E, P>) table.getModel();
    73 73 
             ui.getTableModel().registerInlineModel(model, table);
    74 74
    75 
    +        ContentTableUITableModel<?, P, ?> tableUIModel = ui.getTableModel();
    75 76 
             @SuppressWarnings("unchecked") P tableEditBean = (P) ui.getTableEditBean();
    76 
    -        tableEditBean.addPropertyChangeListener("gear", evt -> model.onGearChanged(ui.getTableModel(), (GearReference) evt.getNewValue()));
    77 
    -
    77 
    +        tableEditBean.addPropertyChangeListener("gear", evt -> model.onGearChanged(tableUIModel, (GearReference) evt.getNewValue()));
    78 
    +        tableUIModel.addPropertyChangeListener(ContentTableUITableModel.SELECTED_ROW_PROPERTY, evt-> model.onGearChanged(tableUIModel, tableEditBean.getGear()));
    78 79 
             model.gearsById = Maps.uniqueIndex(ui.getHandler().getReferentialService().loadDtoList(GearDto.class), GearDto::getId);
    79 80 
             model.gearCharacteristicListItemsById = Maps.uniqueIndex(ui.getHandler().getReferentialReferences(GearCharacteristicListItemReference.class), GearCharacteristicListItemReference::getId);
    80 81 
             JXTableUtil.setI18nTableHeaderRenderer(table, GearUseFeaturesMeasurementAware.class, "gearCharacteristic", "measurementValue");
    ... ... @@ -99,15 +100,19 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus
    99 100 
         }
    100 101
    101 102 
         private void onGearChanged(ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear) {
    102 
    -        if (!tableModel.isCreate()) {
    103 
    +        if (!tableModel.isEditable()) {
    103 104 
                 return;
    104 105 
             }
    105 106 
             if (tableModel.isAdjusting()) {
    106 107 
                 return;
    107 108 
             }
    108 109 
             String gearId = newGear == null ? null : newGear.getId();
    110 
    +        log.info("Use gear: {}", gearId);
    109 111 
             updateAllowedCharacteristics(gearId);
    110 
    -        setDefaultMeasurementsOnSelectedRow(gearId, tableModel.getSelectedRow());
    112 
    +        if (tableModel.isCreate()) {
    113 
    +            // add default measurements
    114 
    +            setDefaultMeasurementsOnSelectedRow(gearId, tableModel.getSelectedRow());
    115 
    +        }
    111 116 
         }
    112 117
    113 118 
     //    public void onAfterLoadRowBeanToEdit(int editingRow, P tableEditBean, boolean newRow) {

  • core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_02_issue-2764_fill-table-common_gearcharacteristiclistitem-common.sql
    ... ... @@ -183,13 +183,13 @@ INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreat
    183 183 
     INSERT INTO common.GearCharacteristic (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, gearCharacteristicType) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 'L013', null, null, false, 1, 'Brand and model (Sonda desconocida ?)',         'Marque et modèle (Sonda desconocida ?)',         'Marca y modelo (Sonda desconocida)',         'fr.ird.referential.common.GearCharacteristicType#1464000000000#0.8');
    184 184 
     -- INSERT INTO common.Gear_GearCharacteristic(gear, gearCharacteristic) VALUES('fr.ird.referential.common.Gear#1239832686125#0.16', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    185 185 
     -- UPDATE common.Gear SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE topiaId = 'fr.ird.referential.common.Gear#1239832686125#0.16';
    186 
    -INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013001', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '002_001', null, null, false, 1, 'CRAME - 828',              'CRAME - 828',              'CRAME - 828',              null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    187 
    -INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013002', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '002_001', null, null, false, 1, 'FURUNO - FCV-220/221T',    'FURUNO - FCV-220/221T',    'FURUNO - FCV-220/221T',    null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    188 
    -INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013003', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '002_001', null, null, false, 1, 'HONDEX - HE-301 A/N',      'HONDEX - HE-301 A/N',      'HONDEX - HE-301 A/N',      null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    189 
    -INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013004', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '002_001', null, null, false, 1, 'HONDEX - HE-710 MARK II',  'HONDEX - HE-710 MARK II',  'HONDEX - HE-710 MARK II',  null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    190 
    -INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013005', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '002_001', null, null, false, 1, 'HONDEX - HE-710 MARK III', 'HONDEX - HE-710 MARK III', 'HONDEX - HE-710 MARK III', null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    191 
    -INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013006', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '002_001', null, null, false, 1, 'SKIPPER - 802',            'SKIPPER - 802',            'SKIPPER - 802',            null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    192 
    -INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013007', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '002_001', null, null, false, 1, 'SIMRAD - ST15',            'SIMRAD - ST15',            'SIMRAD - ST15',            null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    186 
    +INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013001', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '013_001', null, null, false, 1, 'CRAME - 828',              'CRAME - 828',              'CRAME - 828',              null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    187 
    +INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013002', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '013_002', null, null, false, 1, 'FURUNO - FCV-220/221T',    'FURUNO - FCV-220/221T',    'FURUNO - FCV-220/221T',    null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    188 
    +INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013003', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '013_003', null, null, false, 1, 'HONDEX - HE-301 A/N',      'HONDEX - HE-301 A/N',      'HONDEX - HE-301 A/N',      null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    189 
    +INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013004', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '013_004', null, null, false, 1, 'HONDEX - HE-710 MARK II',  'HONDEX - HE-710 MARK II',  'HONDEX - HE-710 MARK II',  null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    190 
    +INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013005', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '013_005', null, null, false, 1, 'HONDEX - HE-710 MARK III', 'HONDEX - HE-710 MARK III', 'HONDEX - HE-710 MARK III', null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    191 
    +INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013006', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '013_006', null, null, false, 1, 'SKIPPER - 802',            'SKIPPER - 802',            'SKIPPER - 802',            null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    192 
    +INSERT INTO common.GearCharacteristicListItem (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, comment, gearCharacteristic) VALUES ('fr.ird.referential.common.GearCharacteristicListItem#${REFERENTIAL_PREFIX}013007', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '013_007', null, null, false, 1, 'SIMRAD - ST15',            'SIMRAD - ST15',            'SIMRAD - ST15',            null, 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013');
    193 193 
     -- LIST 014 Sonda (38)
    194 194 
     INSERT INTO common.GearCharacteristic (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, gearCharacteristicType) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}014', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 'L014', null, null, false, 1, 'Brand and model (Sonda ?)',         'Marque et modèle (Sonda ?)',         'Marca y modelo (Sonda)',         'fr.ird.referential.common.GearCharacteristicType#1464000000000#0.8');
    195 195 
     INSERT INTO common.Gear_GearCharacteristic(gear, gearCharacteristic) VALUES('fr.ird.referential.common.Gear#1239832686125#0.16', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}014');

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

  • server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java
    ... ... @@ -42,6 +42,8 @@ import java.nio.file.Files;
    42 42 
     import java.nio.file.Path;
    43 43 
     import java.util.Collections;
    44 44 
     import java.util.Map;
    45 
    +import java.util.Properties;
    46 
    +import java.util.Set;
    45 47
    46 48 
     /**
    47 49 
      * Web server configuration.
    ... ... @@ -90,9 +92,13 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar
    90 92 
             ServerConfig fakeConfig = new ServerConfig(setCommonExtraConfigDirectory(setConfigFileName(init)), true);
    91 93 
             fakeConfig.initFirst();
    92 94
    95 
    +        // Get extra scope options (if any)
    96 
    +        Properties extraProperties = new Properties();
    97 
    +        fakeConfig.get().putAll(extraProperties, ApplicationConfigScope.EXTRA);
    98 
    +        extraProperties.put(ServerConfigOption.CONTEXT_PATH.getKey(), contextPath);
    93 99 
             // Now that common files are ready, starts a normal configuration without system file and without migration possible
    94 100 
             ApplicationConfigInit realInit = ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM)
    95 
    -                .addDefaults(ServerConfigOption.CONTEXT_PATH.getKey(), contextPath);
    101 
    +                .setDefaults(extraProperties);
    96 102
    97 103 
             ServerConfig config = new ServerConfig(setInstanceExtraConfigDirectory(setConfigFileName(realInit)));
    98 104 
             config.init(true);
    ... ... @@ -143,7 +149,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar
    143 149 
             File extraConfigFile = get().getExtraConfigFile();
    144 150 
             if (Files.notExists(extraConfigFile.toPath())) {
    145 151 
                 log.info(String.format("Save common configuration file to: %s", extraConfigFile));
    146 
    -            ConfigHelper.save(get(), extraConfigFile, new String[0], ServerResources.APPLICATION_CONFIGURATION, options());
    152 
    +            ConfigHelper.save(get(), extraConfigFile, Set.of(), ServerResources.APPLICATION_CONFIGURATION, options());
    147 153 
             }
    148 154
    149 155 
             File log4jConfigurationFile = getCommonLog4jConfigurationFile();
    ... ... @@ -174,7 +180,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar
    174 180 
             // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2735
    175 181
    176 182 
             log.info(String.format("Save instance configuration file to: %s", extraConfigFile));
    177 
    -        ConfigHelper.save(get(), extraConfigFile, new String[0], ServerResources.APPLICATION_CONFIGURATION, options());
    183 
    +        ConfigHelper.save(get(), extraConfigFile, Set.of(), ServerResources.APPLICATION_CONFIGURATION, options());
    178 184
    179 185 
             if (log.isInfoEnabled()) {
    180 186 
                 String message = getConfigurationDescription();

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