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

[Git][ultreiaio/ird-observe][master-7.x] 47 commits: [jgitflow-maven-plugin]updating poms for 7.3.1-SNAPSHOT development[skip ci]
by Tony CHEMIT 26 Mar '20

26 Mar '20

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: b6b60999 by tchemit at 2020-01-27T16:37:23+01:00 [jgitflow-maven-plugin]updating poms for 7.3.1-SNAPSHOT development[skip ci] - - - - - 6a3c92de by tchemit at 2020-01-27T16:43:15+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 816e506f by tchemit at 2020-01-27T16:43:16+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - c7d5f507 by tchemit at 2020-01-27T16:43:16+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - ab13af71 by tchemit at 2020-01-29T13:38:17+01:00 Add method to compute property names translation - - - - - d9250afa by tchemit at 2020-01-31T11:35:44+01:00 Possibilité de décider, lors de la mise à jour d'une référence, des champs que l'on veut voir pris en compte dans la synchronisation - Closes #1329 - - - - - c8a88b3e by tchemit at 2020-01-31T11:35:48+01:00 update to version 7.4.0-SNAPSHOT - - - - - 63a89eb8 by tchemit at 2020-01-31T18:22:26+01:00 use last pom - - - - - fac65120 by tchemit at 2020-02-13T11:59:41+01:00 [EXPORT CARTE] Le nom de fichier est généré sans l'extension PNG - Closes #1434 - - - - - ba28c9d7 by tchemit at 2020-02-13T12:00:19+01:00 move to version 7.3.1-SNAPSHOT - - - - - fe8162d9 by tchemit at 2020-02-13T12:12:37+01:00 [LL] Contrôle sur nombre de baskets trop limité - Closes #1433 - - - - - be42fca0 by tchemit at 2020-02-13T16:17:00+01:00 Si on ne peut pas ouvrir un nœud on ne bloque pas l'ui - - - - - 26c6cb5e by tchemit at 2020-02-13T16:20:50+01:00 Petit problème sur déplacement d'activité - Closes #1435 - - - - - df67be05 by tchemit at 2020-02-13T17:30:29+01:00 always copy config files to user resources directory if using snapshot version - - - - - 19a17531 by tchemit at 2020-02-14T13:06:15+01:00 Possibilité de décider, lors de la mise à jour d'une référence, des champs que l'on veut voir pris en compte dans la synchronisation - Closes #1329 - - - - - 2a5be643 by tchemit at 2020-02-14T14:07:10+01:00 rename templates module in toolkit project - - - - - 2a7ac485 by tchemit at 2020-02-16T21:57:46+01:00 clean code - - - - - ec7af112 by tchemit at 2020-02-17T17:37:29+01:00 add validation tag value and model then generate validators - - - - - 53375524 by tchemit at 2020-02-18T11:58:26+01:00 Go to version 7.4.0 (and change model version) - - - - - eea99bdc by tchemit at 2020-02-18T12:09:58+01:00 [V7-V8] Ajustement du modèle - Part 1 - See #1438 - - - - - 0016aa37 by tchemit at 2020-02-18T16:49:12+01:00 [V7-V8] Ajustement du modèle - Part 3 - Closes #1438 - - - - - c60939d4 by tchemit at 2020-02-19T16:19:50+01:00 [SYNCHRO AVANCEE] Lorsqu'aucune action de synchro n'est empilée, 'Appliquer' devrait être inactif - Closes #1444 - - - - - cecddb82 by tchemit at 2020-02-19T16:24:36+01:00 [SYNCHRO AVANCEE] Fonctionnement des sélections - Closes #1440 - - - - - 8439c329 by tchemit at 2020-02-19T16:41:34+01:00 [SYNCHRO AVANCEE] Double connexion à la même base - Closes #1441 - - - - - 9527c1aa by tchemit at 2020-02-19T17:01:11+01:00 fix ci docker jobs - - - - - 0926d9e2 by tchemit at 2020-02-22T20:00:38+01:00 Possibilité de décider, lors de la mise à jour d'une référence, des champs que l'on veut voir pris en compte dans la synchronisation - Closes #1329 - - - - - 358a6dce by tchemit at 2020-02-23T22:37:54+01:00 Fix species reference binder - - - - - dd6854ff by tchemit at 2020-02-23T22:39:32+01:00 add ReferentialService.loadDtoList method - - - - - 319bc1b0 by tchemit at 2020-02-24T00:21:15+01:00 be able to deploy again to tomcat - - - - - 9340c926 by tchemit at 2020-02-24T21:26:13+01:00 update pom - - - - - 9ceccbb6 by tchemit at 2020-02-24T22:16:27+01:00 [Synchro Avancée] Certaines actions ne sont plus présentes - Closes #1447 - - - - - 5a9daa21 by tchemit at 2020-02-24T22:19:35+01:00 Possibilité de décider, lors de la mise à jour d'une référence, des champs que l'on veut voir pris en compte dans la synchronisation - Closes #1329 Mise en place d'un nouveau système pour calculer les différences fines directement et utilisation sur les deux synchro de référentiels. Suppression de l'ancienne api de calcul de différences. - - - - - d96c7c6b by tchemit at 2020-02-27T13:26:05+01:00 * migration du code pour être compatible avec java > 8 * mise à jour de jaxx (à tester plus en profondeur) - - - - - f334fec7 by tchemit at 2020-02-28T10:18:42+01:00 Remove shade in client runner - - - - - 65d3d6c2 by tchemit at 2020-02-28T13:51:30+01:00 update changelog [skip ci] - - - - - 4130ac63 by tchemit at 2020-02-28T13:51:50+01:00 fix site - - - - - 0d88df29 by tchemit at 2020-02-28T13:52:05+01:00 Add synchro referential doc - - - - - 30119b4d by tchemit at 2020-03-04T20:39:51+01:00 improve some dto and date range decoration let's sort loadDtoList as references, so later we can use this order to build for example some tree model - - - - - 47b86584 by tchemit at 2020-03-07T00:20:39+01:00 stop using arrays... - - - - - 3d3f8a3a by tchemit at 2020-03-07T04:59:09+01:00 add fully enabled property on ReferentialDto - - - - - a3dedfaa by tchemit at 2020-03-20T19:28:13+01:00 Possibilité de décider, lors de la mise à jour d'une référence, des champs que l'on veut voir pris en compte dans la synchronisation - Closes #1329 - Final part - - - - - 8091c2b7 by tchemit at 2020-03-20T19:28:13+01:00 update pom and toolkit - - - - - d16f2023 by tchemit at 2020-03-20T19:28:13+01:00 [PS OBSERVATIONS] Sur le formulaire Objet/Balises ajouter un champ "bateau propriétaire" - Closes #1455 - - - - - 3da342a5 by tchemit at 2020-03-26T10:36:00+01:00 Use last pom and toolkit to detect more i18n field in validation files - - - - - 125a9994 by tchemit at 2020-03-26T11:12:41+01:00 Review synchro ref advanced actions keystrokes and when they can be accessible - - - - - a0dd0074 by tchemit at 2020-03-26T11:14:41+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.4.0' with non-snapshot versions[skip ci] - - - - - adabdcce by tchemit at 2020-03-26T11:26:51+01:00 [jgitflow-maven-plugin]merging 'release/7.4.0' into 'master-7.x' - - - - - 23 changed files: - .gitlab-ci.yml - + .mvn/gitlab-cache/milestones/1005038-artifacts.json - + .mvn/gitlab-cache/milestones/1005038-issues.json - + .mvn/gitlab-cache/milestones/1005038.json - + .mvn/gitlab-cache/milestones/1005048-artifacts.json - + .mvn/gitlab-cache/milestones/1005048-issues.json - + .mvn/gitlab-cache/milestones/1005048.json - + .mvn/gitlab-cache/milestones/1110720-artifacts.json - + .mvn/gitlab-cache/milestones/1110720-issues.json - + .mvn/gitlab-cache/milestones/1110720.json - + .mvn/gitlab-cache/milestones/1115633-artifacts.json - + .mvn/gitlab-cache/milestones/1115633-issues.json - + .mvn/gitlab-cache/milestones/1115633.json - + .mvn/gitlab-cache/milestones/1117003-artifacts.json - + .mvn/gitlab-cache/milestones/1117003-issues.json - + .mvn/gitlab-cache/milestones/1117003.json - + .mvn/gitlab-cache/milestones/1117288-issues.json - + .mvn/gitlab-cache/milestones/1117288.json - + .mvn/gitlab-cache/milestones/1136007-issues.json - + .mvn/gitlab-cache/milestones/1136007.json - .mvn/gitlab-cache/milestones/268612-issues.json - .mvn/gitlab-cache/milestones/268617-issues.json - .mvn/gitlab-cache/milestones/268621-issues.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c83e1a83149c5bd4c7fb67a8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c83e1a83149c5bd4c7fb67a8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.4.0' with non-snapshot versions[skip ci]
by Tony CHEMIT 26 Mar '20

