October 2023 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Pushed new branch release/9.2.0
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

Tony CHEMIT pushed new branch release/9.2.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.2.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.2.0 [skip CI]
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 32b43414 by Tony Chemit at 2023-10-09T11:13:58+02:00 Update changelog for v.9.2.0 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,16 +1,66 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-07-15 12:19. + * Last generated at 2023-10-09 11:10. + +## Version [9.2.0](https://gitlab.com/ultreiaio/ird-observe/-/milestones/269) + +**Closed at 2023-10-09.** + +### Download +* [Client (observe-9.2.0-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.2.0.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.2.0-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + + +### Issues + * [[Type::Anomalie 2761]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2761) **Validation d'une activité 13 sans heure** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2768]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2768) **On ne voit pas les toolTip dans les arbres des assistants de synchronisation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2769]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2769) **La valeur de configuration instance.security.key n'est pas bien enregistrée même si elle est présente dans les fichiers de configuration commun (/var/local/observe-server/.conf/9.x)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2774]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2774) **En mode indexé, lorsque l'on remonte une activité, les activités qui lui succédaient sont incrémentées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2777]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2777) **Sur les écrans LL-Observation qui renseigne des avançons, le champs TimeSinceContact est initialement accéssible alors que cela est conditionné par le champ Timer** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2778]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2778) **Sur LL-Observation Capture, dans l'onglet Avançon le champ Horodatage de montée à bord n'est jamais accessible** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2779]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2779) **La valeur null du champs de type time est altérée lors de l'ouverture des formulaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2786]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2786) **Lors de la suppression d'une donnée, il faut mettre à jour le champ lastUpdateDate sur les entités qui remontent jusqu'à la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2792]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2792) **Une incompatibilité empêche l'ouverture de l'application sous Java 21** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2211]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2211) **Revoir la validation pour produire un résultat en forme d'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2215]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2215) **Améliorer le rapport de validation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2449]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2449) **Nouveaux flags allowSet et fpaZoneMode sur les types d'activités bateau** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2497]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2497) **Filtrage des devenirs pour les données observation et logbooks PS et LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2498]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2498) **Filtrage des types d'activité bateau pour les données observation et logbooks PS et LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2706]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2706) **Améliorer l'identification des enregistrements dans l'UI de validation batch** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2707]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2707) **Faire évoluer l'UI équipement du bateau pour autoriser la gestion de listes de référence** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2708]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2708) **Ajout de deux nouveaux champs et listes déroulantes sur le formulaire bonnes pratiques de remise à l'eau** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2714]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2714) **ll_observation.Catch.count devrait être NOT NULL** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2725]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2725) **Contrôler la syntaxe des id balises par une expression régulière propre à chaque modèle de balise** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2729]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2729) **En PS / logbook / Activité, voir comment mieux gérer l'ajout d'une activité dont l'horaire précéde celui de la dernière activité saisie (souci lié au numéro d'activité auto incrémenté)** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2740]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2740) **En PS / logbook, ajouter 2 champs previousFpaZone et nextFpaZone** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2750]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2750) **Effectuer un différentiel sur l'UI de synchro de marées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2762]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2762) **Normalisation des drapeaux sur référentiels qui permettent de filtrer la liste des référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2763]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2763) **Rajouter un type Date (simple et sans time zone) dans GearCharacteristicType** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2767]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2767) **Ne plus afficher le label L'opération requière des corrections sur les interfaces de certains assistants** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2771]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2771) **Sur les validateur de type taille/poids d'une espèce, rajouter dans le message la valeur incriminée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2772]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2772) **Ne pas autoriser l'utilisation d'une caractéristique plus d'une fois sur le formulaire équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2773]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2773) **Mauvaise récupération des heures dans l'API publique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2776]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2776) **Suppression des JSlider sur les éditeurs de temps** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2780]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2780) **Lors de la migration, il faut réorganiser les numéros d'ordre des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2781]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2781) **Ajout de règles de validation sur les champ zone FPA sur les formulaires Activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2782]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2782) **Ne pas autoriser la recherche dans les arbres (via l'API consacrée dans JTree)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2783]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2783) **Ajouter une rège de validation sur les routes pour vérifier que les numéros d'ordre suivent bien une séquence partant de 1** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2784]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2784) **Sur la suppression d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2785]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2785) **Sur le déplacement d'un activité, il faut recalculer les numéros d'ordre des activités sur la route origine et la route destination du déplacement.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2787]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2787) **Ajout de caractéristiques autorisées sur des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2788]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2788) **Supprimer les valeurs ```None``` des identifiants de balises via la migration classique.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Tâche 2791]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2791) **Problème de connexion au serveur IEO** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.1.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/270) **Closed at 2023-07-15.** ### Download - * [Client (observe-9.1.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - * [Serveur (observe-9.1.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) - * [Serveur (observe-9.1.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Client (observe-9.1.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.1.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.1.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) ### Issues * [[Type::Anomalie 2747]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2747) **Séquence du focus sur PS / Logbook / Activité** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/32b43414e9184300f66f53f94… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/32b43414e9184300f66f53f94… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: L'UI équipement n'interdit pas d'associer à un équipement une caractéristique...
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: af5bc111 by Tony Chemit at 2023-10-09T10:59:59+02:00 L'UI équipement n'interdit pas d'associer à un équipement une caractéristique qui ne lui est pas destinée - Closes 2793 - - - - - a489cc05 by Tony Chemit at 2023-10-09T11:03:52+02:00 Elargir l'affichage du panneau Caractéristiques (d'un équipement) - Closes 2794 - - - - - 4 changed files: - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModelWithCache.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModelWithCache.java ===================================== @@ -86,7 +86,7 @@ public abstract class EditableTableModelWithCache<E extends BusinessDto & Inline } } - public final void onBeforeResetRow(String prefix, int editingRow, JTable table) { + public void onBeforeResetRow(String prefix, int editingRow, JTable table) { if (!isEditable()) { return; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java ===================================== @@ -33,6 +33,7 @@ import fr.ird.observe.client.util.table.EditableTableModelWithCache; import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.data.ContainerChildDto; +import fr.ird.observe.dto.data.ContainerDto; import fr.ird.observe.dto.data.GearUseFeaturesAware; import fr.ird.observe.dto.data.GearUseFeaturesMeasurementAware; import fr.ird.observe.dto.referential.common.GearCharacteristicListItemReference; @@ -46,6 +47,7 @@ import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.JScrollPane; +import javax.swing.JTable; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -66,19 +68,21 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus private FilterableComboBox<GearCharacteristicReference> gearCharacteristicEditor; private List<GearCharacteristicReference> allowedCharacteristics; + private ContentTableUI<?, P, ?> ui; + @SuppressWarnings("unchecked") public static <E extends BusinessDto & GearUseFeaturesMeasurementAware, P extends ContainerChildDto & GearUseFeaturesAware> void onInit(ContentTableUI<?, P, ?> ui, JScrollPane scrollPane, EditableTable<E, ?> table, SwingValidator<E> rowValidator) { table.setRowHeight(22); GearUseFeaturesMeasurementsTableModelSupport<E, P> model = (GearUseFeaturesMeasurementsTableModelSupport<E, P>) table.getModel(); ui.getTableModel().registerInlineModel(model, table); - + model.ui = ui; ContentTableUITableModel<?, P, ?> tableUIModel = ui.getTableModel(); @SuppressWarnings("unchecked") P tableEditBean = (P) ui.getTableEditBean(); - tableEditBean.addPropertyChangeListener("gear", evt -> model.onGearChanged(tableUIModel, (GearReference) evt.getNewValue())); + tableEditBean.addPropertyChangeListener("gear", evt -> model.onGearChanged(ui, tableUIModel, (GearReference) evt.getNewValue(), false)); tableUIModel.addPropertyChangeListener(ContentTableUITableModel.SELECTED_ROW_PROPERTY, evt -> { int newValue = (int) evt.getNewValue(); if (newValue != -1) { - model.onGearChanged(tableUIModel, tableEditBean.getGear()); + model.onGearChanged(ui, tableUIModel, tableEditBean.getGear(), true); } }); model.gearsById = Maps.uniqueIndex(ui.getHandler().getReferentialService().loadDtoList(GearDto.class), GearDto::getId); @@ -104,7 +108,24 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus super(listProperty); } - private void onGearChanged(ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear) { + @Override + public void onBeforeResetRow(String prefix, int editingRow, JTable table) { + if (!isEditable()) { + return; + } + log.info(String.format("%sBefore reset edit bean at row: %d", prefix, editingRow)); + UIHelper.cancelEditing(table); + @SuppressWarnings("unchecked") ContainerDto<P> containerBean = (ContainerDto<P>) ui.getBean(); + List<P> children = containerBean.getChildren(); + P bean = children.get(editingRow); + @SuppressWarnings("unchecked") List<E> gearUseFeaturesMeasurement = (List<E>) bean.getGearUseFeaturesMeasurement(); + cache().replace(editingRow, gearUseFeaturesMeasurement); + List<E> newData = cache().get(editingRow); + setData(newData); + validate(); + } + + private void onGearChanged(ContentTableUI<?, P, ?> ui, ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear, boolean selectionRowChanged) { if (!tableModel.isEditable()) { return; } @@ -112,35 +133,14 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus return; } String gearId = newGear == null ? null : newGear.getId(); - log.info("Use gear: {}", gearId); - updateAllowedCharacteristics(gearId); - if (tableModel.isCreate()) { - // add default measurements + log.info("Use gear: {}, selection row changed? {}, existing measurements ({})", gearId, selectionRowChanged, getRowCount()); + if (!selectionRowChanged && !ui.getStates().isResetEdit()) { + // This means user has changed the gear, need to reset measurement, then add default ones setDefaultMeasurementsOnSelectedRow(gearId, tableModel.getSelectedRow()); } + updateAllowedCharacteristics(gearId); } -// public void onAfterLoadRowBeanToEdit(int editingRow, P tableEditBean, boolean newRow) { -// List<E> measurements = get(editingRow); -// if (measurements == null) { -// log.info(String.format("init measurements for row %d", editingRow)); -// // first time coming on this row -// if (newRow) { -// // create mode: just init with empty list -// measurements = Collections.emptyList(); -// log.info("create mode, use an empty list"); -// } else { -// measurements = new ArrayList<>(getGearUseFeaturesMeasurement(tableEditBean)); -// } -// // init measurements -// put(editingRow, measurements); -// } else { -// log.info(String.format("Using existing measurements for row %d : %d", editingRow, measurements.size())); -// } -// setData(measurements); -// setModified(false); -// } - @Override public final int getColumnCount() { return 2; @@ -176,7 +176,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())); + log.info(String.format("User mode, use default measurements: %d", measurements.size())); //FIXME Error no list for row -1 cache().replace(editingRow, measurements); setData(measurements); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUI.jaxx ===================================== @@ -58,54 +58,55 @@ <Table id='editorPanel' fill='both' insets='0' beanScope="tableEditBean"> <row> - <cell weightx="0.5"> - <JXTitledPanel id="definitionPanel" contentContainer='{definitionForm}'> - <Table id='definitionForm' fill='both' insets='1'> -  - <row> - <cell> - <JLabel id='gearLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <FilterableComboBox id='gear' genericType='GearReference'/> - </cell> - </row> -  - <row> - <cell> - <JLabel id='numberLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='number' styleClass="int6"/> - </cell> - </row> -  - <row> - <cell> - <JLabel id='usedInTripLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <BooleanEditor id='usedInTrip'/> - </cell> - </row> -  - <row> - <cell columns="2" weighty='1'> - <BigTextEditor id="comment"/> - </cell> - </row> - </Table> - </JXTitledPanel> - </cell> - <cell weightx="0.5"> - <JXTitledPanel id="measurementsPanel" contentContainer='{measurementsInternalPanel}'> - <JPanel id="measurementsInternalPanel" layout='{new GridLayout()}'> - <JScrollPane id='measurementsScrollPane'> - <EditableTable id='measurementsTable' constructorParams='measurementsTableModel' genericType="GearUseFeaturesMeasurementDto, GearUseFeaturesMeasurementsTableModel"/> - </JScrollPane> - </JPanel> - </JXTitledPanel> + <cell weightx="1"> + <JPanel layout="{new GridLayout()}"> + <JXTitledPanel id="definitionPanel" contentContainer='{definitionForm}'> + <Table id='definitionForm' fill='both' insets='1'> +  + <row> + <cell> + <JLabel id='gearLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <FilterableComboBox id='gear' genericType='GearReference'/> + </cell> + </row> +  + <row> + <cell> + <JLabel id='numberLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NumberEditor id='number' styleClass="int6"/> + </cell> + </row> +  + <row> + <cell> + <JLabel id='usedInTripLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <BooleanEditor id='usedInTrip'/> + </cell> + </row> +  + <row> + <cell columns="2" weighty='1'> + <BigTextEditor id="comment"/> + </cell> + </row> + </Table> + </JXTitledPanel> + <JXTitledPanel id="measurementsPanel" contentContainer='{measurementsInternalPanel}'> + <JPanel id="measurementsInternalPanel" layout='{new GridLayout()}'> + <JScrollPane id='measurementsScrollPane'> + <EditableTable id='measurementsTable' constructorParams='measurementsTableModel' genericType="GearUseFeaturesMeasurementDto, GearUseFeaturesMeasurementsTableModel"/> + </JScrollPane> + </JPanel> + </JXTitledPanel> + </JPanel> </cell> </row> </Table> + <JMenuItem id='moveAll' styleClass='editableAndNotModifiedAndTableNotEmpty'/> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx ===================================== @@ -58,53 +58,53 @@ <Table id='editorPanel' fill='both' insets='0' beanScope="tableEditBean"> <row> - <cell weightx="0.5"> - <JXTitledPanel id="definitionPanel" contentContainer='{definitionForm}'> - <Table id='definitionForm' fill='both' insets='1'> -  - <row> - <cell> - <JLabel id='gearLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <FilterableComboBox id='gear' genericType='GearReference'/> - </cell> - </row> -  - <row> - <cell> - <JLabel id='numberLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='number' styleClass="int6"/> - </cell> - </row> -  - <row> - <cell> - <JLabel id='usedInTripLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <BooleanEditor id='usedInTrip'/> - </cell> - </row> -  - <row> - <cell columns="2" weighty='1'> - <BigTextEditor id="comment"/> - </cell> - </row> - </Table> - </JXTitledPanel> - </cell> - <cell weightx="0.5"> - <JXTitledPanel id="measurementsPanel" contentContainer='{measurementsInternalPanel}'> - <JPanel id="measurementsInternalPanel" layout='{new GridLayout()}'> - <JScrollPane id='measurementsScrollPane'> - <EditableTable id='measurementsTable' constructorParams='measurementsTableModel' genericType="GearUseFeaturesMeasurementDto, GearUseFeaturesMeasurementsTableModel"/> - </JScrollPane> - </JPanel> - </JXTitledPanel> + <cell weightx="1"> + <JPanel layout="{new GridLayout()}"> + <JXTitledPanel id="definitionPanel" contentContainer='{definitionForm}'> + <Table id='definitionForm' fill='both' insets='1'> +  + <row> + <cell> + <JLabel id='gearLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <FilterableComboBox id='gear' genericType='GearReference'/> + </cell> + </row> +  + <row> + <cell> + <JLabel id='numberLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NumberEditor id='number' styleClass="int6"/> + </cell> + </row> +  + <row> + <cell> + <JLabel id='usedInTripLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <BooleanEditor id='usedInTrip'/> + </cell> + </row> +  + <row> + <cell columns="2" weighty='1'> + <BigTextEditor id="comment"/> + </cell> + </row> + </Table> + </JXTitledPanel> + <JXTitledPanel id="measurementsPanel" contentContainer='{measurementsInternalPanel}'> + <JPanel id="measurementsInternalPanel" layout='{new GridLayout()}'> + <JScrollPane id='measurementsScrollPane'> + <EditableTable id='measurementsTable' constructorParams='measurementsTableModel' genericType="GearUseFeaturesMeasurementDto, GearUseFeaturesMeasurementsTableModel"/> + </JScrollPane> + </JPanel> + </JXTitledPanel> + </JPanel> </cell> </row> </Table> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d6624be7806c07e795b9323d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d6624be7806c07e795b9323d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Rajouter un type 'Liste de choix' dans GearCharacteristicType et une nouvelle...
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d6624be7 by Tony Chemit at 2023-10-09T09:41:56+02:00 Rajouter un type 'Liste de choix' dans GearCharacteristicType et une nouvelle table gearCharacteristicListItem et remplissage des listes utilisées à l'AZTI - See 2764 - - - - - 22 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-001-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-002-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-003-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-004-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-005-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-006-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-007-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-011-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-012-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-013-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-014-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-015-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-016-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-017-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-018-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-019-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-020-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-021-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-022-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-023-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-024-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d6624be7806c07e795b9323d8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d6624be7806c07e795b9323d8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Problème de connexion au serveur IEO - Closes #2791
by Tony CHEMIT (＠tchemit) 08 Oct '23

08 Oct '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2b2f14d4 by Tony Chemit at 2023-10-05T20:31:51+02:00 Problème de connexion au serveur IEO - Closes #2791 - - - - - e2385264 by Tony Chemit at 2023-10-06T09:52:51+02:00 Une incompatibilité empêche l'ouverture de l'application sous Java 21 - Closes #2792 - - - - - 11 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/i18n/getters/java.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - + client/configuration/src/main/resources/observe.jks - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties Changes: ===================================== client/configuration/src/main/config/Client.ini ===================================== @@ -331,6 +331,12 @@ type = file defaultValue = ${instance.resources.directory}/observe-log4j2.xml transient = true +[option useJvmKeyStore] +description = observe.config.useJvmKeyStore.description +key = instance.useJvmKeyStore +type = Boolean +defaultValue = false + [option longlineActivityPairingMaxDistance] description = observe.config.longlineActivityPairing.maxDistance key = instance.longlineActivityPairing.maxDistance ===================================== client/configuration/src/main/i18n/getters/config.getter ===================================== @@ -153,6 +153,7 @@ observe.config.ui.tree.node.disabled.color observe.config.ui.tree.node.empty.color observe.config.ui.tree.node.unloaded.color observe.config.ui.tree.node.unsaved.color +observe.config.useJvmKeyStore.description observe.config.validation.lengthWeightEnable observe.config.validation.speedEnable observe.config.validation.speedMaxValue ===================================== client/configuration/src/main/i18n/getters/java.getter ===================================== @@ -5,7 +5,9 @@ observe.runner.copy.default.map.file observe.runner.copy.default.report.file observe.runner.copy.default.swing.preferences.file observe.runner.copy.default.ui.file +observe.runner.copy.embedded.keystore.file observe.runner.loading.ui.configuration +observe.runner.use.embedded.keystore.file observe.ui.message.save.configuration observe.warning.nimbus.landf observe.warning.no.ui ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -430,6 +430,26 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig // 11 - export directory createDirectory(ClientConfigOption.EXPORT_DIRECTORY); + + // 12 - Add custom keystore (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2791) + + Path keystore = resourcesDirectory.toPath().resolve("observe.jks"); + if (Files.notExists(keystore)) { + String message = t("observe.runner.copy.embedded.keystore.file", keystore); + log.info(message); + ClientResources.KEYSTORE.copyResource(keystore.toFile()); + } + + if (!isUseJvmKeyStore()) { + String message = t("observe.runner.use.embedded.keystore.file", keystore); + log.info(message); + System.setProperty("javax.net.ssl.trustStore", keystore.toString()); + System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); + } else { + System.clearProperty("javax.net.ssl.trustStore"); + System.clearProperty("javax.net.ssl.trustStorePassword"); + } + } public void detectLocalDataBase() { ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java ===================================== @@ -42,4 +42,5 @@ public final class ClientResources { public static final ConfigResource LOG_CONFIGURATION_FILE = new ConfigResource("/observe-log4j2.xml"); public static final ConfigResource DCP_PRESETS = new ConfigResource("/dcp-presets.zip"); public static final ConfigResource mapLayers = new ConfigResource("/map.zip"); + public static final ConfigResource KEYSTORE = new ConfigResource("/observe.jks"); } ===================================== client/configuration/src/main/resources/observe.jks ===================================== Binary files /dev/null and b/client/configuration/src/main/resources/observe.jks differ ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.h2.backup; */ import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.ObserveDataSourcesManager; @@ -30,10 +31,10 @@ import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceEvent; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceListenerAdapter; import fr.ird.observe.client.util.ObserveSwingTechnicalException; -import io.ultreia.java4all.lang.Strings; +import io.ultreia.java4all.util.json.adapters.DateAdapter; +import io.ultreia.java4all.util.sql.SqlScript; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import io.ultreia.java4all.util.sql.SqlScript; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -41,12 +42,8 @@ import java.io.Closeable; import java.io.IOException; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.Iterator; @@ -69,11 +66,11 @@ public class BackupsManager implements Closeable { private static final Pattern AUTOMATIC_BACKUP_FILENAME_PATTERN = Pattern.compile("obs.+-([0-9-]+)\\.sql\\.gz"); - private final Path backupsPath; private final ObserveDataSourcesManager dataSourcesManager; private final Path storePath; private final List<BackupStorage> backups; private final BlockingDeque<BackupStorage> backupsToCheck = new LinkedBlockingDeque<>(); + private final Gson gson; private boolean run = true; private final Thread checkBackups = new Thread("Check-Backups") { @Override @@ -121,16 +118,21 @@ public class BackupsManager implements Closeable { public BackupsManager(ClientConfig config, ObserveDataSourcesManager dataSourcesManager) { this.storePath = config.getBackupsFile().toPath(); - this.backupsPath = config.getBackupDirectory().toPath(); this.dataSourcesManager = dataSourcesManager; - + this.gson = new GsonBuilder().registerTypeAdapter(Date.class, new DateAdapter()).create(); try { List<BackupStorage> backups; if (config.isBackupUse() && Files.exists(storePath)) { try (BufferedReader reader = Files.newBufferedReader(storePath, StandardCharsets.UTF_8)) { Type typeOfT = new TypeToken<List<BackupStorage>>() { }.getType(); - backups = new Gson().fromJson(reader, typeOfT); + + try { + backups = gson.fromJson(reader, typeOfT); + } catch (Exception e) { + log.error(String.format("Could not load %s file.", storePath), e); + backups = new LinkedList<>(); + } log.info(String.format("Loaded %d backups from %s", backups.size(), storePath)); } } else { @@ -160,36 +162,10 @@ public class BackupsManager implements Closeable { } } - private List<BackupStorage> discoverAutomaticBackups(Path backupsPath) throws IOException { - List<BackupStorage> backups = new ArrayList<>(); - Files.walkFileTree(backupsPath, new SimpleFileVisitor<>() { - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - Matcher matcher = AUTOMATIC_BACKUP_FILENAME_PATTERN.matcher(file.toFile().getName()); - if (matcher.matches()) { - BackupStorage backupStorage = new BackupStorage(); - backupStorage.setDate(new Date(Files.getLastModifiedTime(file).toMillis())); - backupStorage.setFile(file.toFile()); - backupStorage.setAutomatic(true); - backupStorage.setVerified(false); - backupStorage.setName(matcher.group(1)); - backups.add(backupStorage); - } - return FileVisitResult.CONTINUE; - } - }); - log.info(String.format("Discovered %d automatic backups from %s", backups.size(), backupsPath)); - return backups; - } - public List<BackupStorage> getAutomaticBackups() { return backups.stream().filter(BackupStorage::isAutomatic).sorted(Comparator.comparing(BackupStorage::getDate).reversed()).collect(Collectors.toList()); } - public List<BackupStorage> getUserBackups() { - return backups.stream().filter(BackupStorage::isUser).sorted(Comparator.comparing(BackupStorage::getDate).reversed()).collect(Collectors.toList()); - } - public void addAutomaticBackup(Path backupPath) { Matcher matcher = AUTOMATIC_BACKUP_FILENAME_PATTERN.matcher(backupPath.toFile().getName()); if (!matcher.matches()) { @@ -204,21 +180,6 @@ public class BackupsManager implements Closeable { backupsToCheck.add(backupStorage); } - public void addUserBackup(Path backupPath) { - BackupStorage backupStorage = new BackupStorage(); - backupStorage.setDate(new Date()); - backupStorage.setFile(backupPath.toFile()); - backupStorage.setAutomatic(false); - backupStorage.setVerified(false); - String name = Strings.removeEnd(backupPath.toFile().getName(), ".sql.gz"); - backupStorage.setName(name); - backupsToCheck.add(backupStorage); - } - - public void sanityBackups() { - log.info("Sanity backups at " + backupsPath); - } - @Override public void close() { @@ -239,7 +200,7 @@ public class BackupsManager implements Closeable { private void storeBackups() throws IOException { log.info(String.format("Store %d backups to %s", backups.size(), storePath)); try (BufferedWriter writer = Files.newBufferedWriter(storePath, StandardCharsets.UTF_8)) { - new Gson().toJson(backups, writer); + gson.toJson(backups, writer); } } ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -406,6 +406,7 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext helper.addOption(ClientConfigOption.AVDTH_FORCE_IMPORT); helper.addOption(ClientConfigOption.SHOW_SQL); + helper.addOption(ClientConfigOption.USE_JVM_KEY_STORE); } ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -170,6 +170,7 @@ observe.config.ui.tree.node.disabled.color=Color for disabled node observe.config.ui.tree.node.empty.color=Color for empty node observe.config.ui.tree.node.unloaded.color=Color for unloaded node observe.config.ui.tree.node.unsaved.color=Color for unsaved node +observe.config.useJvmKeyStore.description=To use the Java «keystore», otherwise will use the embedded «keystore» (located at resources-xxx/observe.jks). observe.config.validation.lengthWeightEnable=Force validation of species length max observe.config.validation.speedEnable=Force validation of activities speed observe.config.validation.speedMaxValue=Max speed value used in activities speed validation @@ -283,6 +284,7 @@ observe.runner.copy.default.map.file=Création des cartes %1$s. observe.runner.copy.default.report.file=Création du fichier de reports %1$s. observe.runner.copy.default.swing.preferences.file=Création du fichier de préférence Swing %1$s. observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s. +observe.runner.copy.embedded.keystore.file=Copy embedded keystore (%s). observe.runner.i18n.loaded=Service de traduction chargé dans la langue %1$s. observe.runner.init=Initialisation d'ObServe %1$s %2$s observe.runner.initStorage.choice.createLocalStorage=Create local storage @@ -305,6 +307,7 @@ observe.runner.quit.without.ui=Close application without opening ui observe.runner.start=Start ObServe %1$s %2$s observe.runner.title.error.dialog=An error occurs\! observe.runner.ui.loaded=Graphical interface is ready. +observe.runner.use.embedded.keystore.file=Use embedded keystore (%s). observe.runner.user.directories.loaded=User directory is ready (%1$s). observe.security.role=Role observe.security.role.administrator=Owner of database ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -170,6 +170,7 @@ observe.config.ui.tree.node.disabled.color=Color for disabled node observe.config.ui.tree.node.empty.color=Color for empty node observe.config.ui.tree.node.unloaded.color=Color for unloaded node observe.config.ui.tree.node.unsaved.color=Color for unsaved node +observe.config.useJvmKeyStore.description=To use the Java «keystore», otherwise will use the embedded «keystore» (located at resources-xxx/observe.jks). \#TODO observe.config.validation.lengthWeightEnable=Forzar la validación de la talla de especies min/max observe.config.validation.speedEnable=Forzar la validación de las velocidades de las actividades observe.config.validation.speedMaxValue=Velocidad máxima autorizada en el control de las velocidades de las actividades @@ -283,6 +284,7 @@ observe.runner.copy.default.map.file=Creación de los mapas %1$s. observe.runner.copy.default.report.file=Creación del archivo de informes %1$s. observe.runner.copy.default.swing.preferences.file=Création du fichier de préférence Swing %1$s. observe.runner.copy.default.ui.file=Creación del archivo de cosmético %1$s. +observe.runner.copy.embedded.keystore.file=Copy embedded keystore (%s). \#TODO observe.runner.i18n.loaded=Servicio de traducción cargado en el idioma %1$s. observe.runner.init=Inicialización de ObServe %1$s %2$s observe.runner.initStorage.choice.createLocalStorage=Crear la base local @@ -305,6 +307,7 @@ observe.runner.quit.without.ui=Cierre de la aplicación sin abrir la interfaz gr observe.runner.start=Inicio de ObServe %1$s %2$s observe.runner.title.error.dialog=Un error se ha producido\! observe.runner.ui.loaded=Finalizada la inicialización de la interfaz gráfica +observe.runner.use.embedded.keystore.file=Use embedded keystore (%s). \#TODO observe.runner.user.directories.loaded=Se ha inicializado el directorio del usuario (%1$s). observe.security.role=Rol observe.security.role.administrator=Propietario de la base ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -170,6 +170,7 @@ observe.config.ui.tree.node.disabled.color=Couleur pour un nœud désactivé observe.config.ui.tree.node.empty.color=Couleur pour un nœud vide observe.config.ui.tree.node.unloaded.color=Couleur pour un nœud non chargé observe.config.ui.tree.node.unsaved.color=Couleur pour un nœud non persisté +observe.config.useJvmKeyStore.description=Pour utiliser le «keystore» fourni par Java, sinon pour utiliser le keystore fourni par l'application (localisé ici \: resources-xxx/observe.jks). observe.config.validation.lengthWeightEnable=Forcer la validation des bornes min/max de taille d'espèce observe.config.validation.speedEnable=Forcer la validation des vitesses d'activités observe.config.validation.speedMaxValue=Vitesse maximale autorisée dans le contrôle des vitesses d'activités @@ -283,6 +284,7 @@ observe.runner.copy.default.map.file=Création des cartes %1$s. observe.runner.copy.default.report.file=Création du fichier de reports %1$s. observe.runner.copy.default.swing.preferences.file=Création du fichier de préférence Swing %1$s. observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s. +observe.runner.copy.embedded.keystore.file=Recopie du «keystore» embarqué par l'application (%s). observe.runner.i18n.loaded=Service de traduction chargé dans la langue %1$s. observe.runner.init=Initialisation d'ObServe %1$s %2$s observe.runner.initStorage.choice.createLocalStorage=Créer la base locale @@ -305,6 +307,7 @@ observe.runner.quit.without.ui=Fermeture de l'application sans ouvrir l'interfac observe.runner.start=Démarrage d'ObServe %1$s %2$s observe.runner.title.error.dialog=Une erreur est survenue\! observe.runner.ui.loaded=Initialisation de l'interface graphique terminée. +observe.runner.use.embedded.keystore.file=Utilisation du «keystore» embarqué (%s). observe.runner.user.directories.loaded=Le répertoire utilisateur a été initialisé (%1$s). observe.security.role=Rôle observe.security.role.administrator=Propriétaire de la base View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c3e2e386a47721ccc624fc3a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c3e2e386a47721ccc624fc3a… You're receiving this email because of your account on gitlab.com.

1 0