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

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT 08 Feb '19

08 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d3be1e9d by tchemit at 2019-02-08T13:37:47Z update changelog - - - - - 6 changed files: - .mvn/gitlab-cache/milestones/750347-issues.json - .mvn/gitlab-cache/milestones/750347.json - + .mvn/gitlab-cache/milestones/782632-artifacts.json - + .mvn/gitlab-cache/milestones/782632-issues.json - + .mvn/gitlab-cache/milestones/782632.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/750347-issues.json ===================================== @@ -7,7 +7,8 @@ "description": "J\u0027ai à migrer une vieille base centrale de l\u0027IEO, v3 vers v7.\n\nLa migration s\u0027arrête car elle ne trouve pas un script :\n```\nCan\u0027t find script /db/migration/3.5/01_migration-PG.sql, nor his common version.\n```\n\nLog client (migration tentée avec le client) : [observe-7.0.1.log](/uploads/84f45a6abc0c4472d41a0b2a98b608d8/observe-7.0.1.log)\n\nSi jamais il était possible de corriger ceci très rapidement, ceci me permettrait d\u0027assurer cette migration auprès de l\u0027IEO.", "labels": [ "Anomalie", - "Immédiat" + "Immédiat", + "À facturer" ], "milestone": { "id": 750347, @@ -16,6 +17,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, @@ -44,7 +46,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, "state": "closed", - "updatedAt": "Feb 1, 2019 6:57:08 PM", + "updatedAt": "Feb 5, 2019 12:51:15 PM", "createdAt": "Jan 30, 2019 7:08:06 PM" }, { @@ -64,6 +66,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, @@ -113,6 +116,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, @@ -162,6 +166,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, @@ -190,7 +195,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/0d688d854bbc8b3a3a7f97f6730ac563?s\u003d…" }, "state": "closed", - "updatedAt": "Jan 28, 2019 4:19:45 PM", + "updatedAt": "Feb 7, 2019 11:30:12 AM", "createdAt": "Jan 24, 2019 2:30:08 PM" }, { @@ -211,6 +216,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, @@ -260,6 +266,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, @@ -308,6 +315,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, @@ -356,6 +364,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, @@ -384,56 +393,9 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/0d688d854bbc8b3a3a7f97f6730ac563?s\u003d…" }, "state": "closed", - "updatedAt": "Feb 3, 2019 3:47:02 PM", + "updatedAt": "Feb 4, 2019 1:49:38 PM", "createdAt": "Jan 29, 2019 1:57:21 PM" }, - { - "id": 17720198, - "iid": 1202, - "projectId": 2722779, - "title": "[UI] Listes déroulantes : ergonomie", - "description": "Une amélioration avait a priori été réalisée sur les listes déroulantes avec autocompletion : que lorsque, par autocompletion, une seule entrée correspondante est trouvée, il soit possible de la sélectionner avec un simple TAB.\n\nOr actuellement, à nouveau (?), il faut nécessairement la sélectionner avec flêche basse, après quoi on peut faire TAB :\n\n![image](/uploads/ba40e3bcd81883430999313d7b33d8e2/image.png)\n\nL\u0027IEO tient à ce détail d\u0027ergonomie qui accélère pas mal la saisie.", - "labels": [ - "Anomalie" - ], - "milestone": { - "id": 750347, - "iid": 132, - "projectId": 2722779, - "groupId": 0, - "title": "7.0.2", - "description": "", - "startDate": "Jan 3, 2019 1:00:00 AM", - "state": "closed" - }, - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_darkScheme": false, - "_isAdmin": false, - "_canCreateGroup": false, - "_canCreateProject": false, - "_canCreateTeam": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_darkScheme": false, - "_isAdmin": false, - "_canCreateGroup": false, - "_canCreateProject": false, - "_canCreateTeam": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "state": "closed", - "updatedAt": "Feb 3, 2019 3:57:01 PM", - "createdAt": "Jan 28, 2019 11:39:00 AM" - }, { "id": 17290869, "iid": 1197, @@ -451,6 +413,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, @@ -498,6 +461,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, @@ -534,6 +498,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" }, ===================================== .mvn/gitlab-cache/milestones/750347.json ===================================== @@ -5,6 +5,7 @@ "groupId": 0, "title": "7.0.2", "description": "", + "dueDate": "Feb 6, 2019 1:00:00 AM", "startDate": "Jan 3, 2019 1:00:00 AM", "state": "closed" } \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/782632-artifacts.json ===================================== @@ -0,0 +1,12 @@ +[ + { + "name": "Application", + "filename": "observe-7.0.3.zip", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.0.3/observe-7.0.3.zip" + }, + { + "name": "Serveur", + "filename": "observe-7.0.3.war", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.0.3/observe-7.0.3.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/782632-issues.json ===================================== @@ -0,0 +1,202 @@ +[ + { + "id": 18042436, + "iid": 1218, + "projectId": 2722779, + "title": "Perte des tooltips sur les données calculées", + "description": "", + "labels": [ + "Anomalie", + "Contrat AZTI-2017", + "Immédiat" + ], + "milestone": { + "id": 782632, + "iid": 134, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.3", + "description": "", + "dueDate": "Feb 8, 2019 1:00:00 AM", + "startDate": "Feb 6, 2019 1:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Feb 7, 2019 3:50:54 PM", + "createdAt": "Feb 7, 2019 2:06:51 PM" + }, + { + "id": 18013213, + "iid": 1217, + "projectId": 2722779, + "title": "Problème avec le calcul sur certaines marées 2", + "description": "Un autre problème de calcul se produit avec les marées du programme PS DCF Senne (IRD) :\n\n```\nERROR 2019-02-06T17:21:52,841 [ajp-nio-8009-exec-130] ObserveServiceFactoryLocal$ObserveServiceInvocationHandler : 245 - Error in method consolidateTripSeine\norg.nuiton.topia.persistence.TopiaQueryException: unable to find page startIndex\u003d0, endIndex\u003d1\n```\n\n```\nCaused by: org.hibernate.AssertionFailure: bug adding collection twice\n```\n\nLog (l 126) : [observeweb-7.0.2-2.log](/uploads/3352395f2ed5091bbe32b56fdb640d1c/observeweb-7.0.2-2.log)\n\nEst-ce en lien avec #1216 ?", + "labels": [ + "Anomalie", + "Contrat AZTI-2017", + "Contrat Code Lutin-2016", + "Haut" + ], + "milestone": { + "id": 782632, + "iid": 134, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.3", + "description": "", + "dueDate": "Feb 8, 2019 1:00:00 AM", + "startDate": "Feb 6, 2019 1:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Feb 8, 2019 2:27:13 PM", + "createdAt": "Feb 6, 2019 5:41:58 PM" + }, + { + "id": 18011848, + "iid": 1216, + "projectId": 2722779, + "title": "Problème avec le calcul sur certaines marées", + "description": "Un nouveau problème survient lorsque l\u0027on traite certaines marées.\n\nSur des marées du programme PS DCF Senne AZTI (20) :\n\n```\nCaused by: org.hibernate.HibernateException: Found two representations of same collection: fr.ird.observe.entities.seine.TargetSampleImpl.targetLength\n```\n\nVoici le log (l2486) : [observeweb-7.0.2.log](/uploads/0c3d37f0fdec87c38725c826bc352f1d/observeweb-7.0.2.log)\n\nUn exemplaire des données est fourni par email pour pouvoir reproduire les cas.", + "labels": [ + "Anomalie", + "Contrat AZTI-2017", + "Haut" + ], + "milestone": { + "id": 782632, + "iid": 134, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.3", + "description": "", + "dueDate": "Feb 8, 2019 1:00:00 AM", + "startDate": "Feb 6, 2019 1:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Feb 8, 2019 2:27:35 PM", + "createdAt": "Feb 6, 2019 5:14:08 PM" + }, + { + "id": 18008181, + "iid": 1214, + "projectId": 2722779, + "title": "[UI] Le slider pourrait défiler de façon automatique", + "description": "Dans les assistants qui font appel à ce type d\u0027affichage pour les messages :\n\n![image](/uploads/a27522f57d1e2bf6ad01caf6bb259aae/image.png)\n\nLa fenêtre et l\u0027ascenseur pourraient défiler automatiquement avec l\u0027apparition de nouveau texte, de sorte à afficher par défaut les dernières lignes apparues, sans avoir à scroller.", + "labels": [ + "Bas", + "Evolution" + ], + "milestone": { + "id": 782632, + "iid": 134, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.3", + "description": "", + "dueDate": "Feb 8, 2019 1:00:00 AM", + "startDate": "Feb 6, 2019 1:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Feb 8, 2019 2:32:08 PM", + "createdAt": "Feb 6, 2019 3:03:24 PM" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/782632.json ===================================== @@ -0,0 +1,11 @@ +{ + "id": 782632, + "iid": 134, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.3", + "description": "", + "dueDate": "Feb 8, 2019 1:00:00 AM", + "startDate": "Feb 6, 2019 1:00:00 AM", + "state": "closed" +} \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-02-06 12:11. + * Last generated at 2019-02-08 14:37. ## Version [8.0-alpha-4](https://gitlab.com/ultreiaio/ird-observe/milestones/115) Seconde partie du troisième lot du contrat IRD-2018-01-V8.
contient fonctionnalités avancées. @@ -113,9 +113,23 @@ Premier lot du contrat IRD-2018-01-V8 * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [7.0.3](https://gitlab.com/ultreiaio/ird-observe/milestones/134) + +**Closed at 2019-02-08.** + +### Download +* [Application (observe-7.0.3.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) +* [Serveur (observe-7.0.3.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) + +### Issues + * [[Anomalie 1216]](https://gitlab.com/ultreiaio/ird-observe/issues/1216) **Problème avec le calcul sur certaines marées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1217]](https://gitlab.com/ultreiaio/ird-observe/issues/1217) **Problème avec le calcul sur certaines marées 2** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1218]](https://gitlab.com/ultreiaio/ird-observe/issues/1218) **Perte des tooltips sur les données calculées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1214]](https://gitlab.com/ultreiaio/ird-observe/issues/1214) **[UI] Le slider pourrait défiler de façon automatique** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [7.0.2](https://gitlab.com/ultreiaio/ird-observe/milestones/132) -**Closed at *2019-02-06*.** +**Closed at 2019-02-06.** ### Download * [Application (observe-7.0.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) @@ -127,7 +141,6 @@ Premier lot du contrat IRD-2018-01-V8 * [[Anomalie 1196]](https://gitlab.com/ultreiaio/ird-observe/issues/1196) **Tentative d'ouverture d'une base avec des droits "référentiel" échoue** (Thanks to ) (Reported by Pascal Cauquil) * [[Anomalie 1197]](https://gitlab.com/ultreiaio/ird-observe/issues/1197) **Impossible de voir les utilisations de référentiel si connecté en mode referentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 1201]](https://gitlab.com/ultreiaio/ird-observe/issues/1201) **[PS] bug calcul des données** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) - * [[Anomalie 1202]](https://gitlab.com/ultreiaio/ird-observe/issues/1202) **[UI] Listes déroulantes : ergonomie** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Anomalie 1205]](https://gitlab.com/ultreiaio/ird-observe/issues/1205) **Bases v5 qu'on ne peut pas ouvrir avec la v7** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Anomalie 1206]](https://gitlab.com/ultreiaio/ird-observe/issues/1206) **Bug observe connexion via webservice** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) * [[Anomalie 1209]](https://gitlab.com/ultreiaio/ird-observe/issues/1209) **La migration v3 vers v7 ne passe pas (fichier mal localisé)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d3be1e9da4e3ac75f3d5e8e4738… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d3be1e9da4e3ac75f3d5e8e4738… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: [UI] Le slider pourrait défiler de façon automatique - Closes #1214
by Tony CHEMIT 08 Feb '19

08 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f1462357 by tchemit at 2019-02-08T13:28:49Z [UI] Le slider pourrait défiler de façon automatique - Closes #1214 - - - - - b5be4b9a by tchemit at 2019-02-08T13:29:47Z [UI] Listes déroulantes : ergonomie - See #1202 - - - - - 6d287a7c by tchemit at 2019-02-08T13:31:59Z Improve boot loading - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java ===================================== @@ -53,7 +53,10 @@ import javax.script.ScriptException; import javax.swing.UIManager; import java.io.File; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Arrays; +import java.util.Comparator; import java.util.Date; import java.util.Locale; import java.util.Properties; @@ -121,47 +124,29 @@ public abstract class ObserveRunner extends ApplicationRunner { I18n.close(); - File i18nDirectory = config.getI18nDirectory(); + Path i18nDirectory = config.getI18nDirectory().toPath(); - UserI18nBootLoader i18nInitializer = new UserI18nBootLoader(i18nDirectory.toPath(), new DefaultI18nBootLoader(I18nConfiguration.createDefaultConfiguration())) { - -// @Override -// protected void createUserI18nLayout(Path directory, I18nLanguageProvider languageProvider) throws Exception { -// if (config.getI18nDefinitionFile().exists()) { -// return; -// } -// super.createUserI18nLayout(directory,languageProvider); -// -// // add also a archive with all i18n stuff (says i18n bundle + templates) -// -// URL resource = ObserveResourceManager.getResource(ObserveResourceManager.OBSERVE_I18N_ARCHIVE); -// File archive = new File(directory.getParent().toFile(), ObserveResourceManager.OBSERVE_I18N_ARCHIVE.substring(1)); -// try { -// resourceManager.copyResource(resource, archive, "Copy i18n archive"); -// ZipUtil.uncompressFiltred(archive, directory.getParent().toFile()); -// } finally { -// if (Files.exists(archive.toPath())) { -// try { -// Files.delete(archive.toPath()); -// } catch (IOException e) { -// log.error(String.format("Could not delete i18n archive %s", archive)); -// } -// } -// } -// -// } - }; + if (config.getBuildVersion().isSnapshot() && Files.exists(i18nDirectory)) { + // always regenerate i18n + try { + Files.walk(i18nDirectory) + .sorted(Comparator.reverseOrder()) + .map(Path::toFile) + .forEach(File::delete); + } catch (IOException e) { + throw new IllegalStateException("Can't delete i18n directory: "+i18nDirectory, e); + } + } + UserI18nBootLoader i18nInitializer = new UserI18nBootLoader(i18nDirectory, new DefaultI18nBootLoader(I18nConfiguration.createDefaultConfiguration())); long t00 = System.nanoTime(); Locale locale = config.getLocale(); I18n.init(i18nInitializer, locale); - if (log.isDebugEnabled()) { log.debug("i18n language : " + locale); log.debug("i18n loading time : " + StringUtil.convertTime(t00, System.nanoTime())); - } } public abstract String getRunnerName(); @@ -216,9 +201,7 @@ public abstract class ObserveRunner extends ApplicationRunner { @Override protected void onInit() throws Exception { - if (log.isInfoEnabled()) { - log.info(t("observe.runner.init", new Date(), Arrays.toString(args))); - } + log.info(t("observe.runner.init", new Date(), Arrays.toString(args))); long t0 = System.nanoTime(); @@ -226,30 +209,22 @@ public abstract class ObserveRunner extends ApplicationRunner { ClientConfig config = initConfig(); - if (log.isInfoEnabled()) { - log.info(t("observe.runner.config.loaded", config.getVersion())); - } + log.info(t("observe.runner.config.loaded", config.getVersion())); // 2 - preparation des répertoires utilisateurs initUserDirectories(config); // 3 - Chargement de la configuration des logs utilisateur - if (!config.isDevMode()) { - initLog(config); - } + initLog(config); - if (log.isInfoEnabled()) { - log.info(t("observe.runner.user.directories.loaded", config.getDataDirectory())); - } + log.info(t("observe.runner.user.directories.loaded", config.getDataDirectory())); // 3 - preparation i18n initI18n(config); - if (log.isInfoEnabled()) { - log.info(t("observe.runner.i18n.loaded", config.getLocale().getDisplayLanguage())); - } + log.info(t("observe.runner.i18n.loaded", config.getLocale().getDisplayLanguage())); // 4 - preparation de la configuration des ui @@ -265,9 +240,7 @@ public abstract class ObserveRunner extends ApplicationRunner { String time = StringUtil.convertTime(t0, System.nanoTime()); - if (log.isInfoEnabled()) { - log.info(t("observe.runner.context.loaded", time)); - } + log.info(t("observe.runner.context.loaded", time)); } private void initLog(ClientConfig config) throws IOException { @@ -285,9 +258,7 @@ public abstract class ObserveRunner extends ApplicationRunner { @Override protected void onStart() throws Exception { - if (log.isInfoEnabled()) { - log.info(t("observe.runner.start", new Date(), Arrays.toString(args))); - } + log.info(t("observe.runner.start", new Date(), Arrays.toString(args))); ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get(); @@ -302,9 +273,7 @@ public abstract class ObserveRunner extends ApplicationRunner { config.get().doAction(ClientConfig.Step.AfterInit.ordinal()); if (!config.isDisplayMainUI()) { - if (log.isInfoEnabled()) { - log.info(t("observe.runner.quit.withno.ui")); - } + log.info(t("observe.runner.quit.withno.ui")); unlock(); return; @@ -318,9 +287,7 @@ public abstract class ObserveRunner extends ApplicationRunner { ObserveMainUI ui = startUI(context, config); - if (log.isInfoEnabled()) { - log.info(t("observe.runner.ui.loaded")); - } + log.info(t("observe.runner.ui.loaded")); Boolean h2ServerMode = ObserveSwingApplicationContext.Entries.H2_SERVER_MODE.get(); @@ -355,18 +322,14 @@ public abstract class ObserveRunner extends ApplicationRunner { protected void onClose(boolean reload) { if (ObserveSwingApplicationContext.isInit()) { - if (log.isDebugEnabled()) { - log.debug("Will close context..."); - } + log.debug("Will close context..."); ObserveSwingApplicationContext.get().close(); } } @Override protected void onShutdown() { - if (log.isInfoEnabled()) { - log.info("ObServe shutdown at " + new Date()); - } + log.info("ObServe shutdown at " + new Date()); try { @@ -390,9 +353,7 @@ public abstract class ObserveRunner extends ApplicationRunner { @Override protected void onShutdown(Exception ex) { - if (log.isErrorEnabled()) { - log.error("error while closing " + ex.getMessage(), ex); - } + log.error("error while closing " + ex.getMessage(), ex); Runtime.getRuntime().halt(1); } @@ -422,9 +383,7 @@ public abstract class ObserveRunner extends ApplicationRunner { File dataDirectory = resourceManager.createDirectory(config, DATA_DIRECTORY); - if (log.isDebugEnabled()) { - log.debug("user data directory : " + dataDirectory); - } + log.debug("user data directory : " + dataDirectory); resourceManager.createParentDirectory(config, DB_DIRECTORY, INITIAL_DB_DUMP); @@ -443,9 +402,7 @@ public abstract class ObserveRunner extends ApplicationRunner { File resourcesDirectory = resourceManager.createDirectory(config, RESOURCES_DIRECTORY); - if (log.isDebugEnabled()) { - log.debug("user resource data directory : " + resourcesDirectory); - } + log.debug("user resource data directory : " + resourcesDirectory); // 5 - application ui @@ -502,18 +459,14 @@ public abstract class ObserveRunner extends ApplicationRunner { boolean hasLocalStorage = new File(config.getLocalDBDirectory(), ClientConfig.DB_NAME).exists(); config.setLocalStorageExist(hasLocalStorage); if (!hasLocalStorage) { - if (log.isInfoEnabled()) { - log.info(t("observe.init.no.local.db.detected", config.getLocalDBDirectory())); - } + log.info(t("observe.init.no.local.db.detected", config.getLocalDBDirectory())); } boolean hasInitialDb = config.getInitialDbDump().exists(); config.setInitialDumpExist(hasInitialDb); if (!hasInitialDb) { - if (log.isInfoEnabled()) { - log.info(t("observe.init.no.initial.dump.detected", config.getInitialDbDump())); - } + log.info(t("observe.init.no.initial.dump.detected", config.getInitialDbDump())); } } @@ -524,13 +477,9 @@ public abstract class ObserveRunner extends ApplicationRunner { UIHelper.initNimbusLoookAndFeel(); } catch (Exception e) { // could not find nimbus look-and-feel - if (log.isWarnEnabled()) { - log.warn(t("observe.warning.nimbus.landf")); - } + log.warn(t("observe.warning.nimbus.landf")); } catch (Throwable e) { - if (log.isWarnEnabled()) { - log.warn(t("observe.warning.no.ui")); - } + log.warn(t("observe.warning.no.ui")); // pas d'environnement d'ui config.setCanUseUI(false); } @@ -560,9 +509,7 @@ public abstract class ObserveRunner extends ApplicationRunner { } } - if (log.isInfoEnabled()) { - log.info(t("observe.runner.loading.ui.configuration", file)); - } + log.info(t("observe.runner.loading.ui.configuration", file)); try { Properties p = resourceManager.getResource(file); UIHelper.loadUIConfig(p); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -149,6 +149,7 @@ BeanComboBox { BeanFilterableComboBox { showReset:true; + tabToSelect:false; } NormalTextEditor { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java ===================================== @@ -55,6 +55,7 @@ import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; import org.nuiton.util.StringUtil; import javax.swing.JOptionPane; +import javax.swing.JTextArea; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Collection; @@ -193,7 +194,9 @@ public class AdminTabUIHandler<U extends AdminTabUI> { } public void addMessage(AdminStep step, String text) { - ui.getProgression().append(text + "\n"); + JTextArea progression = ui.getProgression(); + progression.append(text + "\n"); + progression.setCaretPosition(progression.getDocument().getLength()); } protected void logExportResult(String i18nKey, View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d45205f044cbd237601b733b48… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d45205f044cbd237601b733b48… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Improve boot loading
by Tony CHEMIT 08 Feb '19

08 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9ef87e5a by tchemit at 2019-02-08T13:07:00Z Improve boot loading - - - - - 27174660 by tchemit at 2019-02-08T13:26:45Z [UI] Listes déroulantes : ergonomie - See #1202 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java ===================================== @@ -53,7 +53,10 @@ import javax.script.ScriptException; import javax.swing.UIManager; import java.io.File; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Arrays; +import java.util.Comparator; import java.util.Date; import java.util.Locale; import java.util.Properties; @@ -121,47 +124,29 @@ public abstract class ObserveRunner extends ApplicationRunner { I18n.close(); - File i18nDirectory = config.getI18nDirectory(); + Path i18nDirectory = config.getI18nDirectory().toPath(); - UserI18nBootLoader i18nInitializer = new UserI18nBootLoader(i18nDirectory.toPath(), new DefaultI18nBootLoader(I18nConfiguration.createDefaultConfiguration())) { -// -// @Override -// protected void createUserI18nLayout(File directory) throws Exception { -// if (config.getI18nDefinitionFile().exists()) { -// return; -// } -// super.createUserI18nLayout(directory); -// -// // add also a archive with all i18n stupuff (says i18n bundle + templates) -// -// URL resource = ObserveResourceManager.getResource(ObserveResourceManager.OBSERVE_I18N_ARCHIVE); -// File archive = new File(directory.getParent(), ObserveResourceManager.OBSERVE_I18N_ARCHIVE.substring(1)); -// try { -// resourceManager.copyResource(resource, archive, "Copy i18n archive"); -// ZipUtil.uncompressFiltred(archive, directory.getParentFile()); -// } finally { -// if (Files.exists(archive.toPath())) { -// try { -// Files.delete(archive.toPath()); -// } catch (IOException e) { -// log.error(String.format("Could not delete i18n archive %s", archive)); -// } -// } -// } -// -// } - }; + if (config.getBuildVersion().isSnapshot() && Files.exists(i18nDirectory)) { + // always regenerate i18n + try { + Files.walk(i18nDirectory) + .sorted(Comparator.reverseOrder()) + .map(Path::toFile) + .forEach(File::delete); + } catch (IOException e) { + throw new IllegalStateException("Can't delete i18n directory: "+i18nDirectory, e); + } + } + UserI18nBootLoader i18nInitializer = new UserI18nBootLoader(i18nDirectory, new DefaultI18nBootLoader(I18nConfiguration.createDefaultConfiguration())); long t00 = System.nanoTime(); Locale locale = config.getLocale(); I18n.init(i18nInitializer, locale); - if (log.isDebugEnabled()) { log.debug("i18n language : " + locale); log.debug("i18n loading time : " + StringUtil.convertTime(t00, System.nanoTime())); - } } public abstract String getRunnerName(); @@ -217,9 +202,7 @@ public abstract class ObserveRunner extends ApplicationRunner { @Override protected void onInit() throws Exception { - if (log.isInfoEnabled()) { - log.info(t("observe.runner.init", new Date(), Arrays.toString(args))); - } + log.info(t("observe.runner.init", new Date(), Arrays.toString(args))); long t0 = System.nanoTime(); @@ -227,30 +210,22 @@ public abstract class ObserveRunner extends ApplicationRunner { ClientConfig config = initConfig(); - if (log.isInfoEnabled()) { - log.info(t("observe.runner.config.loaded", config.getVersion())); - } + log.info(t("observe.runner.config.loaded", config.getVersion())); // 2 - preparation des répertoires utilisateurs initUserDirectories(config); // 3 - Chargement de la configuration des logs utilisateur - if (!config.isDevMode()) { - initLog(config); - } + initLog(config); - if (log.isInfoEnabled()) { - log.info(t("observe.runner.user.directories.loaded", config.getDataDirectory())); - } + log.info(t("observe.runner.user.directories.loaded", config.getDataDirectory())); // 3 - preparation i18n initI18n(config); - if (log.isInfoEnabled()) { - log.info(t("observe.runner.i18n.loaded", config.getLocale().getDisplayLanguage())); - } + log.info(t("observe.runner.i18n.loaded", config.getLocale().getDisplayLanguage())); // 4 - preparation de la configuration des ui @@ -266,9 +241,7 @@ public abstract class ObserveRunner extends ApplicationRunner { String time = StringUtil.convertTime(t0, System.nanoTime()); - if (log.isInfoEnabled()) { - log.info(t("observe.runner.context.loaded", time)); - } + log.info(t("observe.runner.context.loaded", time)); } private void initLog(ClientConfig config) throws IOException { @@ -287,9 +260,7 @@ public abstract class ObserveRunner extends ApplicationRunner { @Override protected void onStart() throws Exception { - if (log.isInfoEnabled()) { - log.info(t("observe.runner.start", new Date(), Arrays.toString(args))); - } + log.info(t("observe.runner.start", new Date(), Arrays.toString(args))); ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get(); @@ -304,9 +275,7 @@ public abstract class ObserveRunner extends ApplicationRunner { config.get().doAction(ClientConfig.Step.AfterInit.ordinal()); if (!config.isDisplayMainUI()) { - if (log.isInfoEnabled()) { - log.info(t("observe.runner.quit.withno.ui")); - } + log.info(t("observe.runner.quit.withno.ui")); unlock(); return; @@ -320,9 +289,7 @@ public abstract class ObserveRunner extends ApplicationRunner { ObserveMainUI ui = startUI(context, config); - if (log.isInfoEnabled()) { - log.info(t("observe.runner.ui.loaded")); - } + log.info(t("observe.runner.ui.loaded")); Boolean h2ServerMode = ObserveSwingApplicationContext.Entries.H2_SERVER_MODE.get(); @@ -357,18 +324,14 @@ public abstract class ObserveRunner extends ApplicationRunner { protected void onClose(boolean reload) { if (ObserveSwingApplicationContext.isInit()) { - if (log.isDebugEnabled()) { - log.debug("Will close context..."); - } + log.debug("Will close context..."); ObserveSwingApplicationContext.get().close(); } } @Override protected void onShutdown() { - if (log.isInfoEnabled()) { - log.info("ObServe shutdown at " + new Date()); - } + log.info("ObServe shutdown at " + new Date()); try { @@ -392,9 +355,7 @@ public abstract class ObserveRunner extends ApplicationRunner { @Override protected void onShutdown(Exception ex) { - if (log.isErrorEnabled()) { - log.error("error while closing " + ex.getMessage(), ex); - } + log.error("error while closing " + ex.getMessage(), ex); Runtime.getRuntime().halt(1); } @@ -424,9 +385,7 @@ public abstract class ObserveRunner extends ApplicationRunner { File dataDirectory = resourceManager.createDirectory(config, DATA_DIRECTORY); - if (log.isDebugEnabled()) { - log.debug("user data directory : " + dataDirectory); - } + log.debug("user data directory : " + dataDirectory); resourceManager.createParentDirectory(config, DB_DIRECTORY, INITIAL_DB_DUMP); @@ -445,9 +404,7 @@ public abstract class ObserveRunner extends ApplicationRunner { File resourcesDirectory = resourceManager.createDirectory(config, RESOURCES_DIRECTORY); - if (log.isDebugEnabled()) { - log.debug("user resource data directory : " + resourcesDirectory); - } + log.debug("user resource data directory : " + resourcesDirectory); // 5 - application ui @@ -504,18 +461,14 @@ public abstract class ObserveRunner extends ApplicationRunner { boolean hasLocalStorage = new File(config.getLocalDBDirectory(), ClientConfig.DB_NAME).exists(); config.setLocalStorageExist(hasLocalStorage); if (!hasLocalStorage) { - if (log.isInfoEnabled()) { - log.info(t("observe.init.no.local.db.detected", config.getLocalDBDirectory())); - } + log.info(t("observe.init.no.local.db.detected", config.getLocalDBDirectory())); } boolean hasInitialDb = config.getInitialDbDump().exists(); config.setInitialDumpExist(hasInitialDb); if (!hasInitialDb) { - if (log.isInfoEnabled()) { - log.info(t("observe.init.no.initial.dump.detected", config.getInitialDbDump())); - } + log.info(t("observe.init.no.initial.dump.detected", config.getInitialDbDump())); } } @@ -526,13 +479,9 @@ public abstract class ObserveRunner extends ApplicationRunner { UIHelper.initNimbusLoookAndFeel(); } catch (Exception e) { // could not find nimbus look-and-feel - if (log.isWarnEnabled()) { - log.warn(t("observe.warning.nimbus.landf")); - } + log.warn(t("observe.warning.nimbus.landf")); } catch (Throwable e) { - if (log.isWarnEnabled()) { - log.warn(t("observe.warning.no.ui")); - } + log.warn(t("observe.warning.no.ui")); // pas d'environnement d'ui config.setCanUseUI(false); } @@ -562,9 +511,7 @@ public abstract class ObserveRunner extends ApplicationRunner { } } - if (log.isInfoEnabled()) { - log.info(t("observe.runner.loading.ui.configuration", file)); - } + log.info(t("observe.runner.loading.ui.configuration", file)); try { Properties p = resourceManager.getResource(file); UIHelper.loadUIConfig(p); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -81,6 +81,7 @@ BeanComboBox { BeanFilterableComboBox { showReset:true; + tabToSelect:false; } BlockingLayerUI { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7e31647e36413a6b008d00bab0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7e31647e36413a6b008d00bab0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Perte des tooltips sur les données calculées - Closes #1218
by Tony CHEMIT 07 Feb '19

07 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 81376acd by tchemit at 2019-02-07T14:49:45Z Perte des tooltips sur les données calculées - Closes #1218 - - - - - 37246ad7 by tchemit at 2019-02-07T14:49:47Z update pom - - - - - 7e31647e by tchemit at 2019-02-07T14:49:47Z [UI] Le slider pourrait défiler de façon automatique - Closes #1214 - - - - - 12 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java - 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 Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -502,6 +502,10 @@ observe.common.RouteDto.message.no.active.found observe.common.RouteDto.message.no.active.found.for.other.trip observe.common.RouteDto.message.not.open observe.common.RouteDto.message.updating +observe.common.Sample.length.computed.tip +observe.common.Sample.length.observed.tip +observe.common.Sample.weight.computed.tip +observe.common.Sample.weight.observed.tip observe.common.SchoolEstimateDto.table.meanWeight observe.common.SchoolEstimateDto.table.meanWeight.tip observe.common.SchoolEstimateDto.table.speciesThon ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java ===================================== @@ -55,6 +55,7 @@ import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; import org.nuiton.util.StringUtil; import javax.swing.JOptionPane; +import javax.swing.JTextArea; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Collection; @@ -192,7 +193,9 @@ public class AdminTabUIHandler<U extends AdminTabUI> { } public void addMessage(AdminStep step, String text) { - ui.getProgression().append(text + "\n"); + JTextArea progression = ui.getProgression(); + progression.append(text + "\n"); + progression.setCaretPosition(progression.getDocument().getLength()); } protected void logExportResult(String i18nKey, ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java ===================================== @@ -32,13 +32,15 @@ import fr.ird.observe.dto.data.seine.NonTargetLengthDto; import fr.ird.observe.dto.data.seine.TargetLengthDto; import fr.ird.observe.dto.referential.SizeMeasureTypeReference; import fr.ird.observe.dto.referential.SpeciesReference; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.beans.PropertyChangeListener; import java.util.List; import java.util.Optional; +import static io.ultreia.java4all.i18n.I18n.n; + /** * Created on 31/10/16. * @@ -47,6 +49,11 @@ import java.util.Optional; */ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, U extends ContentTableUI<E, D, U>> extends ContentTableUIHandler<E, D, U> { + public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); + public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); + public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); + public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); + protected final Logger log = LogManager.getLogger(getClass()); /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx ===================================== @@ -83,22 +83,14 @@ <script><![CDATA[ -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + return computed ? t(NonTargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(NonTargetSampleUIHandler.POIDS_OBSERVED_TIP); } public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + return computed ? t(NonTargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(NonTargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } -public String getSpeciesFauneTypeTaille(SpeciesReference species) { - return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId(); -} ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jcss ===================================== @@ -40,16 +40,6 @@ _resetTablePropertyName:{NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES}; } -#speciesTypeTailleLabel { - actionIcon:"information"; - text:"observe.common.lengthMeasureType"; -} - -#speciesTypeTaille { - font-weight:"bold"; - text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; -} - #comment { model:{getBean()}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx ===================================== @@ -79,20 +79,15 @@ <script><![CDATA[ -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - @Override public abstract TargetSampleUIHandler getHandler(); public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + return computed ? t(TargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(TargetSampleUIHandler.POIDS_OBSERVED_TIP); } public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + return computed ? t(TargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(TargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx ===================================== @@ -64,13 +64,7 @@ protected void setDescriptionText(String text) { } protected String getProgressString(int currentStep, int nbStep) { - StorageStep step = getStep(); - String txt = ""; - if (step != null) { - txt = n("observe.storage.step.label"); - txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step)); - } - return txt; + return StorageTabUIHandler.getProgressString(currentStep, nbStep, getStep()); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java ===================================== @@ -23,12 +23,15 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveTextGenerator; +import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.storage.StorageUIModel; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import org.nuiton.jaxx.runtime.JAXXObject; import javax.swing.JLabel; +import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; /** @@ -80,4 +83,12 @@ public class StorageTabUIHandler<U extends JAXXObject> { this.ui = ui; } + protected static String getProgressString(int currentStep, int nbStep,StorageStep step) { + String txt = ""; + if (step != null) { + txt = n("observe.storage.step.label"); + txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step)); + } + return txt; + } } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Routes observe.common.RouteDto.type=Route observe.common.RouteDto.types=Routes 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 observe.common.Sample.weight=Individual weight (kg) +observe.common.Sample.weight.computed.tip=Weight was computed (%s) +observe.common.Sample.weight.observed.tip=Weight was observed observe.common.SchoolEstimateDto.action.create=Insert this estimate observe.common.SchoolEstimateDto.action.create.tip=Insert this estimate observe.common.SchoolEstimateDto.meanWeight=Mean weight ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Rutas observe.common.RouteDto.type=Ruta observe.common.RouteDto.types=Rutas 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 observe.common.Sample.weight=Peso del ejemplar (en Kg) +observe.common.Sample.weight.computed.tip=Peso calculado +observe.common.Sample.weight.observed.tip=Peso observado observe.common.SchoolEstimateDto.action.create=Insertar la estimación observe.common.SchoolEstimateDto.action.create.tip=Insertar la nueva estimación en la tabla observe.common.SchoolEstimateDto.meanWeight=Peso medio (en Kg) ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Routes observe.common.RouteDto.type=Route observe.common.RouteDto.types=Routes 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 observe.common.Sample.weight=Poids ind. (en Kg) +observe.common.Sample.weight.computed.tip=Le poids a été calculé +observe.common.Sample.weight.observed.tip=Le poids a été observé observe.common.SchoolEstimateDto.action.create=Insérer cette estimation observe.common.SchoolEstimateDto.action.create.tip=Insérer la nouvelle estimation dans la table observe.common.SchoolEstimateDto.meanWeight=Poids moyen (en Kg) ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.7</version> + <version>2019.8.8</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6bc4e3f71de42c02909090004d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6bc4e3f71de42c02909090004d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Perte des tooltips sur les données calculées - Closes #1218
by Tony CHEMIT 07 Feb '19

07 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bb83f34b by tchemit at 2019-02-07T14:17:05Z Perte des tooltips sur les données calculées - Closes #1218 - - - - - adb5f394 by tchemit at 2019-02-07T14:17:08Z Problème avec le calcul sur certaines marées 2 - See #1217 - - - - - d45205f0 by tchemit at 2019-02-07T14:17:08Z update pom - - - - - 13 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/AbstractSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java - 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 - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidationActivitySeineDataContext.java Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -619,6 +619,10 @@ observe.common.RouteDto.choice.create.fin.veille.activity observe.common.RouteDto.choice.not.create.fin.veille.activity.and.continue observe.common.RouteDto.message.need.fin.veille.activity observe.common.RouteDto.message.not.open +observe.common.Sample.length.computed.tip +observe.common.Sample.length.observed.tip +observe.common.Sample.weight.computed.tip +observe.common.Sample.weight.observed.tip observe.common.SamplePartLogbookDto.table.count observe.common.SamplePartLogbookDto.table.count.tip observe.common.SamplePartLogbookDto.table.length ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java ===================================== @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,7 +14,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -109,11 +109,11 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple String tripSeineLabel = result.getTripSeineLabel(); - sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel)); + sendMessage(t("observe.actions.consolidate.message.trip", result.getTripSeineId(), tripSeineLabel)); for (ConsolidateActivitySeineDataResult activitySeineDataResult : result.getConsolidateActivitySeineDataResults()) { - sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel())); + sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineId(), activitySeineDataResult.getActivitySeineLabel())); } resultsBuilder.add(result); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/AbstractSampleUIHandler.java ===================================== @@ -38,6 +38,8 @@ import java.beans.PropertyChangeListener; import java.util.List; import java.util.Optional; +import static io.ultreia.java4all.i18n.I18n.n; + /** * Created on 31/10/16. * @@ -46,6 +48,12 @@ import java.util.Optional; */ public abstract class AbstractSampleUIHandler<E extends DataDto, D extends DataDto, U extends ContentTableUI<E, D, U>> extends ContentTableUIHandler<E, D, U> { + public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); + public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); + public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); + public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); + public static final String NO_SPECIES_SELECTED = n("observe.message.no.species.selected"); + protected final Logger log = LogManager.getLogger(getClass()); /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jaxx ===================================== @@ -82,21 +82,16 @@ <script><![CDATA[ -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + return computed ? t(NonTargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(NonTargetSampleUIHandler.POIDS_OBSERVED_TIP); } public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + return computed ? t(NonTargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(NonTargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } public String getSpeciesFauneTypeTaille(SpeciesReference species) { - return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId(); + return species == null ? t(NonTargetSampleUIHandler.NO_SPECIES_SELECTED) : species.getSizeMeasureTypeId(); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleUI.jaxx ===================================== @@ -79,20 +79,15 @@ <script><![CDATA[ -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - @Override public abstract TargetSampleUIHandler getHandler(); public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + return computed ? t(TargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(TargetSampleUIHandler.POIDS_OBSERVED_TIP); } public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + return computed ? t(TargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(TargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx ===================================== @@ -64,13 +64,7 @@ protected void setDescriptionText(String text) { } protected String getProgressString(int currentStep, int nbStep) { - StorageStep step = getStep(); - String txt = ""; - if (step != null) { - txt = n("observe.storage.step.label"); - txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step)); - } - return txt; + return StorageTabUIHandler.getProgressString(currentStep, nbStep, getStep()); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java ===================================== @@ -23,12 +23,15 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveTextGenerator; +import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.storage.StorageUIModel; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import org.nuiton.jaxx.runtime.JAXXObject; import javax.swing.JLabel; +import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; /** @@ -80,4 +83,12 @@ public class StorageTabUIHandler<U extends JAXXObject> { this.ui = ui; } + protected static String getProgressString(int currentStep, int nbStep,StorageStep step) { + String txt = ""; + if (step != null) { + txt = n("observe.storage.step.label"); + txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step)); + } + return txt; + } } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -161,11 +161,11 @@ observe.action.translate.tip=Translate application observe.action.validate.config.generateReport=Generate validation report observe.actions.consolidate=Consolidate data observe.actions.consolidate.description=Consolidate observed data -observe.actions.consolidate.message.activity=Computed data for activity %1$s +observe.actions.consolidate.message.activity=Computed data for activity [%s] %s observe.actions.consolidate.message.noChanges=No data modified. observe.actions.consolidate.message.operation.done=Consolidate operation done in %1$s. observe.actions.consolidate.message.save.changes=Save modified %1$s trip(s). -observe.actions.consolidate.message.trip=Data consolidate for trip %1$s +observe.actions.consolidate.message.trip=Data consolidate for trip [%s] %s observe.actions.consolidate.start.trip=Start consolidate data on trip %s / %s (%s) observe.actions.consolidate.title=Consolidate data observe.actions.consolidate.title.tip=Consolidate observed data @@ -1713,7 +1713,7 @@ observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size me observe.common.Sample.length.computed.tip=Length was computed observe.common.Sample.length.observed.tip=Length was observed observe.common.Sample.weight=Individual weight (kg) -observe.common.Sample.weight.computed.tip=Weight was computed (%s) +observe.common.Sample.weight.computed.tip=Weight was computed observe.common.Sample.weight.observed.tip=Weight was observed observe.common.SampleLogbook.message.creating=Sample is in creation observe.common.SampleLogbook.message.updating=Sample is updating ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -161,11 +161,11 @@ observe.action.translate.tip=Traduire l'application \#TODO observe.action.validate.config.generateReport=Generar un informe de validación observe.actions.consolidate=Calcular los datos observe.actions.consolidate.description=Calcular los datos que no fueron observados -observe.actions.consolidate.message.activity=Datos calculados para la actividad %1$s +observe.actions.consolidate.message.activity=Datos calculados para la actividad [%s] %s observe.actions.consolidate.message.noChanges=No modificación de datos. observe.actions.consolidate.message.operation.done=Operación de calculo de datos terminada en %1$s. observe.actions.consolidate.message.save.changes=Guardar las modificaciones de la(s) %1$s marea(s) modificada(s). -observe.actions.consolidate.message.trip=Datos calculados para la marea %1$s +observe.actions.consolidate.message.trip=Datos calculados para la marea [%s] %s observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) \#TODO observe.actions.consolidate.title=Consolidar los datos observados observe.actions.consolidate.title.tip=Consolidar los datos observados ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -161,11 +161,11 @@ observe.action.translate.tip=Traduire l'application observe.action.validate.config.generateReport=Générer un rapport de validation observe.actions.consolidate=Calculer les données observe.actions.consolidate.description=Calculer les données non observées -observe.actions.consolidate.message.activity=Données calculées pour l'activité %1$s +observe.actions.consolidate.message.activity=Données calculées pour l'activité [%s] %s observe.actions.consolidate.message.noChanges=Aucune donnée modifiée. observe.actions.consolidate.message.operation.done=Opération de calcul des données terminée à %1$s. observe.actions.consolidate.message.save.changes=Sauvegarde des modifications sur la(es) %1$s marée(s) modifiée(s). -observe.actions.consolidate.message.trip=Données calculées pour la marée %1$s +observe.actions.consolidate.message.trip=Données calculées pour la marée [%s] %s. observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) observe.actions.consolidate.title=Consolider les données observateur observe.actions.consolidate.title.tip=Consolider les données observateur ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.7</version> + <version>2019.8.8</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -147,10 +147,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements @Override public ConsolidateTripSeineDataResult consolidateTripSeine(ConsolidateTripSeineDataRequest request) { ReferentialLocale referenceLocale = serviceContext.getReferentialLocale(); - boolean failIfLenghtWeightParameterNotFound = request.isFailIfLengthWeightParameterNotFound(); + boolean failIfLengthWeightParameterNotFound = request.isFailIfLengthWeightParameterNotFound(); boolean failIfLengthLengthParameterNotFound = request.isFailIfLengthLengthParameterNotFound(); - Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(referenceLocale, request.getTripSeineId(), failIfLenghtWeightParameterNotFound, failIfLengthLengthParameterNotFound); + Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(referenceLocale, request.getTripSeineId(), failIfLengthWeightParameterNotFound,failIfLengthLengthParameterNotFound ); return consolidateTripSeineDataResult.orElse(null); } @@ -173,6 +173,8 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements private Optional<ConsolidateTripSeineDataResult> consolidateTripSeine(ReferentialLocale referenceLocale, String tripSeineId, boolean failIfLengthWeightParameterNotFound, boolean failIfLengthLengthParameterNotFound) { + log.info(String.format("Start consolidate trip: %s", tripSeineId)); + TripSeine tripSeine = TRIP_SEINE_SPI.loadEntity(getTopiaPersistenceContext(), tripSeineId); BeanMonitor targetLengthMonitor = new BeanMonitor( @@ -210,17 +212,23 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements DataEntityDtoBinderSupport<FloatingObjectDto, FloatingObject> floatingObjectBinder = DbModelHelper.fromDataDto(FloatingObjectDto.class).toEntityBinder(); DataEntityDtoBinderSupport<FloatingObjectPartDto, FloatingObjectPart> floatingObjectPartBinder = DbModelHelper.fromDataDto(FloatingObjectPartDto.class).toEntityBinder(); - + int routeIndex = 0; + int routeMax = tripSeine.sizeRoute(); for (Route route : tripSeine.getRoute()) { + String routePrefix =String.format("Route [%s/%s] ", ++routeIndex, routeMax); + log.info(String.format("%s Start consolidate route: %s", routePrefix, route.getTopiaId())); + int activityIndex = 0; + int activityMax = route.sizeActivitySeine(); for (ActivitySeine activitySeine : route.getActivitySeine()) { + String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); + if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) { - log.debug("No set nor dcp on activity " + activitySeine); + log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId())); continue; } - ConsolidateActivitySeineDataResultBuilder resultBuilder = new ConsolidateActivitySeineDataResultBuilder(applicationLocale, referenceLocale, activitySeine.getTopiaId(), ActivitySeines.decorate(referenceLocale.ordinal(), activitySeine)); ConsolidationActivitySeineDataContext activityContext = new ConsolidationActivitySeineDataContext(); @@ -238,15 +246,21 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements activityContext.floatingObjectConsolidateEngine = floatingObjectConsolidateEngine; activityContext.floatingObjectBinder = floatingObjectBinder; activityContext.floatingObjectPartBinder = floatingObjectPartBinder; + activityContext.activityPrefix = activityPrefix; - consolidateActivitySeine(activityContext); + try { + consolidateActivitySeine(activityContext); + } catch (Exception e) { + log.error(String.format("%s Could not consolidate trip: %s, route: %s - activity: %s", activityPrefix, tripSeineId, route.getTopiaId(), activitySeine.getTopiaId()), e); + throw e; + } Optional<ConsolidateActivitySeineDataResult> optionalConsolidateActivitySeineDataResult = resultBuilder.build(); if (optionalConsolidateActivitySeineDataResult.isPresent()) { // Des modifications ont été enregistrées sur l'activité ConsolidateActivitySeineDataResult consolidateActivitySeineDataResult = optionalConsolidateActivitySeineDataResult.get(); - log.info("Found some modifications on activity: " + consolidateActivitySeineDataResult.getActivitySeineLabel()); + log.info(String.format("%s Found some modifications on activity: %s - %s", activityPrefix, activitySeine.getTopiaId(), consolidateActivitySeineDataResult.getActivitySeineLabel())); activitiesResultBuilder.add(consolidateActivitySeineDataResult); } @@ -265,7 +279,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements consolidateTripSeineDataResult = new ConsolidateTripSeineDataResult(tripSeineId, TripSeines.decorate(referenceLocale.ordinal(), tripSeine), consolidateActivitySeineDataResults); - log.info("Found some modifications on trip: " + consolidateTripSeineDataResult.getTripSeineLabel()); + log.info(String.format("Found some modifications on trip: %s - %s", tripSeineId, consolidateTripSeineDataResult.getTripSeineLabel())); } return Optional.ofNullable(consolidateTripSeineDataResult); @@ -275,7 +289,8 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements ActivitySeine activity = activityContext.activity; - log.debug("Start consolidate activity: " + activity.getTopiaId()); + log.info(String.format("%s Start consolidate activity: %s", activityContext.activityPrefix, activity.getTopiaId())); + if (activity.isFloatingObjectNotEmpty()) { for (FloatingObject dcp : activity.getFloatingObject()) { @@ -285,7 +300,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements SetSeine setSeine = activity.getSetSeine(); if (setSeine == null) { - log.info("No set found for activity: " + activity.getTopiaId()); + log.debug(String.format("%s No set found for activity: %s", activityContext.activityPrefix, activity.getTopiaId())); return; } SchoolType oldSchoolType = setSeine.getSchoolType(); @@ -302,7 +317,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // des echantillons thons trouves for (TargetSample targetSample : setSeine.getTargetSample()) { - if (!targetSample.isTargetLengthEmpty()) { + if (targetSample.isTargetLengthNotEmpty()) { for (TargetLength targetLength : targetSample.getTargetLength()) { activityContext.watchTargetLength(targetLength); @@ -324,7 +339,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // des echantillons faunes trouves for (NonTargetSample nonTargetSample : setSeine.getNonTargetSample()) { - if (!nonTargetSample.isNonTargetLengthEmpty()) { + if (nonTargetSample.isNonTargetLengthNotEmpty()) { for (NonTargetLength nonTargetLength : nonTargetSample.getNonTargetLength()) { activityContext.watchNonTargetLenght(nonTargetLength); @@ -643,6 +658,11 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // recherche du parametrage adequate SizeMeasureType inputSizeMeasureType = lengthWeightComputable.getSizeMeasureType(); + //FIXME https://gitlab.com/ultreiaio/ird-observe/issues/1217 + if (inputSizeMeasureType == null) { + log.error(String.format("No size measure type found for TargetLength (%s) will use the one of the species", lengthWeightComputable.getTopiaId())); + inputSizeMeasureType = species.getSizeMeasureType(); + } Optional<LengthWeightParameter> optionalLengthWeightParameter = activityContext.findLengthWeightParameter(species, sex, inputSizeMeasureType); if (!optionalLengthWeightParameter.isPresent()) { @@ -677,7 +697,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements if (optionalLengthLengthParameter.isPresent()) { length = optionalLengthLengthParameter.get().computeFromFormulaOne(length); } else { - log.warn("Could not find lengthLengthParameter for input: " + inputSizeMeasureType + " - output: " + outputSizeMeasureType); + log.warn(String.format("Could not find LengthLengthParameter for input: %s - output: %s", inputSizeMeasureType, outputSizeMeasureType)); return; } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidationActivitySeineDataContext.java ===================================== @@ -71,6 +71,7 @@ class ConsolidationActivitySeineDataContext { boolean failIfLengthWeightParameterNotFound; boolean failIfLengthLengthParameterNotFound; BeanMonitor targetLengthMonitor; + String activityPrefix; BeanMonitor nonTargetLengthMonitor; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/56e4ddcef25cd8cb995c4febba… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/56e4ddcef25cd8cb995c4febba… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] update pom
by Tony CHEMIT 07 Feb '19

07 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 6bc4e3f7 by tchemit at 2019-02-07T14:00:58Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.7</version> + <version>2019.8.8</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6bc4e3f71de42c02909090004d0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6bc4e3f71de42c02909090004d0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Perte des tooltips sur les données calculées - Closes #1218
by Tony CHEMIT 07 Feb '19

07 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 901d5cd2 by tchemit at 2019-02-07T13:51:27Z Perte des tooltips sur les données calculées - Closes #1218 - - - - - 56e4ddce by tchemit at 2019-02-07T13:59:26Z Problème avec le calcul sur certaines marées 2 - See #1217 - - - - - 11 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/AbstractSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java - 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 - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidationActivitySeineDataContext.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java ===================================== @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,7 +14,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -109,11 +109,11 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple String tripSeineLabel = result.getTripSeineLabel(); - sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel)); + sendMessage(t("observe.actions.consolidate.message.trip", result.getTripSeineId(), tripSeineLabel)); for (ConsolidateActivitySeineDataResult activitySeineDataResult : result.getConsolidateActivitySeineDataResults()) { - sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel())); + sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineId(), activitySeineDataResult.getActivitySeineLabel())); } resultsBuilder.add(result); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/AbstractSampleUIHandler.java ===================================== @@ -38,6 +38,8 @@ import java.beans.PropertyChangeListener; import java.util.List; import java.util.Optional; +import static io.ultreia.java4all.i18n.I18n.n; + /** * Created on 31/10/16. * @@ -46,6 +48,11 @@ import java.util.Optional; */ public abstract class AbstractSampleUIHandler<E extends DataDto, D extends DataDto, U extends ContentTableUI<E, D, U>> extends ContentTableUIHandler<E, D, U> { + public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); + public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); + public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); + public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); + protected final Logger log = LogManager.getLogger(getClass()); /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jaxx ===================================== @@ -82,22 +82,14 @@ <script><![CDATA[ -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + return computed ? t(NonTargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(NonTargetSampleUIHandler.POIDS_OBSERVED_TIP); } public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + return computed ? t(NonTargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(NonTargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } -public String getSpeciesFauneTypeTaille(SpeciesReference species) { - return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId(); -} ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleUI.jaxx ===================================== @@ -79,20 +79,15 @@ <script><![CDATA[ -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - @Override public abstract TargetSampleUIHandler getHandler(); public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + return computed ? t(TargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(TargetSampleUIHandler.POIDS_OBSERVED_TIP); } public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + return computed ? t(TargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(TargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx ===================================== @@ -64,13 +64,7 @@ protected void setDescriptionText(String text) { } protected String getProgressString(int currentStep, int nbStep) { - StorageStep step = getStep(); - String txt = ""; - if (step != null) { - txt = n("observe.storage.step.label"); - txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step)); - } - return txt; + return getProgressString(currentStep, nbStep, getStep()); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java ===================================== @@ -23,12 +23,15 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveTextGenerator; +import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.storage.StorageUIModel; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import org.nuiton.jaxx.runtime.JAXXObject; import javax.swing.JLabel; +import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; /** @@ -80,4 +83,12 @@ public class StorageTabUIHandler<U extends JAXXObject> { this.ui = ui; } + protected String getProgressString(int currentStep, int nbStep,StorageStep step) { + String txt = ""; + if (step != null) { + txt = n("observe.storage.step.label"); + txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step)); + } + return txt; + } } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -161,11 +161,11 @@ observe.action.translate.tip=Translate application observe.action.validate.config.generateReport=Generate validation report observe.actions.consolidate=Consolidate data observe.actions.consolidate.description=Consolidate observed data -observe.actions.consolidate.message.activity=Computed data for activity %1$s +observe.actions.consolidate.message.activity=Computed data for activity [%s] %s observe.actions.consolidate.message.noChanges=No data modified. observe.actions.consolidate.message.operation.done=Consolidate operation done in %1$s. observe.actions.consolidate.message.save.changes=Save modified %1$s trip(s). -observe.actions.consolidate.message.trip=Data consolidate for trip %1$s +observe.actions.consolidate.message.trip=Data consolidate for trip [%s] %s observe.actions.consolidate.start.trip=Start consolidate data on trip %s / %s (%s) observe.actions.consolidate.title=Consolidate data observe.actions.consolidate.title.tip=Consolidate observed data @@ -1713,7 +1713,7 @@ observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size me observe.common.Sample.length.computed.tip=Length was computed observe.common.Sample.length.observed.tip=Length was observed observe.common.Sample.weight=Individual weight (kg) -observe.common.Sample.weight.computed.tip=Weight was computed (%s) +observe.common.Sample.weight.computed.tip=Weight was computed observe.common.Sample.weight.observed.tip=Weight was observed observe.common.SampleLogbook.message.creating=Sample is in creation observe.common.SampleLogbook.message.updating=Sample is updating ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -161,11 +161,11 @@ observe.action.translate.tip=Traduire l'application \#TODO observe.action.validate.config.generateReport=Generar un informe de validación observe.actions.consolidate=Calcular los datos observe.actions.consolidate.description=Calcular los datos que no fueron observados -observe.actions.consolidate.message.activity=Datos calculados para la actividad %1$s +observe.actions.consolidate.message.activity=Datos calculados para la actividad [%s] %s observe.actions.consolidate.message.noChanges=No modificación de datos. observe.actions.consolidate.message.operation.done=Operación de calculo de datos terminada en %1$s. observe.actions.consolidate.message.save.changes=Guardar las modificaciones de la(s) %1$s marea(s) modificada(s). -observe.actions.consolidate.message.trip=Datos calculados para la marea %1$s +observe.actions.consolidate.message.trip=Datos calculados para la marea [%s] %s observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) \#TODO observe.actions.consolidate.title=Consolidar los datos observados observe.actions.consolidate.title.tip=Consolidar los datos observados ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -161,11 +161,11 @@ observe.action.translate.tip=Traduire l'application observe.action.validate.config.generateReport=Générer un rapport de validation observe.actions.consolidate=Calculer les données observe.actions.consolidate.description=Calculer les données non observées -observe.actions.consolidate.message.activity=Données calculées pour l'activité %1$s +observe.actions.consolidate.message.activity=Données calculées pour l'activité [%s] %s observe.actions.consolidate.message.noChanges=Aucune donnée modifiée. observe.actions.consolidate.message.operation.done=Opération de calcul des données terminée à %1$s. observe.actions.consolidate.message.save.changes=Sauvegarde des modifications sur la(es) %1$s marée(s) modifiée(s). -observe.actions.consolidate.message.trip=Données calculées pour la marée %1$s +observe.actions.consolidate.message.trip=Données calculées pour la marée [%s] %s. observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) observe.actions.consolidate.title=Consolider les données observateur observe.actions.consolidate.title.tip=Consolider les données observateur ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -147,10 +147,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements @Override public ConsolidateTripSeineDataResult consolidateTripSeine(ConsolidateTripSeineDataRequest request) { ReferentialLocale referenceLocale = serviceContext.getReferentialLocale(); - boolean failIfLenghtWeightParameterNotFound = request.isFailIfLengthWeightParameterNotFound(); + boolean failIfLengthWeightParameterNotFound = request.isFailIfLengthWeightParameterNotFound(); boolean failIfLengthLengthParameterNotFound = request.isFailIfLengthLengthParameterNotFound(); - Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(referenceLocale, request.getTripSeineId(), failIfLenghtWeightParameterNotFound, failIfLengthLengthParameterNotFound); + Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(referenceLocale, request.getTripSeineId(), failIfLengthWeightParameterNotFound,failIfLengthLengthParameterNotFound ); return consolidateTripSeineDataResult.orElse(null); } @@ -173,6 +173,8 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements private Optional<ConsolidateTripSeineDataResult> consolidateTripSeine(ReferentialLocale referenceLocale, String tripSeineId, boolean failIfLengthWeightParameterNotFound, boolean failIfLengthLengthParameterNotFound) { + log.info(String.format("Start consolidate trip: %s", tripSeineId)); + TripSeine tripSeine = TRIP_SEINE_SPI.loadEntity(getTopiaPersistenceContext(), tripSeineId); BeanMonitor targetLengthMonitor = new BeanMonitor( @@ -210,17 +212,23 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements DataEntityDtoBinderSupport<FloatingObjectDto, FloatingObject> floatingObjectBinder = DbModelHelper.fromDataDto(FloatingObjectDto.class).toEntityBinder(); DataEntityDtoBinderSupport<FloatingObjectPartDto, FloatingObjectPart> floatingObjectPartBinder = DbModelHelper.fromDataDto(FloatingObjectPartDto.class).toEntityBinder(); - + int routeIndex = 0; + int routeMax = tripSeine.sizeRoute(); for (Route route : tripSeine.getRoute()) { + String routePrefix =String.format("Route [%s/%s] ", ++routeIndex, routeMax); + log.info(String.format("%s Start consolidate route: %s", routePrefix, route.getTopiaId())); + int activityIndex = 0; + int activityMax = route.sizeActivitySeine(); for (ActivitySeine activitySeine : route.getActivitySeine()) { + String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); + if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) { - log.debug("No set nor dcp on activity " + activitySeine); + log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId())); continue; } - ConsolidateActivitySeineDataResultBuilder resultBuilder = new ConsolidateActivitySeineDataResultBuilder(applicationLocale, referenceLocale, activitySeine.getTopiaId(), ActivitySeines.decorate(referenceLocale.ordinal(), activitySeine)); ConsolidationActivitySeineDataContext activityContext = new ConsolidationActivitySeineDataContext(); @@ -238,15 +246,21 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements activityContext.floatingObjectConsolidateEngine = floatingObjectConsolidateEngine; activityContext.floatingObjectBinder = floatingObjectBinder; activityContext.floatingObjectPartBinder = floatingObjectPartBinder; + activityContext.activityPrefix = activityPrefix; - consolidateActivitySeine(activityContext); + try { + consolidateActivitySeine(activityContext); + } catch (Exception e) { + log.error(String.format("%s Could not consolidate trip: %s, route: %s - activity: %s", activityPrefix, tripSeineId, route.getTopiaId(), activitySeine.getTopiaId()), e); + throw e; + } Optional<ConsolidateActivitySeineDataResult> optionalConsolidateActivitySeineDataResult = resultBuilder.build(); if (optionalConsolidateActivitySeineDataResult.isPresent()) { // Des modifications ont été enregistrées sur l'activité ConsolidateActivitySeineDataResult consolidateActivitySeineDataResult = optionalConsolidateActivitySeineDataResult.get(); - log.info("Found some modifications on activity: " + consolidateActivitySeineDataResult.getActivitySeineLabel()); + log.info(String.format("%s Found some modifications on activity: %s - %s", activityPrefix, activitySeine.getTopiaId(), consolidateActivitySeineDataResult.getActivitySeineLabel())); activitiesResultBuilder.add(consolidateActivitySeineDataResult); } @@ -265,7 +279,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements consolidateTripSeineDataResult = new ConsolidateTripSeineDataResult(tripSeineId, TripSeines.decorate(referenceLocale.ordinal(), tripSeine), consolidateActivitySeineDataResults); - log.info("Found some modifications on trip: " + consolidateTripSeineDataResult.getTripSeineLabel()); + log.info(String.format("Found some modifications on trip: %s - %s", tripSeineId, consolidateTripSeineDataResult.getTripSeineLabel())); } return Optional.ofNullable(consolidateTripSeineDataResult); @@ -275,7 +289,8 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements ActivitySeine activity = activityContext.activity; - log.debug("Start consolidate activity: " + activity.getTopiaId()); + log.info(String.format("%s Start consolidate activity: %s", activityContext.activityPrefix, activity.getTopiaId())); + if (activity.isFloatingObjectNotEmpty()) { for (FloatingObject dcp : activity.getFloatingObject()) { @@ -285,7 +300,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements SetSeine setSeine = activity.getSetSeine(); if (setSeine == null) { - log.info("No set found for activity: " + activity.getTopiaId()); + log.debug(String.format("%s No set found for activity: %s", activityContext.activityPrefix, activity.getTopiaId())); return; } SchoolType oldSchoolType = setSeine.getSchoolType(); @@ -302,7 +317,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // des echantillons thons trouves for (TargetSample targetSample : setSeine.getTargetSample()) { - if (!targetSample.isTargetLengthEmpty()) { + if (targetSample.isTargetLengthNotEmpty()) { for (TargetLength targetLength : targetSample.getTargetLength()) { activityContext.watchTargetLength(targetLength); @@ -324,7 +339,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // des echantillons faunes trouves for (NonTargetSample nonTargetSample : setSeine.getNonTargetSample()) { - if (!nonTargetSample.isNonTargetLengthEmpty()) { + if (nonTargetSample.isNonTargetLengthNotEmpty()) { for (NonTargetLength nonTargetLength : nonTargetSample.getNonTargetLength()) { activityContext.watchNonTargetLenght(nonTargetLength); @@ -643,6 +658,11 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // recherche du parametrage adequate SizeMeasureType inputSizeMeasureType = lengthWeightComputable.getSizeMeasureType(); + //FIXME https://gitlab.com/ultreiaio/ird-observe/issues/1217 + if (inputSizeMeasureType == null) { + log.error(String.format("No size measure type found for TargetLength (%s) will use the one of the species", lengthWeightComputable.getTopiaId())); + inputSizeMeasureType = species.getSizeMeasureType(); + } Optional<LengthWeightParameter> optionalLengthWeightParameter = activityContext.findLengthWeightParameter(species, sex, inputSizeMeasureType); if (!optionalLengthWeightParameter.isPresent()) { @@ -677,7 +697,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements if (optionalLengthLengthParameter.isPresent()) { length = optionalLengthLengthParameter.get().computeFromFormulaOne(length); } else { - log.warn("Could not find lengthLengthParameter for input: " + inputSizeMeasureType + " - output: " + outputSizeMeasureType); + log.warn(String.format("Could not find LengthLengthParameter for input: %s - output: %s", inputSizeMeasureType, outputSizeMeasureType)); return; } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidationActivitySeineDataContext.java ===================================== @@ -71,6 +71,7 @@ class ConsolidationActivitySeineDataContext { boolean failIfLengthWeightParameterNotFound; boolean failIfLengthLengthParameterNotFound; BeanMonitor targetLengthMonitor; + String activityPrefix; BeanMonitor nonTargetLengthMonitor; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0513a173bb8a0b44f526cc1c14… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0513a173bb8a0b44f526cc1c14… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Problème avec le calcul sur certaines marées 2 - See #1217
by Tony CHEMIT 07 Feb '19

07 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 8193b42b by tchemit at 2019-02-07T13:06:11Z Problème avec le calcul sur certaines marées 2 - See #1217 - - - - - c491e26d by tchemit at 2019-02-07T13:39:30Z Perte des tooltips sur les données calculées - Closes #1218 - - - - - 13 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java - 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 - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidationActivitySeineDataContext.java Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -502,6 +502,10 @@ observe.common.RouteDto.message.no.active.found observe.common.RouteDto.message.no.active.found.for.other.trip observe.common.RouteDto.message.not.open observe.common.RouteDto.message.updating +observe.common.Sample.length.computed.tip +observe.common.Sample.length.observed.tip +observe.common.Sample.weight.computed.tip +observe.common.Sample.weight.observed.tip observe.common.SchoolEstimateDto.table.meanWeight observe.common.SchoolEstimateDto.table.meanWeight.tip observe.common.SchoolEstimateDto.table.speciesThon ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java ===================================== @@ -33,8 +33,8 @@ import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataServic import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult; import fr.ird.observe.services.service.actions.consolidate.set.ConsolidateActivitySeineDataResult; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; @@ -109,11 +109,11 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple String tripSeineLabel = result.getTripSeineLabel(); - sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel)); + sendMessage(t("observe.actions.consolidate.message.trip", result.getTripSeineId(), tripSeineLabel)); for (ConsolidateActivitySeineDataResult activitySeineDataResult : result.getConsolidateActivitySeineDataResults()) { - sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel())); + sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineId(), activitySeineDataResult.getActivitySeineLabel())); } resultsBuilder.add(result); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java ===================================== @@ -32,13 +32,15 @@ import fr.ird.observe.dto.data.seine.NonTargetLengthDto; import fr.ird.observe.dto.data.seine.TargetLengthDto; import fr.ird.observe.dto.referential.SizeMeasureTypeReference; import fr.ird.observe.dto.referential.SpeciesReference; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.beans.PropertyChangeListener; import java.util.List; import java.util.Optional; +import static io.ultreia.java4all.i18n.I18n.n; + /** * Created on 31/10/16. * @@ -47,6 +49,11 @@ import java.util.Optional; */ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, U extends ContentTableUI<E, D, U>> extends ContentTableUIHandler<E, D, U> { + public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); + public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); + public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); + public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); + protected final Logger log = LogManager.getLogger(getClass()); /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx ===================================== @@ -83,22 +83,14 @@ <script><![CDATA[ -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + return computed ? t(NonTargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(NonTargetSampleUIHandler.POIDS_OBSERVED_TIP); } public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + return computed ? t(NonTargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(NonTargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } -public String getSpeciesFauneTypeTaille(SpeciesReference species) { - return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId(); -} ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jcss ===================================== @@ -40,16 +40,6 @@ _resetTablePropertyName:{NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES}; } -#speciesTypeTailleLabel { - actionIcon:"information"; - text:"observe.common.lengthMeasureType"; -} - -#speciesTypeTaille { - font-weight:"bold"; - text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; -} - #comment { model:{getBean()}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx ===================================== @@ -79,20 +79,15 @@ <script><![CDATA[ -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip"); -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip"); -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip"); -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip"); - @Override public abstract TargetSampleUIHandler getHandler(); public String getWeightDataTip(boolean computed) { - return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); + return computed ? t(TargetSampleUIHandler.POIDS_COMPUTED_TIP) : t(TargetSampleUIHandler.POIDS_OBSERVED_TIP); } public String getLengthDataTip(boolean computed) { - return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP); + return computed ? t(TargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(TargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx ===================================== @@ -64,13 +64,7 @@ protected void setDescriptionText(String text) { } protected String getProgressString(int currentStep, int nbStep) { - StorageStep step = getStep(); - String txt = ""; - if (step != null) { - txt = n("observe.storage.step.label"); - txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step)); - } - return txt; + return getProgressString(currentStep, nbStep, getStep()); } ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUIHandler.java ===================================== @@ -23,12 +23,15 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveTextGenerator; +import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.storage.StorageUIModel; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import org.nuiton.jaxx.runtime.JAXXObject; import javax.swing.JLabel; +import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; /** @@ -80,4 +83,12 @@ public class StorageTabUIHandler<U extends JAXXObject> { this.ui = ui; } + protected String getProgressString(int currentStep, int nbStep,StorageStep step) { + String txt = ""; + if (step != null) { + txt = n("observe.storage.step.label"); + txt = t(txt, currentStep + 1, nbStep, I18nEnumHelper.getLabel(step)); + } + return txt; + } } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -149,11 +149,11 @@ observe.action.translate.tip=Translate application observe.action.validate.config.generateReport=Generate validation report observe.actions.consolidate=Consolidate data observe.actions.consolidate.description=Consolidate observed data -observe.actions.consolidate.message.activity=Computed data for activity %1$s +observe.actions.consolidate.message.activity=Computed data for activity [%s] %s observe.actions.consolidate.message.noChanges=No data modified. observe.actions.consolidate.message.operation.done=Consolidate operation done in %1$s. observe.actions.consolidate.message.save.changes=Save modified %1$s trip(s). -observe.actions.consolidate.message.trip=Data consolidate for trip %1$s +observe.actions.consolidate.message.trip=Data consolidate for trip [%s] %s observe.actions.consolidate.start.trip=Start consolidate data on trip %s / %s (%s) observe.actions.consolidate.title=Consolidate data observe.actions.consolidate.title.tip=Consolidate observed data @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Routes observe.common.RouteDto.type=Route observe.common.RouteDto.types=Routes 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 observe.common.Sample.weight=Individual weight (kg) +observe.common.Sample.weight.computed.tip=Weight was computed (%s) +observe.common.Sample.weight.observed.tip=Weight was observed observe.common.SchoolEstimateDto.action.create=Insert this estimate observe.common.SchoolEstimateDto.action.create.tip=Insert this estimate observe.common.SchoolEstimateDto.meanWeight=Mean weight ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -149,11 +149,11 @@ observe.action.translate.tip=Traducir la aplicación observe.action.validate.config.generateReport=Generar un informe de verificación observe.actions.consolidate=Calcular los datos observe.actions.consolidate.description=Calcular los datos que no fueron observados -observe.actions.consolidate.message.activity=Datos calculados para la actividad %1$s +observe.actions.consolidate.message.activity=Datos calculados para la actividad [%s] %s observe.actions.consolidate.message.noChanges=No se han modificado los datos observe.actions.consolidate.message.operation.done=Operación de cálculo de datos terminada en %1$s observe.actions.consolidate.message.save.changes=Guardar las modificaciones de la(s) %1$s marea(s) modificada(s) -observe.actions.consolidate.message.trip=Datos calculados para la marea %1$s +observe.actions.consolidate.message.trip=Datos calculados para la marea [%s] %s observe.actions.consolidate.start.trip=Iniciar la consolidación de datos de la marea %s / %s (%s) observe.actions.consolidate.title=Consolidar los datos observados observe.actions.consolidate.title.tip=Consolidar los datos observados @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Rutas observe.common.RouteDto.type=Ruta observe.common.RouteDto.types=Rutas 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 observe.common.Sample.weight=Peso del ejemplar (en Kg) +observe.common.Sample.weight.computed.tip=Peso calculado +observe.common.Sample.weight.observed.tip=Peso observado observe.common.SchoolEstimateDto.action.create=Insertar la estimación observe.common.SchoolEstimateDto.action.create.tip=Insertar la nueva estimación en la tabla observe.common.SchoolEstimateDto.meanWeight=Peso medio (en Kg) ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -149,11 +149,11 @@ observe.action.translate.tip=Traduire l'application observe.action.validate.config.generateReport=Générer un rapport de validation observe.actions.consolidate=Calculer les données observe.actions.consolidate.description=Calculer les données non observées -observe.actions.consolidate.message.activity=Données calculées pour l'activité %1$s +observe.actions.consolidate.message.activity=Données calculées pour l'activité [%s] %s observe.actions.consolidate.message.noChanges=Aucune donnée modifiée. observe.actions.consolidate.message.operation.done=Opération de calcul des données terminée à %1$s. observe.actions.consolidate.message.save.changes=Sauvegarde des modifications sur la(es) %1$s marée(s) modifiée(s). -observe.actions.consolidate.message.trip=Données calculées pour la marée %1$s +observe.actions.consolidate.message.trip=Données calculées pour la marée [%s] %s. observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) observe.actions.consolidate.title=Consolider les données observateur observe.actions.consolidate.title.tip=Consolider les données observateur @@ -1072,7 +1072,11 @@ observe.common.RouteDto.titles=Routes observe.common.RouteDto.type=Route observe.common.RouteDto.types=Routes 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 observe.common.Sample.weight=Poids ind. (en Kg) +observe.common.Sample.weight.computed.tip=Le poids a été calculé +observe.common.Sample.weight.observed.tip=Le poids a été observé observe.common.SchoolEstimateDto.action.create=Insérer cette estimation observe.common.SchoolEstimateDto.action.create.tip=Insérer la nouvelle estimation dans la table observe.common.SchoolEstimateDto.meanWeight=Poids moyen (en Kg) ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -65,8 +65,8 @@ import fr.ird.observe.services.service.actions.consolidate.dcp.SimplifiedObjectT import fr.ird.observe.services.service.actions.consolidate.set.ConsolidateActivitySeineDataResult; import fr.ird.observe.spi.DbModelHelper; import org.apache.commons.collections4.CollectionUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.util.beans.BeanMonitor; import java.util.Collection; @@ -148,10 +148,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements @Override public ConsolidateTripSeineDataResult consolidateTripSeine(ConsolidateTripSeineDataRequest request) { ReferentialLocale referenceLocale = serviceContext.getReferentialLocale(); - boolean failIfLenghtWeightParameterNotFound = request.isFailIfLengthWeightParameterNotFound(); + boolean failIfLengthWeightParameterNotFound = request.isFailIfLengthWeightParameterNotFound(); boolean failIfLengthLengthParameterNotFound = request.isFailIfLengthLengthParameterNotFound(); - Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(referenceLocale, request.getTripSeineId(), failIfLenghtWeightParameterNotFound,failIfLengthLengthParameterNotFound ); + Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(referenceLocale, request.getTripSeineId(), failIfLengthWeightParameterNotFound,failIfLengthLengthParameterNotFound ); return consolidateTripSeineDataResult.orElse(null); } @@ -174,6 +174,8 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements private Optional<ConsolidateTripSeineDataResult> consolidateTripSeine(ReferentialLocale referenceLocale, String tripSeineId, boolean failIfLengthWeightParameterNotFound, boolean failIfLengthLengthParameterNotFound) { + log.info(String.format("Start consolidate trip: %s", tripSeineId)); + TripSeine tripSeine = TRIP_SEINE_SPI.loadEntity(getTopiaPersistenceContext(), tripSeineId); BeanMonitor targetLengthMonitor = new BeanMonitor( @@ -211,19 +213,23 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements DataEntityDtoBinderSupport<FloatingObjectDto, FloatingObject> floatingObjectBinder = DbModelHelper.fromDataDto(FloatingObjectDto.class).toEntityBinder(); DataEntityDtoBinderSupport<FloatingObjectPartDto, FloatingObjectPart> floatingObjectPartBinder = DbModelHelper.fromDataDto(FloatingObjectPartDto.class).toEntityBinder(); - + int routeIndex = 0; + int routeMax = tripSeine.sizeRoute(); for (Route route : tripSeine.getRoute()) { + String routePrefix =String.format("Route [%s/%s] ", ++routeIndex, routeMax); + log.info(String.format("%s Start consolidate route: %s", routePrefix, route.getTopiaId())); + int activityIndex = 0; + int activityMax = route.sizeActivitySeine(); for (ActivitySeine activitySeine : route.getActivitySeine()) { + String activityPrefix =String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); + if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) { - if (log.isDebugEnabled()) { - log.debug("No set nor dcp on activity " + activitySeine); - } + log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId())); continue; } - ConsolidateActivitySeineDataResultBuilder resultBuilder = new ConsolidateActivitySeineDataResultBuilder(applicationLocale, referenceLocale, activitySeine.getTopiaId(), ActivitySeines.decorate(referenceLocale.ordinal(), activitySeine)); ConsolidationActivitySeineDataContext activityContext = new ConsolidationActivitySeineDataContext(); @@ -241,17 +247,21 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements activityContext.floatingObjectConsolidateEngine = floatingObjectConsolidateEngine; activityContext.floatingObjectBinder = floatingObjectBinder; activityContext.floatingObjectPartBinder = floatingObjectPartBinder; + activityContext.activityPrefix = activityPrefix; - consolidateActivitySeine(activityContext); + try { + consolidateActivitySeine(activityContext); + } catch (Exception e) { + log.error(String.format("%s Could not consolidate trip: %s, route: %s - activity: %s", activityPrefix, tripSeineId, route.getTopiaId(), activitySeine.getTopiaId()), e); + throw e; + } Optional<ConsolidateActivitySeineDataResult> optionalConsolidateActivitySeineDataResult = resultBuilder.build(); if (optionalConsolidateActivitySeineDataResult.isPresent()) { // Des modifications ont été enregistrées sur l'activité ConsolidateActivitySeineDataResult consolidateActivitySeineDataResult = optionalConsolidateActivitySeineDataResult.get(); - if (log.isInfoEnabled()) { - log.info("Found some modifications on activity: " + consolidateActivitySeineDataResult.getActivitySeineLabel()); - } + log.info(String.format("%s Found some modifications on activity: %s - %s", activityPrefix, activitySeine.getTopiaId(), consolidateActivitySeineDataResult.getActivitySeineLabel())); activitiesResultBuilder.add(consolidateActivitySeineDataResult); } @@ -270,9 +280,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements consolidateTripSeineDataResult = new ConsolidateTripSeineDataResult(tripSeineId, TripSeines.decorate(referenceLocale.ordinal(), tripSeine), consolidateActivitySeineDataResults); - if (log.isInfoEnabled()) { - log.info("Found some modifications on trip: " + consolidateTripSeineDataResult.getTripSeineLabel()); - } + log.info(String.format("Found some modifications on trip: %s - %s", tripSeineId, consolidateTripSeineDataResult.getTripSeineLabel())); } return Optional.ofNullable(consolidateTripSeineDataResult); @@ -282,9 +290,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements ActivitySeine activity = activityContext.activity; - if (log.isDebugEnabled()) { - log.debug("Start consolidate activity: " + activity.getTopiaId()); - } + log.info(String.format("%s Start consolidate activity: %s", activityContext.activityPrefix, activity.getTopiaId())); if (activity.isFloatingObjectNotEmpty()) { @@ -295,9 +301,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements SetSeine setSeine = activity.getSetSeine(); if (setSeine == null) { - if (log.isInfoEnabled()) { - log.info("No set found for activity: " + activity.getTopiaId()); - } + log.debug(String.format("%s No set found for activity: %s", activityContext.activityPrefix, activity.getTopiaId())); return; } SchoolType oldSchoolType = setSeine.getSchoolType(); @@ -314,7 +318,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // des echantillons thons trouves for (TargetSample targetSample : setSeine.getTargetSample()) { - if (!targetSample.isTargetLengthEmpty()) { + if (targetSample.isTargetLengthNotEmpty()) { for (TargetLength targetLength : targetSample.getTargetLength()) { activityContext.watchTargetLength(targetLength); @@ -336,7 +340,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // des echantillons faunes trouves for (NonTargetSample nonTargetSample : setSeine.getNonTargetSample()) { - if (!nonTargetSample.isNonTargetLengthEmpty()) { + if (nonTargetSample.isNonTargetLengthNotEmpty()) { for (NonTargetLength nonTargetLength : nonTargetSample.getNonTargetLength()) { activityContext.watchNonTargetLenght(nonTargetLength); @@ -655,6 +659,11 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // recherche du parametrage adequate SizeMeasureType inputSizeMeasureType = lengthWeightComputable.getSizeMeasureType(); + //FIXME https://gitlab.com/ultreiaio/ird-observe/issues/1217 + if (inputSizeMeasureType == null) { + log.error(String.format("No size measure type found for TargetLength (%s) will use the one of the species", lengthWeightComputable.getTopiaId())); + inputSizeMeasureType = species.getSizeMeasureType(); + } Optional<LengthWeightParameter> optionalLengthWeightParameter = activityContext.findLengthWeightParameter(species, sex, inputSizeMeasureType); if (!optionalLengthWeightParameter.isPresent()) { @@ -690,9 +699,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements length = optionalLengthLengthParameter.get().computeFromFormulaOne(length); } else { - if (log.isWarnEnabled()) { - log.warn("Could not find lengLengthParameter for input: " + inputSizeMeasureType + " - output: " + outputSizeMeasureType); - } + log.warn(String.format("Could not find LengthLengthParameter for input: %s - output: %s", inputSizeMeasureType, outputSizeMeasureType)); return; } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidationActivitySeineDataContext.java ===================================== @@ -71,6 +71,7 @@ class ConsolidationActivitySeineDataContext { boolean failIfLengthWeightParameterNotFound; boolean failIfLengthLengthParameterNotFound; BeanMonitor targetLengthMonitor; + String activityPrefix; BeanMonitor nonTargetLengthMonitor; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9836d19a85c2997f4ca44ef39a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9836d19a85c2997f4ca44ef39a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch features/usage
by Tony CHEMIT 07 Feb '19

07 Feb '19

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

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: fix site generation
by Tony CHEMIT 06 Feb '19

06 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 8d65b291 by tchemit at 2019-02-06T13:11:10Z fix site generation - - - - - 9836d19a by tchemit at 2019-02-06T13:11:20Z fix deploy release - - - - - 17 changed files: - .gitlab-ci.yml - + .mvn/gitlab-cache/milestones/649128-issues.json - + .mvn/gitlab-cache/milestones/649128.json - + .mvn/gitlab-cache/milestones/654414-issues.json - + .mvn/gitlab-cache/milestones/654414.json - + .mvn/gitlab-cache/milestones/655988-issues.json - + .mvn/gitlab-cache/milestones/655988.json - + .mvn/gitlab-cache/milestones/656748-issues.json - + .mvn/gitlab-cache/milestones/656748.json - + .mvn/gitlab-cache/milestones/674086-issues.json - + .mvn/gitlab-cache/milestones/674086.json - + .mvn/gitlab-cache/milestones/677551-issues.json - + .mvn/gitlab-cache/milestones/677551.json - + .mvn/gitlab-cache/milestones/681916-issues.json - + .mvn/gitlab-cache/milestones/681916.json - + .mvn/gitlab-cache/milestones/720842-issues.json - + .mvn/gitlab-cache/milestones/720842.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7cf9c26b2c4679c871d9ea9df3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7cf9c26b2c4679c871d9ea9df3… You're receiving this email because of your account on gitlab.com.

1 0