26 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a0dd0074 by tchemit at 2020-03-26T11:14:41+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.4.0' with non-snapshot versions[skip ci] - - - - - adabdcce by tchemit at 2020-03-26T11:26:51+01:00 [jgitflow-maven-plugin]merging 'release/7.4.0' into 'master-7.x' - - - - - 93c5e573 by tchemit at 2020-03-26T11:26:55+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 06acaba1 by tchemit at 2020-03-26T11:26:55+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 3ce0b147 by tchemit at 2020-03-26T11:26:56+01: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/816abce388dd24af6d59ee4a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/816abce388dd24af6d59ee4a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.4.1-SNAPSHOT development[skip ci]
by Tony CHEMIT 26 Mar '20

26 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 816abce3 by tchemit at 2020-03-26T11:13:57+01:00 [jgitflow-maven-plugin]updating poms for 7.4.1-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/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/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.4.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/816abce388dd24af6d59ee4ac… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/816abce388dd24af6d59ee4ac… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.4.0
by Tony CHEMIT 26 Mar '20

26 Mar '20

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

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Review synchro ref advanced actions keystrokes and when they can be accessible
by Tony CHEMIT 26 Mar '20

26 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 125a9994 by tchemit at 2020-03-26T11:12:41+01:00 Review synchro ref advanced actions keystrokes and when they can be accessible - - - - - 4 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/admin/ObtainLeftSourceUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/admin/ObtainRightSourceUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java ===================================== @@ -76,9 +76,10 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_SHOW_EMPTY_PROGRAM = KeyStroke.getKeyStroke("ctrl pressed F5"); public static final KeyStroke KEY_STROKE_CONFIGURE_LOCAL_SOURCE = KeyStroke.getKeyStroke("ctrl pressed L"); public static final KeyStroke KEY_STROKE_CONFIGURE_REMOTE_SOURCE = KeyStroke.getKeyStroke("ctrl pressed R"); - public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT = KeyStroke.getKeyStroke("ctrl pressed A"); - public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT = KeyStroke.getKeyStroke("ctrl pressed B"); - public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH = KeyStroke.getKeyStroke("ctrl pressed C"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT = KeyStroke.getKeyStroke("pressed F1"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT = KeyStroke.getKeyStroke("pressed F2"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH = KeyStroke.getKeyStroke("pressed F3"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_SHOW_PROPERTIES = KeyStroke.getKeyStroke("pressed F4"); public static final KeyStroke KEY_STROKE_SAVE_TABLE_ENTRY = KeyStroke.getKeyStroke("ctrl pressed S"); public static final KeyStroke KEY_STROKE_PRESSED_ENTER = KeyStroke.getKeyStroke("pressed ENTER"); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/admin/ObtainLeftSourceUIAction.java ===================================== @@ -56,12 +56,14 @@ public class ObtainLeftSourceUIAction extends UIActionSupport { @Override public void actionPerformed(ActionEvent e) { + AdminUIModel model = ui.getModel(); + if (model.isWasStarted()) { + return; + } log.info("start obtain left connexion"); StorageUIModel sourceModel = ui.getLocalSourceModel(); StorageUILauncher.obtainConnexion(ui, ui.getParentContainer(Window.class), sourceModel); - log.debug("After modifiy source model isValid : " + sourceModel.isValid() + " / " + sourceModel.isValidStep()); - - AdminUIModel model = ui.getModel(); + log.debug(String.format("After modify source model isValid : %s / %s", sourceModel.isValid(), sourceModel.isValidStep())); model.getConfigModel().removeLocalSource(); model.getConfigModel().getLocalSourceModel().validate(); model.validate(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/admin/ObtainRightSourceUIAction.java ===================================== @@ -57,10 +57,14 @@ public class ObtainRightSourceUIAction extends UIActionSupport { @Override public void actionPerformed(ActionEvent e) { + AdminUIModel model = ui.getModel(); + if (model.isWasStarted()) { + return; + } log.info("start obtain right connexion"); StorageUIModel sourceModel = ui.getCentralSourceModel(); StorageUILauncher.obtainConnexion(ui, ui.getParentContainer(Window.class), sourceModel); - AdminUIModel model = ui.getModel(); + log.debug(String.format("After modify source model isValid : %s / %s", sourceModel.isValid(), sourceModel.isValidStep())); model.getConfigModel().removeCentralSource(); model.getConfigModel().getCentralSourceModel().validate(StorageStep.CONFIG); model.validate(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java ===================================== @@ -87,27 +87,47 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT, "fromLeft"); configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT, "fromRight"); configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH, "fromBoth"); + configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_SHOW_PROPERTIES, "showProperties"); configUI.getActionMap().put("fromLeft", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { + if (getModel().isWasStarted()) { + return; + } extraConfig.getLEFT_TO_RIGHT().doClick(); } }); configUI.getActionMap().put("fromRight", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { + if (getModel().isWasStarted()) { + return; + } extraConfig.getRIGHT_TO_LEFT().doClick(); } }); configUI.getActionMap().put("fromBoth", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { + if (getModel().isWasStarted()) { + return; + } extraConfig.getBOTH().doClick(); } }); + configUI.getActionMap().put("showProperties", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + if (getModel().isWasStarted()) { + return; + } + extraConfig.getShowProperties().doClick(); + } + }); ObserveKeyStrokes.addKeyStroke(extraConfig.getLEFT_TO_RIGHT(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT); ObserveKeyStrokes.addKeyStroke(extraConfig.getRIGHT_TO_LEFT(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT); ObserveKeyStrokes.addKeyStroke(extraConfig.getBOTH(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH); + ObserveKeyStrokes.addKeyStroke(extraConfig.getShowProperties(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_SHOW_PROPERTIES); super.afterInit(this.ui); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/125a9994870d96381a8ca338f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/125a9994870d96381a8ca338f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Review synchro ref advanced actions keystrokes and when they can be accessible
by Tony CHEMIT 26 Mar '20

26 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: cf6310c7 by tchemit at 2020-03-26T10:55:41+01:00 Review synchro ref advanced actions keystrokes and when they can be accessible - - - - - 4 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/admin/ObtainLeftSourceUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/admin/ObtainRightSourceUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java ===================================== @@ -76,9 +76,10 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_SHOW_EMPTY_PROGRAM = KeyStroke.getKeyStroke("ctrl pressed F5"); public static final KeyStroke KEY_STROKE_CONFIGURE_LOCAL_SOURCE = KeyStroke.getKeyStroke("ctrl pressed L"); public static final KeyStroke KEY_STROKE_CONFIGURE_REMOTE_SOURCE = KeyStroke.getKeyStroke("ctrl pressed R"); - public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT = KeyStroke.getKeyStroke("ctrl pressed A"); - public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT = KeyStroke.getKeyStroke("ctrl pressed B"); - public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH = KeyStroke.getKeyStroke("ctrl pressed C"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT = KeyStroke.getKeyStroke("pressed F1"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT = KeyStroke.getKeyStroke("pressed F2"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH = KeyStroke.getKeyStroke("pressed F3"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_SHOW_PROPERTIES = KeyStroke.getKeyStroke("pressed F4"); public static final KeyStroke KEY_STROKE_SAVE_TABLE_ENTRY = KeyStroke.getKeyStroke("ctrl pressed S"); public static final KeyStroke KEY_STROKE_PRESSED_ENTER = KeyStroke.getKeyStroke("pressed ENTER"); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/admin/ObtainLeftSourceUIAction.java ===================================== @@ -56,12 +56,14 @@ public class ObtainLeftSourceUIAction extends UIActionSupport { @Override public void actionPerformed(ActionEvent e) { + AdminUIModel model = ui.getModel(); + if (model.isWasStarted()) { + return; + } log.info("start obtain left connexion"); StorageUIModel sourceModel = ui.getLocalSourceModel(); StorageUILauncher.obtainConnexion(ui, ui.getParentContainer(Window.class), sourceModel); - log.debug("After modifiy source model isValid : " + sourceModel.isValid() + " / " + sourceModel.isValidStep()); - - AdminUIModel model = ui.getModel(); + log.debug(String.format("After modify source model isValid : %s / %s", sourceModel.isValid(), sourceModel.isValidStep())); model.getConfigModel().removeLocalSource(); model.getConfigModel().getLocalSourceModel().validate(); model.validate(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/admin/ObtainRightSourceUIAction.java ===================================== @@ -57,10 +57,14 @@ public class ObtainRightSourceUIAction extends UIActionSupport { @Override public void actionPerformed(ActionEvent e) { + AdminUIModel model = ui.getModel(); + if (model.isWasStarted()) { + return; + } log.info("start obtain right connexion"); StorageUIModel sourceModel = ui.getCentralSourceModel(); StorageUILauncher.obtainConnexion(ui, ui.getParentContainer(Window.class), sourceModel); - AdminUIModel model = ui.getModel(); + log.debug(String.format("After modify source model isValid : %s / %s", sourceModel.isValid(), sourceModel.isValidStep())); model.getConfigModel().removeCentralSource(); model.getConfigModel().getCentralSourceModel().validate(StorageStep.CONFIG); model.validate(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java ===================================== @@ -87,27 +87,47 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT, "fromLeft"); configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT, "fromRight"); configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH, "fromBoth"); + configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_SHOW_PROPERTIES, "showProperties"); configUI.getActionMap().put("fromLeft", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { + if (getModel().isWasStarted()) { + return; + } extraConfig.getLEFT_TO_RIGHT().doClick(); } }); configUI.getActionMap().put("fromRight", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { + if (getModel().isWasStarted()) { + return; + } extraConfig.getRIGHT_TO_LEFT().doClick(); } }); configUI.getActionMap().put("fromBoth", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { + if (getModel().isWasStarted()) { + return; + } extraConfig.getBOTH().doClick(); } }); + configUI.getActionMap().put("showProperties", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + if (getModel().isWasStarted()) { + return; + } + extraConfig.getShowProperties().doClick(); + } + }); ObserveKeyStrokes.addKeyStroke(extraConfig.getLEFT_TO_RIGHT(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT); ObserveKeyStrokes.addKeyStroke(extraConfig.getRIGHT_TO_LEFT(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT); ObserveKeyStrokes.addKeyStroke(extraConfig.getBOTH(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH); + ObserveKeyStrokes.addKeyStroke(extraConfig.getShowProperties(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_SHOW_PROPERTIES); super.afterInit(this.ui); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cf6310c79f03716ba52290445… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cf6310c79f03716ba52290445… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Use last pom and toolkit to detect more i18n field in validation files
by Tony CHEMIT 26 Mar '20

26 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 3da342a5 by tchemit at 2020-03-26T10:36:00+01:00 Use last pom and toolkit to detect more i18n field in validation files - - - - - 5 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 - pom.xml - validation/src/main/i18n/getters/validation-fields.getter Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -418,6 +418,7 @@ observe.common.ActivitySeineDto.vesselActivitySeine=Vessel activity observe.common.ActivitySeineDto.vesselActivitySeine.comment=Only activity of type %s allows you to fill a set. observe.common.ActivitySeineDto.vesselSpeed=Vessel speed observe.common.ActivitySeineDto.wind=Wind +observe.common.ActivitySeineStubDto.seaSurfaceTemperature=Sea surface temperature observe.common.BaitHaulingStatusDto.type=Bait hauling status observe.common.BaitHaulingStatusDto.types=Bait hauling statuses observe.common.BaitSettingStatusDto.type=Bait setting status @@ -657,6 +658,7 @@ observe.common.FloatingObjectDto.table.type=Type observe.common.FloatingObjectDto.title=Floatting object observe.common.FloatingObjectDto.type=Floating object observe.common.FloatingObjectDto.types=Floating objects +observe.common.FloatingObjectPartDto.objectMaterial=Object material observe.common.FloatingObjectPartDto.title=Floating object parts observe.common.FloatingObjectPartDto.type=Floating object part observe.common.FloatingObjectPartDto.types=Floating object parts @@ -696,6 +698,7 @@ observe.common.GearCaracteristicDto.unit=Unit observe.common.GearCaracteristicTypeDto.type=Gear caracteristic type observe.common.GearCaracteristicTypeDto.types=Gear caracteristic types observe.common.GearDto.availableGearCaracteristic=Available caracteristics +observe.common.GearDto.gearCaracteristic=Gear caracteristic observe.common.GearDto.gearCaracteristicTab=Caracteristics of the gear observe.common.GearDto.generalTab=General caracteristics observe.common.GearDto.selectedGearCaracteristic=Selected caracteristics @@ -729,7 +732,9 @@ observe.common.GearUseFeaturesLonglineDto.title=Gears observe.common.GearUseFeaturesLonglineDto.type=Gear uses features observe.common.GearUseFeaturesLonglineDto.types=Gear uses features observe.common.GearUseFeaturesLonglineDto.usedInTrip=Used in trip +observe.common.GearUseFeaturesMeasurementLonglineDto.gearCaracteristic=Gear caracteristic observe.common.GearUseFeaturesMeasurementLonglineDto.title=Gear uses feature measurements +observe.common.GearUseFeaturesMeasurementSeineDto.gearCaracteristic=Gear caracteristic observe.common.GearUseFeaturesMeasurementSeineDto.title=Gear uses feature measurements observe.common.GearUseFeaturesSeineDto.action.addMeasurement=Add observe.common.GearUseFeaturesSeineDto.action.addMeasurement.tip=Add a new measurement @@ -981,6 +986,8 @@ observe.common.ObjectObservedSpeciesDto.type=Object observed species observe.common.ObjectObservedSpeciesDto.types=Object observed species observe.common.ObjectOperationDto.type=Object operation observe.common.ObjectOperationDto.types=Object operations +observe.common.ObjectOperationDto.whenArriving=When arriving +observe.common.ObjectOperationDto.whenLeaving=When leaving observe.common.ObjectSchoolEstimateDto.action.create=Insert this estimate observe.common.ObjectSchoolEstimateDto.action.create.tip=Insert this estimate observe.common.ObjectSchoolEstimateDto.title=School estimate @@ -1081,6 +1088,8 @@ observe.common.RouteDto.title=Route observe.common.RouteDto.titles=Routes observe.common.RouteDto.type=Route observe.common.RouteDto.types=Routes +observe.common.RouteStubDto.endLogValue=End log value +observe.common.RouteStubDto.startLogValue=Start log value observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size measure type observe.common.Sample.length.computed.tip=Length was computed observe.common.Sample.length.observed.tip=Length was observed @@ -1182,6 +1191,7 @@ observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.message=The cu observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.title=Can't delete basket observe.common.SetLonglineDetailCompositionDto.basket.invalid.nextFloatline1Length=The floatline 2 (%s) is not equals to the floatline 1 of the next basket(%s) observe.common.SetLonglineDetailCompositionDto.baskets=Baskets +observe.common.SetLonglineDetailCompositionDto.basketsPerSectionCount=Baskets per section count observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length=Floatline 1 length (m) observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length.tip=Floatline 1 length (m) observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline2Length=Floatline 2 length (m) @@ -1194,6 +1204,7 @@ observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.message=Th observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.title=Can't delete branchline observe.common.SetLonglineDetailCompositionDto.branchlineDetailTab=Branchline detail observe.common.SetLonglineDetailCompositionDto.branchlines=Branchlines +observe.common.SetLonglineDetailCompositionDto.branchlinesPerBasketCount=Branchlines per basket count observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength=Branchline length (m) observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength.tip=Branchline length (m) observe.common.SetLonglineDetailCompositionDto.branchlinesTable.haulingIdentifier=Hauling Id @@ -1206,6 +1217,7 @@ observe.common.SetLonglineDetailCompositionDto.canGenerate=Can generate observe.common.SetLonglineDetailCompositionDto.compositionTab=Composition observe.common.SetLonglineDetailCompositionDto.firstTemplate.template.notCompilant.basketCount=Template %s is not compliant with the number of baskets per section (%s) observe.common.SetLonglineDetailCompositionDto.generateTab=generation +observe.common.SetLonglineDetailCompositionDto.haulingBreaks=Hauling breaks observe.common.SetLonglineDetailCompositionDto.message.updating=Updating composition details observe.common.SetLonglineDetailCompositionDto.section.cant.delete.message=The current section can not be deleted since it used by other data. observe.common.SetLonglineDetailCompositionDto.section.cant.delete.title=Can't delete section @@ -1224,6 +1236,7 @@ observe.common.SetLonglineDetailCompositionDto.sectionsTable.template=Template observe.common.SetLonglineDetailCompositionDto.sectionsTable.template.tip=Template used to generate baskets floatline lengths observe.common.SetLonglineDetailCompositionDto.title=Detailed composition observe.common.SetLonglineDetailCompositionDto.title.section.cant.use.firstTemplate=Can't use the first template while generating +observe.common.SetLonglineDetailCompositionDto.totalSectionsCount=Total sections count observe.common.SetLonglineDetailCompositionDto.type=Detailed composition observe.common.SetLonglineDto.action.reset.homeId.tip=Reset home id observe.common.SetLonglineDto.basketsPerSectionCount=Baskets per section count @@ -1285,6 +1298,7 @@ observe.common.SetLonglineGlobalCompositionDto.floatlinesCompositionTab=Floatlin observe.common.SetLonglineGlobalCompositionDto.hooksComposition=hooks composition observe.common.SetLonglineGlobalCompositionDto.hooksCompositionProportionSum=hooks composition proportion sum observe.common.SetLonglineGlobalCompositionDto.hooksCompositionTab=Hooks +observe.common.SetLonglineGlobalCompositionDto.mitigationType=Mitigation type observe.common.SetLonglineGlobalCompositionDto.mitigationTypeTab=Mitigation observe.common.SetLonglineGlobalCompositionDto.selectedMitigationType=Selected mitigations observe.common.SetLonglineGlobalCompositionDto.title=Global composition @@ -1330,6 +1344,7 @@ observe.common.SexDto.types=Sexes observe.common.ShipOwnerDto.type=Ship owner observe.common.ShipOwnerDto.types=Ship owners observe.common.SizeMeasureDto.delete.message=Confirm to delete current size measure. +observe.common.SizeMeasureDto.size=Size (cm) observe.common.SizeMeasureDto.table.size=Size (cm) observe.common.SizeMeasureDto.table.size.tip=Size (cm) observe.common.SizeMeasureDto.table.sizeMeasureType=Measure type @@ -1364,6 +1379,7 @@ observe.common.SpeciesFateDto.types=Species fates observe.common.SpeciesGroupDto.availableSpeciesGroupReleaseMode=Available release modes observe.common.SpeciesGroupDto.generalTab=General caracteristics observe.common.SpeciesGroupDto.selectedSpeciesGroupReleaseMode=Selected release modes +observe.common.SpeciesGroupDto.speciesGroupReleaseMode=Release mode observe.common.SpeciesGroupDto.speciesGroupReleaseModeTab=Release modes observe.common.SpeciesGroupDto.type=Species group observe.common.SpeciesGroupDto.types=Species groups @@ -1631,6 +1647,7 @@ observe.common.WeightMeasureDto.table.weightMeasureType.tip=Measure type observe.common.WeightMeasureDto.title=Weight measures observe.common.WeightMeasureDto.type=Weight measure observe.common.WeightMeasureDto.types=Weight measures +observe.common.WeightMeasureDto.weight=Measure (kg) observe.common.WeightMeasureTypeDto.type=Weight measure type observe.common.WeightMeasureTypeDto.types=Weight measure types observe.common.WindDto.speedRange=Speed range ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -418,6 +418,7 @@ observe.common.ActivitySeineDto.vesselActivitySeine=Actividad buque observe.common.ActivitySeineDto.vesselActivitySeine.comment=Solo la actividad %1$s permite introducir un lance observe.common.ActivitySeineDto.vesselSpeed=Velocidad del barco (nd) observe.common.ActivitySeineDto.wind=Fuerza del viento +observe.common.ActivitySeineStubDto.seaSurfaceTemperature=Temperatura en superficie observe.common.BaitHaulingStatusDto.type=Estado del cebo en la virada observe.common.BaitHaulingStatusDto.types=Estados del cebo en la virada observe.common.BaitSettingStatusDto.type=Estado del cebo en la calada @@ -657,6 +658,7 @@ observe.common.FloatingObjectDto.table.type=Tipo observe.common.FloatingObjectDto.title=Objeto flotante observe.common.FloatingObjectDto.type=Objeto flotante observe.common.FloatingObjectDto.types=Objetos flotantes +observe.common.FloatingObjectPartDto.objectMaterial=Object material \#TODO observe.common.FloatingObjectPartDto.title=Componentes del objeto flotante observe.common.FloatingObjectPartDto.type=Componente del objeto flotante observe.common.FloatingObjectPartDto.types=Componentes del objeto flotante @@ -696,6 +698,7 @@ observe.common.GearCaracteristicDto.unit=Unidad observe.common.GearCaracteristicTypeDto.type=Tipo de característica del equipamiento observe.common.GearCaracteristicTypeDto.types=Tipos de características del equipamiento observe.common.GearDto.availableGearCaracteristic=Características disponibles +observe.common.GearDto.gearCaracteristic=Característica del equipamiento observe.common.GearDto.gearCaracteristicTab=Características del equipamiento observe.common.GearDto.generalTab=Características generales observe.common.GearDto.selectedGearCaracteristic=Características seleccionadas @@ -729,7 +732,9 @@ observe.common.GearUseFeaturesLonglineDto.title=Equipos observe.common.GearUseFeaturesLonglineDto.type=Equipamiento observe.common.GearUseFeaturesLonglineDto.types=Equipamientos observe.common.GearUseFeaturesLonglineDto.usedInTrip=Utilizado en la marea +observe.common.GearUseFeaturesMeasurementLonglineDto.gearCaracteristic=Característica del equipamiento observe.common.GearUseFeaturesMeasurementLonglineDto.title=Medidas +observe.common.GearUseFeaturesMeasurementSeineDto.gearCaracteristic=Característica del equipamiento observe.common.GearUseFeaturesMeasurementSeineDto.title=Medidas observe.common.GearUseFeaturesSeineDto.action.addMeasurement=Añadir observe.common.GearUseFeaturesSeineDto.action.addMeasurement.tip=Añadir una nueva característica @@ -981,6 +986,8 @@ observe.common.ObjectObservedSpeciesDto.type=Fauna observada observe.common.ObjectObservedSpeciesDto.types=Fauna observada observe.common.ObjectOperationDto.type=Operación sobre el objeto observe.common.ObjectOperationDto.types=Operaciones sobre el objeto +observe.common.ObjectOperationDto.whenArriving=Al llegar +observe.common.ObjectOperationDto.whenLeaving=Al dejar observe.common.ObjectSchoolEstimateDto.action.create=Insertar estimación observe.common.ObjectSchoolEstimateDto.action.create.tip=Insertar la nueva estimación en la tabla observe.common.ObjectSchoolEstimateDto.title=Estimación del banco @@ -1081,6 +1088,8 @@ observe.common.RouteDto.title=Ruta observe.common.RouteDto.titles=Rutas observe.common.RouteDto.type=Ruta observe.common.RouteDto.types=Rutas +observe.common.RouteStubDto.endLogValue=Corredera de tarde (millas) +observe.common.RouteStubDto.startLogValue=Día de observación observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utilizar el tipo de medida por defecto observe.common.Sample.length.computed.tip=Longitud calculada observe.common.Sample.length.observed.tip=Longitud observada @@ -1182,6 +1191,7 @@ observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.message=La can observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.title=Imposible de eliminar la canasta observe.common.SetLonglineDetailCompositionDto.basket.invalid.nextFloatline1Length=La longitud de orinque 2 (%s) no es igual a la longitud del orinque 1 de la cesta que sigue (%s) observe.common.SetLonglineDetailCompositionDto.baskets=Canastas +observe.common.SetLonglineDetailCompositionDto.basketsPerSectionCount=Baskets per section count \#TODO observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length=Orinque 1 (m) observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length.tip=Longitud Orinque 1 (m) observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline2Length=Orinque 2 (m) @@ -1194,6 +1204,7 @@ observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.message=La observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.title=Imposible de eliminar la brazolada observe.common.SetLonglineDetailCompositionDto.branchlineDetailTab=Detalle de la brazolada observe.common.SetLonglineDetailCompositionDto.branchlines=Brazoladas +observe.common.SetLonglineDetailCompositionDto.branchlinesPerBasketCount=Branchlines per basket count \#TODO observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength=Brazolada (m) observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength.tip=Longitud Brazolada (m) observe.common.SetLonglineDetailCompositionDto.branchlinesTable.haulingIdentifier=Id Virada @@ -1206,6 +1217,7 @@ observe.common.SetLonglineDetailCompositionDto.canGenerate=Autorizar la creació observe.common.SetLonglineDetailCompositionDto.compositionTab=Composición observe.common.SetLonglineDetailCompositionDto.firstTemplate.template.notCompilant.basketCount=El patrón a utilizar %s no es compatible con el número de canastas por sección (%s) observe.common.SetLonglineDetailCompositionDto.generateTab=Definición de los modelos +observe.common.SetLonglineDetailCompositionDto.haulingBreaks=Hauling breaks \#TODO observe.common.SetLonglineDetailCompositionDto.message.updating=Composición detallada del palangre en proceso de modificación observe.common.SetLonglineDetailCompositionDto.section.cant.delete.message=La sección no puede ser eliminada porque está en uso por otros datos observe.common.SetLonglineDetailCompositionDto.section.cant.delete.title=Imposible eliminar la sección @@ -1224,6 +1236,7 @@ observe.common.SetLonglineDetailCompositionDto.sectionsTable.template=Patrón observe.common.SetLonglineDetailCompositionDto.sectionsTable.template.tip=Patrón empleado para generar las medidas de la línea de canastas observe.common.SetLonglineDetailCompositionDto.title=Esquema del palangre observe.common.SetLonglineDetailCompositionDto.title.section.cant.use.firstTemplate=Imposible de utilizar el primer modelo durante la generación +observe.common.SetLonglineDetailCompositionDto.totalSectionsCount=Total sections count \#TODO observe.common.SetLonglineDetailCompositionDto.type=Esquema del palangre observe.common.SetLonglineDto.action.reset.homeId.tip=Reiniciar el identificador observe.common.SetLonglineDto.basketsPerSectionCount=Número de canastas por sección @@ -1285,6 +1298,7 @@ observe.common.SetLonglineGlobalCompositionDto.floatlinesCompositionTab=Orinques observe.common.SetLonglineGlobalCompositionDto.hooksComposition=Anzuelos observe.common.SetLonglineGlobalCompositionDto.hooksCompositionProportionSum=Suma de las proporciones de anzuelos (%) observe.common.SetLonglineGlobalCompositionDto.hooksCompositionTab=Anzuelos +observe.common.SetLonglineGlobalCompositionDto.mitigationType=Mitigaciones observe.common.SetLonglineGlobalCompositionDto.mitigationTypeTab=Mitigaciones observe.common.SetLonglineGlobalCompositionDto.selectedMitigationType=Mitigaciones seleccionadas observe.common.SetLonglineGlobalCompositionDto.title=Composición global del palangre @@ -1330,6 +1344,7 @@ observe.common.SexDto.types=Sexos observe.common.ShipOwnerDto.type=Compañía armadora observe.common.ShipOwnerDto.types=Compañías armadoras observe.common.SizeMeasureDto.delete.message=Confirmar la eliminación de la medida del talla seleccionada +observe.common.SizeMeasureDto.size=Talla (cm) observe.common.SizeMeasureDto.table.size=Talla (cm) observe.common.SizeMeasureDto.table.size.tip=Talla (cm) observe.common.SizeMeasureDto.table.sizeMeasureType=Tipo de medida @@ -1364,6 +1379,7 @@ observe.common.SpeciesFateDto.types=Devenir de la especie observe.common.SpeciesGroupDto.availableSpeciesGroupReleaseMode=Modos de liberación disponibles observe.common.SpeciesGroupDto.generalTab=Características generales observe.common.SpeciesGroupDto.selectedSpeciesGroupReleaseMode=Modos de liberación seleccionados +observe.common.SpeciesGroupDto.speciesGroupReleaseMode=Modos de liberación observe.common.SpeciesGroupDto.speciesGroupReleaseModeTab=Modos de liberación observe.common.SpeciesGroupDto.type=Grupo de especies observe.common.SpeciesGroupDto.types=Grupos de especies @@ -1631,6 +1647,7 @@ observe.common.WeightMeasureDto.table.weightMeasureType.tip=Tipo de medida de pe observe.common.WeightMeasureDto.title=Medidas de peso observe.common.WeightMeasureDto.type=Medida de peso observe.common.WeightMeasureDto.types=Medidas de peso +observe.common.WeightMeasureDto.weight=Medida de peso (kg) observe.common.WeightMeasureTypeDto.type=Tipo de medida de peso observe.common.WeightMeasureTypeDto.types=Tipos de medida de peso observe.common.WindDto.speedRange=Rango velocidad viento ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -418,6 +418,7 @@ observe.common.ActivitySeineDto.vesselActivitySeine=Activité bateau observe.common.ActivitySeineDto.vesselActivitySeine.comment=Seule l'activité %1$s permet de saisir une calée. observe.common.ActivitySeineDto.vesselSpeed=Vitesse bateau (nd) observe.common.ActivitySeineDto.wind=Vent Beaufort +observe.common.ActivitySeineStubDto.seaSurfaceTemperature=Température surface observe.common.BaitHaulingStatusDto.type=Statut de l'appât au virage observe.common.BaitHaulingStatusDto.types=Statuts de l'appât au virage observe.common.BaitSettingStatusDto.type=Statut de l'appât au filage @@ -657,6 +658,7 @@ observe.common.FloatingObjectDto.table.type=Type observe.common.FloatingObjectDto.title=Objet flottant observe.common.FloatingObjectDto.type=Objet flottant observe.common.FloatingObjectDto.types=Objets flottant +observe.common.FloatingObjectPartDto.objectMaterial=Matériaux d'un objet flottant observe.common.FloatingObjectPartDto.title=Matériaux d'un objet flottant observe.common.FloatingObjectPartDto.type=Matérial d'un objet flottant observe.common.FloatingObjectPartDto.types=Matériaux d'un objet flottant @@ -696,6 +698,7 @@ observe.common.GearCaracteristicDto.unit=Unité observe.common.GearCaracteristicTypeDto.type=Type de caractéristique d'équipement observe.common.GearCaracteristicTypeDto.types=Types de caractéristique d'équipement observe.common.GearDto.availableGearCaracteristic=Caractéristiques disponibles +observe.common.GearDto.gearCaracteristic=Caractéristiques de l'équipement observe.common.GearDto.gearCaracteristicTab=Caractéristiques de l'équipement observe.common.GearDto.generalTab=Caractéristiques générales observe.common.GearDto.selectedGearCaracteristic=Caractéristiques utilisées @@ -729,7 +732,9 @@ observe.common.GearUseFeaturesLonglineDto.title=Équipements observe.common.GearUseFeaturesLonglineDto.type=Équipement observe.common.GearUseFeaturesLonglineDto.types=Équipements observe.common.GearUseFeaturesLonglineDto.usedInTrip=Utilisé dans la marée +observe.common.GearUseFeaturesMeasurementLonglineDto.gearCaracteristic=Caractéristiques de l'équipement observe.common.GearUseFeaturesMeasurementLonglineDto.title=Mesures +observe.common.GearUseFeaturesMeasurementSeineDto.gearCaracteristic=Caractéristiques de l'équipement observe.common.GearUseFeaturesMeasurementSeineDto.title=Mesures observe.common.GearUseFeaturesSeineDto.action.addMeasurement=Ajouter observe.common.GearUseFeaturesSeineDto.action.addMeasurement.tip=Ajouter une nouvelle caractéristique @@ -981,6 +986,8 @@ observe.common.ObjectObservedSpeciesDto.type=Faune observée observe.common.ObjectObservedSpeciesDto.types=Faune observée observe.common.ObjectOperationDto.type=Opération sur l'objet observe.common.ObjectOperationDto.types=Opérations sur l'objet +observe.common.ObjectOperationDto.whenArriving=À l'arrivée +observe.common.ObjectOperationDto.whenLeaving=Au départ observe.common.ObjectSchoolEstimateDto.action.create=Insérer cette estimation observe.common.ObjectSchoolEstimateDto.action.create.tip=Insérer la nouvelle estimation dans la table observe.common.ObjectSchoolEstimateDto.title=Estimation banc @@ -1081,6 +1088,8 @@ observe.common.RouteDto.title=Route observe.common.RouteDto.titles=Routes observe.common.RouteDto.type=Route observe.common.RouteDto.types=Routes +observe.common.RouteStubDto.endLogValue=Loch du soir (milles) +observe.common.RouteStubDto.startLogValue=Loch du matin (milles) observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut observe.common.Sample.length.computed.tip=La longueur a été calculée observe.common.Sample.length.observed.tip=La longueur a été observée @@ -1182,6 +1191,7 @@ observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.message=Le pan observe.common.SetLonglineDetailCompositionDto.basket.cant.delete.title=Impossible de supprimer le panier observe.common.SetLonglineDetailCompositionDto.basket.invalid.nextFloatline1Length=La longueur d'orin 2 (%s) n'est pas égale à la longueur d'orin 1 du panier suivant (%s) observe.common.SetLonglineDetailCompositionDto.baskets=Paniers +observe.common.SetLonglineDetailCompositionDto.basketsPerSectionCount=Nombre de paniers par section observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length=Orin 1 (m) observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline1Length.tip=Longueur Orin 1 (m) observe.common.SetLonglineDetailCompositionDto.basketsTable.floatline2Length=Orin 2 (m) @@ -1194,6 +1204,7 @@ observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.message=L' observe.common.SetLonglineDetailCompositionDto.branchLine.cant.delete.title=Impossible de supprimer l'avançon observe.common.SetLonglineDetailCompositionDto.branchlineDetailTab=Détail avançon observe.common.SetLonglineDetailCompositionDto.branchlines=Avançons +observe.common.SetLonglineDetailCompositionDto.branchlinesPerBasketCount=Nombre d'avançons par panier observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength=Avançon (m) observe.common.SetLonglineDetailCompositionDto.branchlinesTable.branchlineLength.tip=Longueur Avançon (m) observe.common.SetLonglineDetailCompositionDto.branchlinesTable.haulingIdentifier=Id Virage @@ -1206,6 +1217,7 @@ observe.common.SetLonglineDetailCompositionDto.canGenerate=Autoriser la généra observe.common.SetLonglineDetailCompositionDto.compositionTab=Composition observe.common.SetLonglineDetailCompositionDto.firstTemplate.template.notCompilant.basketCount=Le patron à utiliser %s n'est pas compatible avec le nombre de paniers par section (%s) observe.common.SetLonglineDetailCompositionDto.generateTab=Définition des modèles +observe.common.SetLonglineDetailCompositionDto.haulingBreaks=Coupure de ligne observe.common.SetLonglineDetailCompositionDto.message.updating=Composition détaillée de la palangre en cours de modification observe.common.SetLonglineDetailCompositionDto.section.cant.delete.message=La section ne peut pas être supprimée car elle est utilisée dans des données. observe.common.SetLonglineDetailCompositionDto.section.cant.delete.title=Impossible de supprimer la section @@ -1224,6 +1236,7 @@ observe.common.SetLonglineDetailCompositionDto.sectionsTable.template=Patron observe.common.SetLonglineDetailCompositionDto.sectionsTable.template.tip=Patron observe.common.SetLonglineDetailCompositionDto.title=Schéma de palangre observe.common.SetLonglineDetailCompositionDto.title.section.cant.use.firstTemplate=Impossible d'utiliser le premier modèle lors de la génération +observe.common.SetLonglineDetailCompositionDto.totalSectionsCount=Nombre de sections observe.common.SetLonglineDetailCompositionDto.type=Schéma de palangre observe.common.SetLonglineDto.action.reset.homeId.tip=Réinitialiser l'id métier observe.common.SetLonglineDto.basketsPerSectionCount=Nombre de paniers par section @@ -1285,6 +1298,7 @@ observe.common.SetLonglineGlobalCompositionDto.floatlinesCompositionTab=Orins observe.common.SetLonglineGlobalCompositionDto.hooksComposition=Hameçons observe.common.SetLonglineGlobalCompositionDto.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) observe.common.SetLonglineGlobalCompositionDto.hooksCompositionTab=Hameçons +observe.common.SetLonglineGlobalCompositionDto.mitigationType=Type d'atténuation observe.common.SetLonglineGlobalCompositionDto.mitigationTypeTab=Atténuations observe.common.SetLonglineGlobalCompositionDto.selectedMitigationType=Atténuations sélectionnées observe.common.SetLonglineGlobalCompositionDto.title=Composition globale de la palangre @@ -1330,6 +1344,7 @@ observe.common.SexDto.types=Sexes observe.common.ShipOwnerDto.type=Armateur observe.common.ShipOwnerDto.types=Armateurs observe.common.SizeMeasureDto.delete.message=Confirmer la suppression de la mesure de la taille sélectionnée. +observe.common.SizeMeasureDto.size=Mesure (cm) observe.common.SizeMeasureDto.table.size=Mesure (cm) observe.common.SizeMeasureDto.table.size.tip=Mesure (cm) observe.common.SizeMeasureDto.table.sizeMeasureType=Type de mesure @@ -1364,6 +1379,7 @@ observe.common.SpeciesFateDto.types=Devenirs espèce observe.common.SpeciesGroupDto.availableSpeciesGroupReleaseMode=Modes de libération disponibles observe.common.SpeciesGroupDto.generalTab=Caractéristiques générales observe.common.SpeciesGroupDto.selectedSpeciesGroupReleaseMode=Modes de libération sélectionnés +observe.common.SpeciesGroupDto.speciesGroupReleaseMode=Mode de libération observe.common.SpeciesGroupDto.speciesGroupReleaseModeTab=Modes de libération observe.common.SpeciesGroupDto.type=Groupe espèce observe.common.SpeciesGroupDto.types=Groupes espèce @@ -1631,6 +1647,7 @@ observe.common.WeightMeasureDto.table.weightMeasureType.tip=Type de mesure observe.common.WeightMeasureDto.title=Mesures de poids observe.common.WeightMeasureDto.type=Mesure de poids observe.common.WeightMeasureDto.types=Mesures de poids +observe.common.WeightMeasureDto.weight=Mesure (kg) observe.common.WeightMeasureTypeDto.type=Type de mesure de poids observe.common.WeightMeasureTypeDto.types=Types de mesure de poids observe.common.WindDto.speedRange=Libellé vitesse vent ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.10</version> + <version>2020.14</version> </parent> <groupId>fr.ird.observe</groupId> @@ -155,7 +155,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.24</observeToolkitVersion> + <observeToolkitVersion>3.7.26</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -19,6 +19,7 @@ observe.common.ActivitySeineDto.time observe.common.ActivitySeineDto.vesselActivitySeine observe.common.ActivitySeineDto.vesselSpeed observe.common.ActivitySeineDto.wind +observe.common.ActivitySeineStubDto.seaSurfaceTemperature observe.common.BaitsCompositionDto.baitSettingStatus observe.common.BaitsCompositionDto.baitType observe.common.BaitsCompositionDto.individualSize @@ -57,6 +58,8 @@ observe.common.CatchLonglineDto.section observe.common.CatchLonglineDto.speciesCatch observe.common.CatchLonglineDto.stomachFullness observe.common.CatchLonglineDto.totalWeight +observe.common.CountryDto.iso2Code +observe.common.CountryDto.iso3Code observe.common.DataDto.baitHaulingStatus observe.common.DataDto.captain observe.common.DataDto.dataQuality @@ -70,20 +73,36 @@ observe.common.DataDto.settingIdentifier observe.common.DataDto.speciesFate observe.common.DataDto.startDate observe.common.DataDto.vessel +observe.common.EncounterDto.count +observe.common.EncounterDto.distance +observe.common.EncounterDto.encounterType observe.common.FloatingObjectDto.materialsValid observe.common.FloatingObjectDto.objectOperation observe.common.FloatingObjectDto.supportVesselName +observe.common.FloatingObjectPartDto.objectMaterial observe.common.FloatlinesCompositionDto.length observe.common.FloatlinesCompositionDto.lineType observe.common.FloatlinesCompositionDto.proportion +observe.common.GearCaracteristicDto.gearCaracteristicType +observe.common.GearDto.gearCaracteristic +observe.common.GearUseFeaturesLonglineDto.gear +observe.common.GearUseFeaturesLonglineDto.number +observe.common.GearUseFeaturesMeasurementLonglineDto.gearCaracteristic +observe.common.GearUseFeaturesMeasurementSeineDto.gearCaracteristic +observe.common.GearUseFeaturesSeineDto.gear +observe.common.GearUseFeaturesSeineDto.number +observe.common.HarbourDto.locode +observe.common.HarbourDto.name observe.common.HooksCompositionDto.hookOffset observe.common.HooksCompositionDto.hookSize observe.common.HooksCompositionDto.hookType observe.common.HooksCompositionDto.proportion +observe.common.I18nReferentialDto.label observe.common.I18nReferentialDto.label1 observe.common.I18nReferentialDto.label2 observe.common.I18nReferentialDto.label3 observe.common.IdDto.comment +observe.common.IdDto.country observe.common.IdDto.homeId observe.common.IdDto.latitude observe.common.IdDto.longitude @@ -92,6 +111,7 @@ observe.common.IdDto.quadrant observe.common.IdDto.sex observe.common.IdDto.sizeMeasureType observe.common.IdDto.species +observe.common.IdDto.weightMeasureType observe.common.LengthLengthParameterDto.inputOutputFormula observe.common.LengthLengthParameterDto.inputSizeMeasureType observe.common.LengthLengthParameterDto.outputInputFormula @@ -118,7 +138,16 @@ observe.common.ObjectMaterialDto.objectMaterialType observe.common.ObjectMaterialDto.parent observe.common.ObjectMaterialDto.standardCode observe.common.ObjectMaterialDto.validation +observe.common.ObjectObservedSpeciesDto.count +observe.common.ObjectObservedSpeciesDto.speciesStatus +observe.common.ObjectOperationDto.whenArriving +observe.common.ObjectOperationDto.whenLeaving observe.common.ObjectSchoolEstimateDto.totalWeight +observe.common.OrganismDto.description +observe.common.PersonDto.firstName +observe.common.PersonDto.lastName +observe.common.ProgramDto.gearType +observe.common.ProgramDto.organism observe.common.ReferentialDto.code observe.common.ReferentialDto.status observe.common.ReferentialDto.uri @@ -126,8 +155,19 @@ observe.common.RouteDto.activitySeine observe.common.RouteDto.date observe.common.RouteDto.endLogValue observe.common.RouteDto.startLogValue +observe.common.RouteStubDto.endLogValue +observe.common.RouteStubDto.startLogValue observe.common.SchoolEstimateDto.meanWeight observe.common.SchoolEstimateDto.totalWeight +observe.common.SensorBrandDto.brandName +observe.common.SensorUsedDto.sensorBrand +observe.common.SensorUsedDto.sensorDataFormat +observe.common.SensorUsedDto.sensorSerialNo +observe.common.SensorUsedDto.sensorType +observe.common.SetLonglineDetailCompositionDto.basketsPerSectionCount +observe.common.SetLonglineDetailCompositionDto.branchlinesPerBasketCount +observe.common.SetLonglineDetailCompositionDto.haulingBreaks +observe.common.SetLonglineDetailCompositionDto.totalSectionsCount observe.common.SetLonglineDto.basketsPerSectionCount observe.common.SetLonglineDto.branchlinesPerBasketCount observe.common.SetLonglineDto.haulingBreaks @@ -171,6 +211,7 @@ observe.common.SetLonglineGlobalCompositionDto.floatlinesComposition observe.common.SetLonglineGlobalCompositionDto.floatlinesCompositionProportionSum observe.common.SetLonglineGlobalCompositionDto.hooksComposition observe.common.SetLonglineGlobalCompositionDto.hooksCompositionProportionSum +observe.common.SetLonglineGlobalCompositionDto.mitigationType observe.common.SetSeineDto.currentDirection observe.common.SetSeineDto.currentMeasureDepth observe.common.SetSeineDto.currentSpeed @@ -188,8 +229,19 @@ observe.common.SetSeineDto.supportVesselName observe.common.SetSeineNonTargetCatchDto.nonTargetCatch observe.common.SetSeineSchoolEstimateDto.schoolEstimate observe.common.SetSeineTargetCatchDto.targetCatch +observe.common.SizeMeasureDto.size +observe.common.SpeciesDto.faoCode +observe.common.SpeciesDto.maxLength +observe.common.SpeciesDto.maxWeight +observe.common.SpeciesDto.minLength +observe.common.SpeciesDto.minWeight +observe.common.SpeciesDto.scientificLabel +observe.common.SpeciesDto.speciesGroup +observe.common.SpeciesDto.wormsId +observe.common.SpeciesGroupDto.speciesGroupReleaseMode observe.common.TargetCatchDto.catchWeight observe.common.TargetCatchDto.reasonForDiscard +observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well observe.common.TargetLengthDto.count observe.common.TargetLengthDto.length @@ -213,6 +265,8 @@ observe.common.TdrDto.medianFishingDepth observe.common.TdrDto.minFishingDepth observe.common.TdrDto.section observe.common.TdrDto.sensorBrand +observe.common.TransmittingBuoyDto.transmittingBuoyOperation +observe.common.TransmittingBuoyDto.transmittingBuoyType observe.common.TripLonglineDto.activityLongline observe.common.TripLonglineDto.dataEntryOperator observe.common.TripLonglineDto.totalFishingOperationsNumber @@ -221,4 +275,19 @@ observe.common.TripSeineDto.dataEntryOperator observe.common.TripSeineDto.formsUrl observe.common.TripSeineDto.reportsUrl observe.common.TripSeineDto.route +observe.common.VesselDto.capacity +observe.common.VesselDto.changeDate +observe.common.VesselDto.flagCountry +observe.common.VesselDto.length +observe.common.VesselDto.power +observe.common.VesselDto.searchMaximum +observe.common.VesselDto.shipOwner +observe.common.VesselDto.vesselSizeCategory +observe.common.VesselDto.vesselType +observe.common.VesselDto.yearService +observe.common.VesselSizeCategoryDto.capacityLabel +observe.common.VesselSizeCategoryDto.gaugeLabel +observe.common.WeightMeasureDto.weight +observe.common.WindDto.speedRange +observe.common.WindDto.waveHeight observe.common.WithFormula.coefficients View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3da342a502ee299212b7441c5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3da342a502ee299212b7441c5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Possibilité de décider, lors de la mise à jour d'une référence, des champs que...
by Tony CHEMIT 23 Mar '20

23 Mar '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: af09ead3 by tchemit at 2020-03-23T11:13:01+01:00 Possibilité de décider, lors de la mise à jour d'une référence, des champs que l'on veut voir pris en compte dans la synchronisation - Closes #1329 - final Part (on v8) - - - - - 30 changed files: - client-core/src/main/resources/observe-ui.properties - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Apply.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Apply.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterCopyTask.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterCopyTaskLeft.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterCopyTaskRight.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterDeactivateAndReplaceTaskLeft.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterDeactivateAndReplaceTaskRight.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterDeactivateTask.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterDeactivateTaskLeft.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterDeactivateTaskRight.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterDeleteTaskRight.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterRevertTaskRight.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterSkipTaskLeft.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterSkipTaskRight.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterTasksActionSupport.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterUpdateTask.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Start.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/ReferentialSynchronizeTask.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeTaskListCellRenderer.java → client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/ReferentialSynchronizeTaskListCellRenderer.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java → client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/ReferentialSynchronizeTaskListModel.java - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/af09ead3231a161103594c42d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/af09ead3231a161103594c42d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog [skip ci]
by Tony CHEMIT 20 Mar '20

20 Mar '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9095d551 by tchemit at 2020-03-20T19:01:03+01:00 update changelog [skip ci] - - - - - 30 changed files: - .gitignore - − .mvn/gitlab-cache/milestones/1005038-artifacts.json - − .mvn/gitlab-cache/milestones/1005038-issues.json - − .mvn/gitlab-cache/milestones/1005038.json - − .mvn/gitlab-cache/milestones/1005048-artifacts.json - − .mvn/gitlab-cache/milestones/1005048-issues.json - − .mvn/gitlab-cache/milestones/1005048.json - − .mvn/gitlab-cache/milestones/1110720-artifacts.json - − .mvn/gitlab-cache/milestones/1110720-issues.json - − .mvn/gitlab-cache/milestones/1110720.json - − .mvn/gitlab-cache/milestones/1115633-artifacts.json - − .mvn/gitlab-cache/milestones/1115633-issues.json - − .mvn/gitlab-cache/milestones/1115633.json - − .mvn/gitlab-cache/milestones/1117003-artifacts.json - − .mvn/gitlab-cache/milestones/1117003-issues.json - − .mvn/gitlab-cache/milestones/1117003.json - − .mvn/gitlab-cache/milestones/1117288-artifacts.json - − .mvn/gitlab-cache/milestones/1117288-issues.json - − .mvn/gitlab-cache/milestones/1117288.json - − .mvn/gitlab-cache/milestones/1136007-artifacts.json - − .mvn/gitlab-cache/milestones/1136007-issues.json - − .mvn/gitlab-cache/milestones/1136007.json - − .mvn/gitlab-cache/milestones/268594-artifacts.json - − .mvn/gitlab-cache/milestones/268594-issues.json - − .mvn/gitlab-cache/milestones/268594.json - − .mvn/gitlab-cache/milestones/268595-artifacts.json - − .mvn/gitlab-cache/milestones/268595-issues.json - − .mvn/gitlab-cache/milestones/268595.json - − .mvn/gitlab-cache/milestones/268596-artifacts.json - − .mvn/gitlab-cache/milestones/268596-issues.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9095d551d586a4ab73c601d18… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9095d551d586a4ab73c601d18… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Possibilité de décider, lors de la mise à jour d'une référence, des champs que...
by Tony CHEMIT 20 Mar '20

20 Mar '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a3dedfaa by tchemit at 2020-03-20T19:28:13+01:00 Possibilité de décider, lors de la mise à jour d'une référence, des champs que l'on veut voir pris en compte dans la synchronisation - Closes #1329 - Final part - - - - - 8091c2b7 by tchemit at 2020-03-20T19:28:13+01:00 update pom and toolkit - - - - - d16f2023 by tchemit at 2020-03-20T19:28:13+01:00 [PS OBSERVATIONS] Sur le formulaire Objet/Balises ajouter un champ "bateau propriétaire" - Closes #1455 - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/ApplyAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterDeactivateTaskAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTask.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListCellRenderer.java → client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskListCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java → client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskListModel.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java → client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/SwingReferentialSynchronizeTask.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java → client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/SwingWithIncludedPropertyNamesTask.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/DeactivateReferentialSynchronizeTask.java → client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/SwingWithReplaceDataTask.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/task/WithIncludedPropertyNamesTask.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTree.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTreePane.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTreePaneHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4788641c766ebebdab995e4f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4788641c766ebebdab995e4f… You're receiving this email because of your account on gitlab.com.

1 0