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

[Git][ultreiaio/ird-observe] Pushed new tag v8.0.0-RC-8
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed new tag v8.0.0-RC-8 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v8.0.0-RC-8 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/8.0.0-RC-8] [jgitflow-maven-plugin]updating poms for branch'release/8.0.0-RC-8' with...
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch release/8.0.0-RC-8 at ultreiaio / ird-observe Commits: 6d0daceb by Tony Chemit at 2020-07-10T17:46:51+02:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.0-RC-8' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-datasource-actions/pom.xml - client-datasource-editor-api/pom.xml - client-datasource-editor-common/pom.xml - client-datasource-editor-ll/pom.xml - client-datasource-editor-ps/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto-spi/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence-spi/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-validation/pom.xml - services/pom.xml - templates/pom.xml - test-config/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6d0daceb1eb04a7dfb2f11ab8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6d0daceb1eb04a7dfb2f11ab8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 84 commits: [jgitflow-maven-plugin]updating poms for 8.0-RC-8-SNAPSHOT development[skip ci]
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: f27cc24f by Tony Chemit at 2020-06-03T15:11:56+02:00 [jgitflow-maven-plugin]updating poms for 8.0-RC-8-SNAPSHOT development[skip ci] - - - - - ee3a0b7c by Tony Chemit at 2020-06-03T15:18:44+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - f102a746 by Tony Chemit at 2020-06-03T15:18:45+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 54be3659 by Tony Chemit at 2020-06-03T15:18:45+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 7b136730 by Tony Chemit at 2020-06-03T15:31:45+02:00 Change to version 8.0.0 - - - - - e820ba0b by Tony Chemit at 2020-06-22T18:50:37+02:00 [LL] Activité, Capture, Enregistreur de profondeur Le raccourci clavier MAJ+TAB (focus arrière) ne fonctionne plus - Closes #1530 - - - - - 430861f4 by Tony Chemit at 2020-06-22T19:07:10+02:00 [PS] Rappel de la dernière espèce utilisée dans la saisie des échantillons non cible - Closes #1528 - - - - - c71281ce by Tony Chemit at 2020-06-22T19:15:49+02:00 update changelog [skip ci] - - - - - 6730aa38 by Tony Chemit at 2020-06-24T17:21:57+02:00 [LL][Logbook] opération de pêche / décimaux : gestion de la virgule - Closes #1527 - - - - - 0b2a9f6c by Tony Chemit at 2020-06-24T17:22:07+02:00 Impossible de changer deux fois la langue - Closes #1539 - - - - - 252cb6a0 by Tony Chemit at 2020-06-24T17:22:07+02:00 Impossible d'afficher le `À propos` - Closes #1540 - - - - - c88625b1 by Tony Chemit at 2020-06-24T17:22:33+02:00 Disfonctionnement de raccourcis - Closes #1497 - - - - - 5139d387 by Tony Chemit at 2020-06-24T18:12:45+02:00 FOB enregistré non disponible immédiatement dans la popup de sélection d'objet prédéfini - Closes #1504 - - - - - a76c2911 by Tony Chemit at 2020-06-24T19:04:50+02:00 Enregistrement de FOB -> chagement d'onglet intempestif - Closes #1505 - - - - - 2907a002 by Tony Chemit at 2020-06-25T12:34:43+02:00 Imperfections sur création de nouveau FOB en utilisant les préconfigurations - See #1501 Correction des préconfiguration - - - - - d57d7761 by Tony Chemit at 2020-06-25T12:35:52+02:00 Imperfections sur création de nouveau FOB en utilisant les préconfigurations - See #1501 Pouvoir enregister un nouveau FOB à partir d'une préconfiguration (le bouton Sauvegarder est actif dès que possible) - - - - - 8d6d355e by Tony Chemit at 2020-06-25T12:36:50+02:00 Imperfections sur création de nouveau FOB en utilisant les préconfigurations - Closes #1501 Amélioration des ui (ne pas pouvoir sélectionner une propriété si elle est nulle ou vide) Renommage de l'action fermer en annuler - - - - - a232e941 by Tony Chemit at 2020-06-26T09:08:28+02:00 Enregistrement de FOB impossible si une balise est présente - Closes #1503 - - - - - 87d00a11 by Tony Chemit at 2020-06-26T10:57:11+02:00 Réouverture simplifiée d'item : l'arbre de navigation est mal rafraîchit - Closes #1500 - - - - - db511b17 by Tony Chemit at 2020-06-26T12:57:58+02:00 Classement Calée / FOBs dans l'arbre - Closes #1506 - - - - - f88006ee by Tony Chemit at 2020-06-27T08:59:47+02:00 La modification de la sélection du composant comboBox ne fonctionne pas - Closes #1550 - - - - - b96c348b by Tony Chemit at 2020-06-27T09:00:08+02:00 Update fluido skin - - - - - 9f9fd999 by Tony Chemit at 2020-06-27T09:08:51+02:00 L'export de marées central vers local plante - Closes #1549 - - - - - 3a5e6544 by Tony Chemit at 2020-06-29T08:10:32+02:00 Ajout d'une méthode de mesure de poids par défaut sur Estimations du banc - Closes #1510 - - - - - 9cb86fc5 by Tony Chemit at 2020-06-29T08:10:34+02:00 Renommer un onglet sur form Marée LL - Closes #1521 - - - - - c63f7620 by Tony Chemit at 2020-06-29T08:10:34+02:00 LL Observations / Capture / déprédation : libellé - Closes #1520 [LL][Logbook] opération de pêche / libellé - Closes #1526 - - - - - 45ad272d by Tony Chemit at 2020-06-29T08:10:34+02:00 [LL][Logbooks] Besoin de pouvoir mettre les horodatages à NULL - Closes #1523 - - - - - 93bef350 by Tony Chemit at 2020-06-29T08:10:34+02:00 [LL Logbook Activity] Revoir finement l'activité observée associée à une activité logbook - See #1551 - - - - - 609bb0d3 by Tony Chemit at 2020-06-29T08:10:34+02:00 Revoir les barres de progressions - Closes #1417 - - - - - 576e1632 by Tony Chemit at 2020-06-29T08:10:34+02:00 Try a new RC and use stable toolkit - - - - - eb6c6450 by Tony Chemit at 2020-06-29T08:10:34+02:00 [LL] Appairement des activités : cosmétique - Closes #1537 - - - - - 6595086f by Tony Chemit at 2020-06-29T08:10:34+02:00 [LL][Echantillon logbook] Cosmétique échantillon dans l'arbre - Closes #1535 - - - - - 34c2f432 by Tony Chemit at 2020-06-29T08:10:34+02:00 [LL][Logbooks] Form Opération de pêche / Capture : champs actifs en fonction du mode de saisie - Closes #1534 - - - - - 24116d14 by Tony Chemit at 2020-06-29T08:10:34+02:00 [CALCULS] L'assistant calculs bloque après la sélection des marées - Closes #1547 - - - - - 52cdc0e1 by Tony Chemit at 2020-06-29T08:10:34+02:00 update changelog [skip ci] - - - - - cba750bc by Tony Chemit at 2020-06-29T08:10:34+02:00 Add a fixme to be done - - - - - 7e94d30f by Tony Chemit at 2020-06-29T08:10:34+02:00 Libellés référentiels - Closes #1509 - - - - - 87301103 by Tony Chemit at 2020-06-29T08:40:43+02:00 L'ajout d'une caractéristique d'équipement plante - Closes #1516 - - - - - 1e710af4 by Tony Chemit at 2020-06-29T08:51:57+02:00 LL Observations / Echec d'enregistrement d'une capture - Closes #1519 - - - - - 35d8e24e by Tony Chemit at 2020-06-29T09:44:03+02:00 Amélioration de l'onglet Sauvegarde (Actions longues) - Closes #1555 - - - - - fddb4599 by Tony Chemit at 2020-06-29T13:00:49+02:00 Ajouter une option pour ne pas afficher la légende dans la carte - Closes #1557 - - - - - 42c7753d by Tony Chemit at 2020-06-30T13:00:25+02:00 Élimination des points non effectifs dans la carte - Closes #1560 - - - - - 7b72d889 by Tony Chemit at 2020-06-30T13:00:26+02:00 Carte - Closes #1517 - - - - - 621d20eb by Tony Chemit at 2020-06-30T13:41:44+02:00 Bascule entre langues - Closes #1553 - - - - - 5e1b7baa by Tony Chemit at 2020-07-01T13:45:10+02:00 [7.6.3][PS] Les thonidés sont disponibles dans la liste déroulante du form Espèces accessoires, alors qu'ils ne sont pas dans la display liste correspondante - Closes #1562 (report v8) - - - - - db96c24b by Tony Chemit at 2020-07-01T13:48:53+02:00 Deux comportements étranges sur l'assistant tableaux de synthèse - Closes #1533 (report v8) - - - - - 90297d09 by Tony Chemit at 2020-07-02T11:39:45+02:00 [LL] Onglet Composition détaillée / Détail avançon / Hameçon et appât non consultable - Closes #1558 (report v8) - - - - - b514a97e by Tony Chemit at 2020-07-02T11:39:46+02:00 Requêtes de synthèse PS - Closes #1529 (report v8) - - - - - 97719eaa by Tony Chemit at 2020-07-02T11:39:46+02:00 update pom - - - - - 9b10570d by Tony Chemit at 2020-07-02T11:39:46+02:00 [PS][Observations] Activité : contrôle trop strict - Closes #1552 (report v8) - - - - - 602e639c by Tony Chemit at 2020-07-02T12:20:58+02:00 [PS] Pratiques de remise à l'eau, cétacés non trouvés - Closes #1564 (report v8) - - - - - 5fed9110 by Tony Chemit at 2020-07-03T19:24:41+02:00 le reset reste actif sur les éditeurs de nombres même si ceci ne sont pas actif - Closes #1568 le reset des combo box ne fonctionne pas bien (alors que l'action associée Ctrl+D est ok) - Closes #1569 - - - - - 784f68dc by Tony Chemit at 2020-07-03T20:02:16+02:00 [LL][Echantillon logbook] Cosmétique (Partie dto, persistence)- See #1536 - - - - - feeb5bf5 by Tony Chemit at 2020-07-04T18:27:05+02:00 [LL][Echantillon logbook] Cosmétique (Partie ui)- Closes #1536 - - - - - 98215722 by Tony Chemit at 2020-07-05T14:00:13+02:00 Deux coquilles dans les validations - Closes #1572 (report v8) - - - - - 0c423270 by Tony Chemit at 2020-07-05T14:35:26+02:00 Problème de traduction sur les validations taille/poids des espèces - Closes #1571 (report v8) - - - - - f0a19cb8 by Tony Chemit at 2020-07-05T14:35:27+02:00 Amélioration des logs - Closes #1574 (report v8) - - - - - 4473430a by Tony Chemit at 2020-07-05T16:34:46+02:00 Pouvoir changer l'espèce d'un enregistrement - Closes #1565 (report v8) - - - - - da0a4872 by Tony Chemit at 2020-07-06T07:01:22+02:00 les programmes ne sont pas triés dans le même ordre dans l'arbre de navigation et dans la formulaire liste des marées - Closes #1567 - - - - - 757dd93a by Tony Chemit at 2020-07-06T08:53:15+02:00 Revoir la gestion des validateurs taille-poids d'espèces - Closes #1573 (report v8) - - - - - a563da03 by Tony Chemit at 2020-07-06T09:24:00+02:00 Integrates back toolkit since we won't use it anywhere else - - - - - b8607fa4 by Tony Chemit at 2020-07-06T09:31:01+02:00 Clean license headers - - - - - f7687614 by Tony Chemit at 2020-07-06T10:21:36+02:00 [PS] Pratiques de remises à l'eau : le mode de libération n'est pas supprimé si on change d'espèce - Closes #1575 - - - - - f4094436 by Tony Chemit at 2020-07-06T13:00:01+02:00 [LL] Appairement des activités : cosmétique - Closes #1537 - - - - - e341f1c5 by Tony Chemit at 2020-07-08T14:42:23+02:00 amélioration log - - - - - e72c5cfe by Tony Chemit at 2020-07-08T14:42:25+02:00 Les actions de changement d'ordre sur les tableaux ordonné ne fonctionnent plus - Closes #1570 - - - - - f61af58b by Tony Chemit at 2020-07-08T14:42:25+02:00 [LL][LOGBOOKS] Activité : champ vitesse vent superflu - Closes #1531 - - - - - 07c50c00 by Tony Chemit at 2020-07-08T14:42:25+02:00 Remove logger in plugin - - - - - 6c7dd013 by Tony Chemit at 2020-07-08T14:42:25+02:00 [LL] Form marée / Coche des cases 'Données logbook' et 'Données d'observation' - Closes #1522 - - - - - e5490dcd by Tony Chemit at 2020-07-08T14:42:25+02:00 [SYNCHRO AVANCEE][REFERENTIEL] Améliorer la coche des cases - Closes #1546 - - - - - 102a989b by Tony Chemit at 2020-07-08T14:42:25+02:00 Change data synchro action keystroke to be conform with referential syncho - - - - - 78908d1b by Tony Chemit at 2020-07-08T14:42:25+02:00 [LL Logbook Activity] Revoir finement l'activité observée associée à une activité logbook - Closes #1551 - - - - - fcea594d by Tony Chemit at 2020-07-09T08:19:27+02:00 update changelog [skip ci] - - - - - 7ee7eb28 by Tony Chemit at 2020-07-10T11:01:52+02:00 Move feedback helper to menu Help - - - - - 1ccd9702 by Tony Chemit at 2020-07-10T13:21:05+02:00 Bascule entre langues - Closes #1553 Improve the way to keep data source while reload application - - - - - 793b6911 by Tony Chemit at 2020-07-10T15:19:26+02:00 Amélioration accéssibilité des menu navigations pour accéder aux sous reéférentiels - - - - - 780acacd by Tony Chemit at 2020-07-10T15:34:12+02:00 Fix some names... (See #1534) - - - - - 94ba8702 by Tony Chemit at 2020-07-10T16:30:13+02:00 Correction création LL Logbook Set - - - - - 9f5f153f by Tony Chemit at 2020-07-10T16:32:05+02:00 LL Observations / Echec d'enregistrement d'une capture - Closes #1519 (set focus Owner event if not in our focus handler...) - - - - - fca82cb7 by Tony Chemit at 2020-07-10T16:51:10+02:00 [LL][LOGBOOKS] Activité : champ vitesse vent superflu - Closes #1531 (libelle) - - - - - e25c6734 by Tony Chemit at 2020-07-10T17:18:22+02:00 [LL] Appairement des activités : cosmétique - Closes #1537 (libelle) - - - - - c8e2b63c by Tony Chemit at 2020-07-10T17:38:21+02:00 [jgitflow-maven-plugin]updating poms for 8.0.0-RC-8 branch with snapshot versions[skip ci] - - - - - 6d0daceb by Tony Chemit at 2020-07-10T17:46:51+02:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.0-RC-8' with non-snapshot versions[skip ci] - - - - - cba1b635 by Tony Chemit at 2020-07-10T18:07:44+02:00 [jgitflow-maven-plugin]merging 'release/8.0.0-RC-8' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java-enumeration.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-core/pom.xml - client-core/src/main/i18n/templates/initStorage_en_GB.ftl - client-core/src/main/i18n/templates/initStorage_es_ES.ftl - client-core/src/main/i18n/templates/initStorage_fr_FR.ftl - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/main/actions/CloseApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/main/callback/ReloadApplicationCallback.java - client-core/src/main/java/fr/ird/observe/client/util/JMenuWithAccelerator.java - client-core/src/main/java/fr/ird/observe/client/util/JaxxObjectInitializer.java - client-core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java - client-core/src/main/java/fr/ird/observe/client/util/ProgressModel.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-core/src/main/java/fr/ird/observe/client/util/treetable/BeanFilterableComboBoxCellEditor.java → client-core/src/main/java/fr/ird/observe/client/util/treetable/JaxxComboBoxCellEditor.java - client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/348dff15d58ccfed8736d2b5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/348dff15d58ccfed8736d2b5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 8.0.0-RC-8 branch with snapshot versions[skip ci]
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c8e2b63c by Tony Chemit at 2020-07-10T17:38:21+02:00 [jgitflow-maven-plugin]updating poms for 8.0.0-RC-8 branch with snapshot versions[skip ci] - - - - - 6d0daceb by Tony Chemit at 2020-07-10T17:46:51+02:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.0-RC-8' with non-snapshot versions[skip ci] - - - - - cba1b635 by Tony Chemit at 2020-07-10T18:07:44+02:00 [jgitflow-maven-plugin]merging 'release/8.0.0-RC-8' into 'master' - - - - - 81b49769 by Tony Chemit at 2020-07-10T18:07:46+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 3b22ba5f by Tony Chemit at 2020-07-10T18:07:47+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 187f8098 by Tony Chemit at 2020-07-10T18:07:47+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/06f72117a3227a0747c7a1ab… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/06f72117a3227a0747c7a1ab… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/8.0.0-RC-8
by Tony CHEMIT 10 Jul '20

