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

Commits:

2 changed files:

Changes:

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java
    ... ... @@ -72,9 +72,15 @@ 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 -> {
    79 
    +            int newValue = (int) evt.getNewValue();
    80 
    +            if (newValue != -1) {
    81 
    +                model.onGearChanged(tableUIModel, tableEditBean.getGear());
    82 
    +            }
    83 
    +        });
    78 84 
             model.gearsById = Maps.uniqueIndex(ui.getHandler().getReferentialService().loadDtoList(GearDto.class), GearDto::getId);
    79 85 
             model.gearCharacteristicListItemsById = Maps.uniqueIndex(ui.getHandler().getReferentialReferences(GearCharacteristicListItemReference.class), GearCharacteristicListItemReference::getId);
    80 86 
             JXTableUtil.setI18nTableHeaderRenderer(table, GearUseFeaturesMeasurementAware.class, "gearCharacteristic", "measurementValue");
    ... ... @@ -99,15 +105,19 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus
    99 105 
         }
    100 106
    101 107 
         private void onGearChanged(ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear) {
    102 
    -        if (!tableModel.isCreate()) {
    108 
    +        if (!tableModel.isEditable()) {
    103 109 
                 return;
    104 110 
             }
    105 111 
             if (tableModel.isAdjusting()) {
    106 112 
                 return;
    107 113 
             }
    108 114 
             String gearId = newGear == null ? null : newGear.getId();
    115 
    +        log.info("Use gear: {}", gearId);
    109 116 
             updateAllowedCharacteristics(gearId);
    110 
    -        setDefaultMeasurementsOnSelectedRow(gearId, tableModel.getSelectedRow());
    117 
    +        if (tableModel.isCreate()) {
    118 
    +            // add default measurements
    119 
    +            setDefaultMeasurementsOnSelectedRow(gearId, tableModel.getSelectedRow());
    120 
    +        }
    111 121 
         }
    112 122
    113 123 
     //    public void onAfterLoadRowBeanToEdit(int editingRow, P tableEditBean, boolean newRow) {
    ... ... @@ -167,6 +177,7 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus
    167 177 
         public void setDefaultMeasurementsOnSelectedRow(String gearId, int editingRow) {
    168 178 
             List<E> measurements = getDefaultGearUseFeaturesMeasurement(gearId);
    169 179 
             log.info(String.format("Create mode, use default measurements: %d", measurements.size()));
    180 
    +        //FIXME Error no list for row -1
    170 181 
             cache().replace(editingRow, measurements);
    171 182 
             setData(measurements);
    172 183 
             setModified(false);

  • 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');

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