Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9324ead4 by Tony Chemit at 2023-08-31T14:26:54+02:00 Contraindre les caractéristiques d'équipement (common.gearcharacteristic) autorisées pour un équipement (common.gear) donné - Closes #2765 - - - - - 338ee303 by Tony Chemit at 2023-08-31T14:26:54+02:00 Rajouter un type 'Liste de choix' dans GearCharacteristicType et une nouvelle table gearCharacteristicListItem et remplissage des listes utilisées à l'AZTI - Closes #2764 - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_02_issue-2764_fill-table-common_gearcharacteristiclistitem-common.sql 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 GearUseFeaturesMeasurementsTableModelSupport<E, P> model = (GearUseFeaturesMeasurementsTableModelSupport<E, P>) table.getModel(); ui.getTableModel().registerInlineModel(model, table); + ContentTableUITableModel<?, P, ?> tableUIModel = ui.getTableModel(); @SuppressWarnings("unchecked") P tableEditBean = (P) ui.getTableEditBean(); - tableEditBean.addPropertyChangeListener("gear", evt -> model.onGearChanged(ui.getTableModel(), (GearReference) evt.getNewValue())); - + tableEditBean.addPropertyChangeListener("gear", evt -> model.onGearChanged(tableUIModel, (GearReference) evt.getNewValue())); + tableUIModel.addPropertyChangeListener(ContentTableUITableModel.SELECTED_ROW_PROPERTY, evt -> { + int newValue = (int) evt.getNewValue(); + if (newValue != -1) { + model.onGearChanged(tableUIModel, tableEditBean.getGear()); + } + }); model.gearsById = Maps.uniqueIndex(ui.getHandler().getReferentialService().loadDtoList(GearDto.class), GearDto::getId); model.gearCharacteristicListItemsById = Maps.uniqueIndex(ui.getHandler().getReferentialReferences(GearCharacteristicListItemReference.class), GearCharacteristicListItemReference::getId); JXTableUtil.setI18nTableHeaderRenderer(table, GearUseFeaturesMeasurementAware.class, "gearCharacteristic", "measurementValue"); @@ -99,15 +105,19 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus } private void onGearChanged(ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear) { - if (!tableModel.isCreate()) { + if (!tableModel.isEditable()) { return; } if (tableModel.isAdjusting()) { return; } String gearId = newGear == null ? null : newGear.getId(); + log.info("Use gear: {}", gearId); updateAllowedCharacteristics(gearId); - setDefaultMeasurementsOnSelectedRow(gearId, tableModel.getSelectedRow()); + if (tableModel.isCreate()) { + // add default measurements + setDefaultMeasurementsOnSelectedRow(gearId, tableModel.getSelectedRow()); + } } // public void onAfterLoadRowBeanToEdit(int editingRow, P tableEditBean, boolean newRow) { @@ -167,6 +177,7 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus public void setDefaultMeasurementsOnSelectedRow(String gearId, int editingRow) { List<E> measurements = getDefaultGearUseFeaturesMeasurement(gearId); log.info(String.format("Create mode, use default measurements: %d", measurements.size())); + //FIXME Error no list for row -1 cache().replace(editingRow, measurements); setData(measurements); 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 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'); -- INSERT INTO common.Gear_GearCharacteristic(gear, gearCharacteristic) VALUES('fr.ird.referential.common.Gear#1239832686125#0.16', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}013'); -- UPDATE common.Gear SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE topiaId = 'fr.ird.referential.common.Gear#1239832686125#0.16'; -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'); -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'); -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'); -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'); -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'); -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'); -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'); +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'); +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'); +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'); +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'); +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'); +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'); +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'); -- LIST 014 Sonda (38) 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'); 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: https://gitlab.com/ultreiaio/ird-observe/-/compare/cb86501eaf7d373e30b2a2e8b... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cb86501eaf7d373e30b2a2e8b... You're receiving this email because of your account on gitlab.com.