10 Jul '20

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

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 8.0.0-RC-9-SNAPSHOT development[skip ci]
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 06f72117 by Tony Chemit at 2020-07-10T17:38:22+02:00 [jgitflow-maven-plugin]updating poms for 8.0.0-RC-9-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-datasource-actions/pom.xml - client-datasource-editor-api/pom.xml - client-datasource-editor-common/pom.xml - client-datasource-editor-ll/pom.xml - client-datasource-editor-ps/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto-spi/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence-spi/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-validation/pom.xml - services/pom.xml - templates/pom.xml - test-config/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/06f72117a3227a0747c7a1ab4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/06f72117a3227a0747c7a1ab4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Appairement des activités : cosmétique - Closes #1537 (libelle)
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e25c6734 by Tony Chemit at 2020-07-10T17:18:22+02:00 [LL] Appairement des activités : cosmétique - Closes #1537 (libelle) - - - - - 3 changed files: - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -224,8 +224,8 @@ observe.actions.longline.pairing=Longline activities pairing observe.actions.longline.pairing.config=Pairing configuration observe.actions.longline.pairing.description=Longline activities pairing observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. -observe.actions.longline.pairing.table.logbook.activity=Observation activities -observe.actions.longline.pairing.table.observation.activity=Logbook activities +observe.actions.longline.pairing.table.logbook.activity=Logbook activities +observe.actions.longline.pairing.table.observation.activity=Observation activities observe.actions.longline.pairing.table.selected=To be saved observe.actions.longline.pairing.tip=Longline activities pairing observe.actions.longline.pairing.title=Longline activities pairing ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -224,8 +224,8 @@ observe.actions.longline.pairing=Longline activities pairing \#TODO observe.actions.longline.pairing.config=Pairing configuration \#TODO observe.actions.longline.pairing.description=Longline activities pairing \#TODO observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. \#TODO -observe.actions.longline.pairing.table.logbook.activity=Observation activities \#TODO -observe.actions.longline.pairing.table.observation.activity=Logbook activities \#TODO +observe.actions.longline.pairing.table.logbook.activity=Logbook activities \#TODO +observe.actions.longline.pairing.table.observation.activity=Observation activities \#TODO observe.actions.longline.pairing.table.selected=Debe grabar \#TODO observe.actions.longline.pairing.tip=Longline activities pairing \#TODO observe.actions.longline.pairing.title=Longline activities pairing \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -224,8 +224,8 @@ observe.actions.longline.pairing=Appairement des activités palangre observe.actions.longline.pairing.config=Configuration de l'appairement observe.actions.longline.pairing.description=Appairement des activités palangre observe.actions.longline.pairing.message.operation.done=Opération terminées en %1$s. -observe.actions.longline.pairing.table.logbook.activity=Activités Observation -observe.actions.longline.pairing.table.observation.activity=Activités Livre de Bord +observe.actions.longline.pairing.table.logbook.activity=Activités Livre de Bord +observe.actions.longline.pairing.table.observation.activity=Activités Observation observe.actions.longline.pairing.table.selected=À enregistrer observe.actions.longline.pairing.tip=Appairement des activités palangre observe.actions.longline.pairing.title=Appairement des activités palangre View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e25c6734b00ca8ae5e37c11f1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e25c6734b00ca8ae5e37c11f1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL][LOGBOOKS] Activité : champ vitesse vent superflu - Closes #1531 (libelle)
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fca82cb7 by Tony Chemit at 2020-07-10T16:51:10+02:00 [LL][LOGBOOKS] Activité : champ vitesse vent superflu - Closes #1531 (libelle) - - - - - 3 changed files: - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1016,7 +1016,7 @@ observe.data.ll.logbook.Activity.titles=Activities observe.data.ll.logbook.Activity.type=Activity observe.data.ll.logbook.Activity.types=Activities observe.data.ll.logbook.Activity.vesselActivity=Vessel activity -observe.data.ll.logbook.Activity.wind=Wind +observe.data.ll.logbook.Activity.wind=Wind (Beaufort) observe.data.ll.logbook.Activity.windDirection=Wind direction (°) observe.data.ll.logbook.Activity.windSpeed=Wind speed (kt) observe.data.ll.logbook.BaitsComposition.action.create=Insert this bait ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1016,7 +1016,7 @@ observe.data.ll.logbook.Activity.titles=Actividades observe.data.ll.logbook.Activity.type=Actividad observe.data.ll.logbook.Activity.types=Actividades observe.data.ll.logbook.Activity.vesselActivity=Actividad barco -observe.data.ll.logbook.Activity.wind=Wind \#TODO +observe.data.ll.logbook.Activity.wind=Fuerza del viento observe.data.ll.logbook.Activity.windDirection=Dirección del viento (°) observe.data.ll.logbook.Activity.windSpeed=Wind sppe (kt) \#TODO observe.data.ll.logbook.BaitsComposition.action.create=Insertar este cebo ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1016,7 +1016,7 @@ observe.data.ll.logbook.Activity.titles=Activités observe.data.ll.logbook.Activity.type=Activité observe.data.ll.logbook.Activity.types=Activités observe.data.ll.logbook.Activity.vesselActivity=Activité bateau -observe.data.ll.logbook.Activity.wind=Vent +observe.data.ll.logbook.Activity.wind=Vent Beaufort observe.data.ll.logbook.Activity.windDirection=Direction du vent (°) observe.data.ll.logbook.Activity.windSpeed=Vitesse du vent (nd) observe.data.ll.logbook.BaitsComposition.action.create=Insérer cet appât View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fca82cb72a00ae51b31f49944… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fca82cb72a00ae51b31f49944… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Correction création LL Logbook Set
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 94ba8702 by Tony Chemit at 2020-07-10T16:30:13+02:00 Correction création LL Logbook Set - - - - - 9f5f153f by Tony Chemit at 2020-07-10T16:32:05+02:00 LL Observations / Echec d'enregistrement d'une capture - Closes #1519 (set focus Owner event if not in our focus handler...) - - - - - 2 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookNavigationTreeNode.java Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java ===================================== @@ -91,6 +91,7 @@ import javax.swing.JTabbedPane; import javax.swing.JToolBar; import javax.swing.SwingUtilities; import java.awt.Component; +import java.awt.FocusTraversalPolicy; import java.awt.KeyboardFocusManager; import java.beans.PropertyChangeListener; import java.util.Arrays; @@ -459,6 +460,7 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe // dettach all validators uninstallValidators(); } + public void resetFromPreviousUi(U ui) { if (tabbedPaneValidator != null) { JTabbedPane mainTabbedPane = (JTabbedPane) ui.getObjectById(JaxxObjectInitializer.MAIN_TABBED_PANE); @@ -467,6 +469,7 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe } } } + final void destroyUI() { if (ui == null) { return; @@ -904,8 +907,14 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe } public final void setFormFocusOwner(Component formFocusOwner) { - ObserveLayoutFocusTraversalPolicy<?> focusTraversalPolicy = (ObserveLayoutFocusTraversalPolicy<?>) ui.getFocusTraversalPolicy(); - Component realFocusComponent = focusTraversalPolicy.getRealFocusComponent(formFocusOwner); + FocusTraversalPolicy focusTraversalPolicy = ui.getFocusTraversalPolicy(); + Component realFocusComponent; + if (focusTraversalPolicy instanceof ObserveLayoutFocusTraversalPolicy) { + ObserveLayoutFocusTraversalPolicy<?> focusTraversalPolicy1 = (ObserveLayoutFocusTraversalPolicy<?>) ui.getFocusTraversalPolicy(); + realFocusComponent = focusTraversalPolicy1.getRealFocusComponent(formFocusOwner); + } else { + realFocusComponent = focusTraversalPolicy.getFirstComponent(ui.getContentContainer()); + } ui.getModel().setFormFocusOwner(realFocusComponent); } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookNavigationTreeNode.java ===================================== @@ -30,6 +30,7 @@ import fr.ird.observe.dto.data.ll.logbook.ActivityReference; import fr.ird.observe.dto.data.ll.logbook.SampleReference; import fr.ird.observe.dto.data.ll.logbook.SetDto; import fr.ird.observe.dto.data.ll.logbook.SetReference; +import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.navigation.model.edit.longline.node.ObserveLonglineLogbookActivityEditNode; import fr.ird.observe.navigation.model.select.longline.node.ObserveLonglineLogbookActivitySelectNode; import fr.ird.observe.navigation.tree.SingleReferenceContainerNode; @@ -107,4 +108,17 @@ public class ActivityLonglineLogbookNavigationTreeNode extends ReferenceNavigati public SetLonglineLogbookNavigationTreeNode newSingleChildNode(String parentId) { return newSingleChildNode(new SetReference(new SetDto(), null)); } + + public int getNewPosition(DtoReference beanReference) { + if (beanReference instanceof SetReference) { + return 0; + } + if (beanReference instanceof SampleReference) { + if (getData().getSet() == null) { + return 0; + } + return 1; + } + throw new IllegalStateException(String.format("Can't manage bean: %s", beanReference)); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/780acacd477ecfc3288131b5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/780acacd477ecfc3288131b5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Amélioration accéssibilité des menu navigations pour accéder aux sous reéférentiels
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 793b6911 by Tony Chemit at 2020-07-10T15:19:26+02:00 Amélioration accéssibilité des menu navigations pour accéder aux sous reéférentiels - - - - - 780acacd by Tony Chemit at 2020-07-10T15:34:12+02:00 Fix some names... (See #1534) - - - - - 4 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenuHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jcss Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenuHandler.java ===================================== @@ -82,13 +82,13 @@ public class DataSourceEditorNavigationMenuHandler implements UIHandler<DataSour public void propertyChange(PropertyChangeEvent evt) { NavigationTreeConfigBean config = ui.getUiModel().getConfig(); boolean withConfig = config != null; - boolean withSeine = withConfig &&config.isShowSeineTrip(); - boolean withLongline = withConfig &&config.isShowLonglineTrip(); - - ui.getMenuNavigationSeine().setEnabled(withSeine && seineEditModel.isEnabled()); - ui.getMenuNavigationLongline().setEnabled(withLongline && longlineEditModel.isEnabled()); + boolean withSeine = withConfig && config.isShowSeineTrip(); + boolean withLongline = withConfig && config.isShowLonglineTrip(); boolean showReferential = withConfig && config.isShowReferential(); + ui.getMenuNavigationSeine().setEnabled(withSeine && (showReferential || seineEditModel.isEnabled())); + ui.getMenuNavigationLongline().setEnabled(withLongline && (showReferential || longlineEditModel.isEnabled())); + ui.getSelectCommonReferential().setEnabled(showReferential); boolean seineNewValue = showReferential && withSeine; ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUI.jcss ===================================== @@ -39,7 +39,7 @@ layout:{new GridLayout(0,1)}; } -#acquisitionModeIndividualal { +#acquisitionModeIndividual { buttonGroup:acquisitionModeGroup; value:{CatchAcquisitionMode.INDIVIDUAL}; text:{CatchAcquisitionMode.INDIVIDUAL.toString()}; ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jaxx ===================================== @@ -138,7 +138,7 @@ <cell columns="2">  <JPanel id='acquisitionModePanel'> - <JRadioButton id='acquisitionModeIndividualal'/> + <JRadioButton id='acquisitionModeIndividual'/> <JRadioButton id='acquisitionModeGrouped'/> </JPanel> </cell> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jcss ===================================== @@ -41,7 +41,7 @@ layout:{new GridLayout(0,1)}; } -#acquisitionModeIndividualal { +#acquisitionModeIndividual { buttonGroup:acquisitionModeGroup; value:{CatchAcquisitionMode.INDIVIDUAL}; text:{CatchAcquisitionMode.INDIVIDUAL.toString()}; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1ccd9702cdf11f53730dfc59… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1ccd9702cdf11f53730dfc59… You're receiving this email because of your account on gitlab.com.

1 0