- T3-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-t3] Pushed new tag v2.3
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed new tag v2.3 at ultreiaio / ird-t3 --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/tree/v2.3 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][release/2.3] [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions[skip ci]
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch release/2.3 at ultreiaio / ird-t3 Commits: b5b7520f by 166231 at 2018-03-12T11:05:43Z [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions[skip ci] - - - - - 11 changed files: - pom.xml - t3-actions/pom.xml - t3-domain/pom.xml - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-web/pom.xml - t3/pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> <packaging>pom</packaging> <name>T3 :: Pom</name> ===================================== t3-actions/pom.xml ===================================== --- a/t3-actions/pom.xml +++ b/t3-actions/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>t3-actions</artifactId> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>t3-domain</artifactId> ===================================== t3-input-avdthv33/pom.xml ===================================== --- a/t3-input-avdthv33/pom.xml +++ b/t3-input-avdthv33/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>t3-input-avdthv33</artifactId> ===================================== t3-input-avdthv35/pom.xml ===================================== --- a/t3-input-avdthv35/pom.xml +++ b/t3-input-avdthv35/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>t3-input-avdthv35</artifactId> ===================================== t3-input-avdthv36/pom.xml ===================================== --- a/t3-input-avdthv36/pom.xml +++ b/t3-input-avdthv36/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>t3-input-avdthv36</artifactId> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>t3-installer</artifactId> ===================================== t3-msaccess-importer/pom.xml ===================================== --- a/t3-msaccess-importer/pom.xml +++ b/t3-msaccess-importer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>t3-msaccess-importer</artifactId> ===================================== t3-output-balbayav32/pom.xml ===================================== --- a/t3-output-balbayav32/pom.xml +++ b/t3-output-balbayav32/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>t3-output-balbayav32</artifactId> ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>t3-web</artifactId> ===================================== t3/pom.xml ===================================== --- a/t3/pom.xml +++ b/t3/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b5b7520ff6961df7926bcdd84607e8e3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b5b7520ff6961df7926bcdd84607e8e3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][master] 41 commits: [jgitflow-maven-plugin]updating poms for 2.3-SNAPSHOT development[skip ci]
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch master at ultreiaio / ird-t3 Commits: 88660ade by Tony Chemit at 2018-03-02T14:01:11Z [jgitflow-maven-plugin]updating poms for 2.3-SNAPSHOT development[skip ci] - - - - - 6a5ab77f by Tony CHEMIT at 2018-03-02T14:27:19Z fix release extra model for release - - - - - d1ff484a by Tony CHEMIT at 2018-03-02T14:27:19Z fix stage build - - - - - a533b2b3 by Tony CHEMIT at 2018-03-02T14:27:49Z fix release extra module (for the last time) - - - - - d6dc6c4a by Tony Chemit at 2018-03-02T14:31:52Z optimize i18n - - - - - a75c7903 by Tony CHEMIT at 2018-03-02T14:38:41Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 7dbe3fb2 by Tony CHEMIT at 2018-03-02T14:38:41Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 671462c7 by Tony CHEMIT at 2018-03-02T14:38:41Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 67840bd9 by Tony CHEMIT at 2018-03-02T14:53:05Z update changelog after release 2.2 [skip ci] - - - - - da5304ea by Tony CHEMIT at 2018-03-04T00:53:45Z Replace samplesOnly by TripType on persistence (See #116) - - - - - 8e373b7d by Tony CHEMIT at 2018-03-04T09:08:45Z Refactor avdth input modules + add missing license header (See #116) - - - - - 589a3ab1 by Tony CHEMIT at 2018-03-04T16:59:33Z Improve input tests. - - - - - 7a87832d by Tony CHEMIT at 2018-03-06T15:38:18Z Gros nettoyage de code : - utilisation api java 8 - ajout d'un cache sur les download de ird-t3-data - amélioration api de test - reformat code - mise à jour des licenses, ... - - - - - dce06545 by Tony CHEMIT at 2018-03-06T15:48:07Z Add new vessel activity + use enum name instead of ordinal (See ultreiaio/ird-t3#116) - - - - - bafe8b93 by Tony CHEMIT at 2018-03-06T15:48:08Z Mise en place de l'import sans log books (reste à remplir l'ocean à partir des coordonnées de l'activité fictive) (see #116) - - - - - 961f8808 by Tony CHEMIT at 2018-03-06T15:48:08Z Règles d'acceptation des marées dans les traitements (closes #276) - - - - - 3fd9c1e1 by Tony CHEMIT at 2018-03-06T16:16:31Z fix some io tests - - - - - 05a4f53b by Tony CHEMIT at 2018-03-06T16:25:58Z Renommage des valeurs de TripType (See #116) - - - - - e40de480 by Tony CHEMIT at 2018-03-06T23:39:50Z Spatialiser la table Ocean (See #288) Marées sans logbooks : gestion de leurs échantillons (remplissage de l'ocean après import) (See #116) - - - - - dde509c3 by Tony CHEMIT at 2018-03-06T23:57:37Z optimize dependencies - - - - - 9b358873 by Tony CHEMIT at 2018-03-07T08:33:00Z [N0.3] Conversion des catégories logbook - rendre générique la codification des catégories inconnues (Closes ultreiaio/ird-t3#287) - - - - - c88b4ba4 by Tony CHEMIT at 2018-03-08T10:35:13Z clean code improve release process improve test API - - - - - 430e1a25 by Tony CHEMIT at 2018-03-08T10:35:36Z [N2][N3] Les calées de type banc indéterminé ne sont pas traitées au N2 et N3 (See #261) - - - - - 693824d0 by Tony CHEMIT at 2018-03-08T10:35:36Z [N2][N3] Stockage des niveaux de substitution atteints (See #269) - - - - - 6b63d54c by Tony CHEMIT at 2018-03-08T10:35:37Z [N2][N3] Les calées de type banc indéterminé ne sont pas traitées au N2 et N3 (See #261) - - - - - 9eb8f862 by Tony CHEMIT at 2018-03-09T09:45:26Z Marées sans logbooks : gestion de leurs échantillons - ajout de check de cohérence sur Trip.logbookAvaibility (See #116) + fix typo - - - - - 86b9dff7 by Tony CHEMIT at 2018-03-09T09:45:29Z update test fixtures for ATL and IND - - - - - fbdd9e09 by Tony CHEMIT at 2018-03-09T13:33:47Z Marées sans logbooks : gestion de leurs échantillons - amélioration de l'interface uitlisation de configuration (See #116) - - - - - 990b66b1 by Tony CHEMIT at 2018-03-09T19:36:18Z Improve installer API + Spatialisation de la table Harbour (closes #290) - - - - - 410d676c by Tony CHEMIT at 2018-03-09T21:24:48Z ignore some tests (since imports does not change any more) - - - - - 4020362b by Tony CHEMIT at 2018-03-09T21:25:20Z improve test api - - - - - 4ddf2581 by Tony CHEMIT at 2018-03-09T22:22:17Z fix avdth imports - - - - - 856a8b23 by Tony CHEMIT at 2018-03-10T15:50:15Z start to update struts - - - - - a9cae859 by Tony CHEMIT at 2018-03-10T15:50:29Z yet improve test api (and remove a module) - - - - - 3e46bd01 by Tony CHEMIT at 2018-03-10T16:43:09Z use t3-data 1.4 at last + still improving tests - - - - - ecceb9b4 by Tony CHEMIT at 2018-03-11T10:05:34Z Revert "start to update struts" This reverts commit 856a8b2 - - - - - 6d32c17f by Tony CHEMIT at 2018-03-12T09:27:35Z HiLander refactor : one test over many :) - - - - - f34949f8 by Tony CHEMIT at 2018-03-12T10:49:45Z testing party \o/ - everything seems fine now, let's go for a release - - - - - 514abcb6 by 166231 at 2018-03-12T11:05:32Z [jgitflow-maven-plugin]updating poms for 2.3 branch with snapshot versions[skip ci] - - - - - b5b7520f by 166231 at 2018-03-12T11:05:43Z [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions[skip ci] - - - - - c4700563 by 166231 at 2018-03-12T11:09:48Z [jgitflow-maven-plugin]merging 'release/2.3' into 'master' - - - - - 28 changed files: - .gitignore - .gitlab-ci.yml - CHANGELOG.md - pom.xml - src/site/site.xml - t3-actions/pom.xml - t3-test/src/main/java/fr/ird/t3/FakeT3ServiceContext.java → t3-actions/src/main/java/fr/ird/t3/FakeT3ServiceContext.java - t3-test/src/main/java/fr/ird/t3/T3ActionFixtures.java → t3-actions/src/main/java/fr/ird/t3/T3ActionFixtures.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripAction.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/Level0Step.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/be9a82ca7ef6efa2d760a474f1712f1… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/be9a82ca7ef6efa2d760a474f1712f1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 2.3 branch with snapshot versions[skip ci]
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 514abcb6 by 166231 at 2018-03-12T11:05:32Z [jgitflow-maven-plugin]updating poms for 2.3 branch with snapshot versions[skip ci] - - - - - b5b7520f by 166231 at 2018-03-12T11:05:43Z [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions[skip ci] - - - - - c4700563 by 166231 at 2018-03-12T11:09:48Z [jgitflow-maven-plugin]merging 'release/2.3' into 'master' - - - - - d5d95b4c by 166231 at 2018-03-12T11:09:50Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 570b9acc by 166231 at 2018-03-12T11:09:50Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - f9ccef63 by 166231 at 2018-03-12T11:09:50Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/ba647d4cae16afd39327a4467550b0f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/ba647d4cae16afd39327a4467550b0f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [jgitflow-maven-plugin]updating poms for 2.4-SNAPSHOT development[skip ci]
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: ba647d4c by 166231 at 2018-03-12T11:05:32Z [jgitflow-maven-plugin]updating poms for 2.4-SNAPSHOT development[skip ci] - - - - - 11 changed files: - pom.xml - t3-actions/pom.xml - t3-domain/pom.xml - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-web/pom.xml - t3/pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> <packaging>pom</packaging> <name>T3 :: Pom</name> @@ -482,7 +482,7 @@  <tasks> <echo message="Delete test data cache at ${test.cache.dir}" /> - <delete dir="${test.cache.dir}"/> + <delete dir="${test.cache.dir}" /> </tasks> </configuration> <goals> @@ -512,7 +512,7 @@  <tasks> <echo message="Delete installer data cache at ${installer.cache.dir}" /> - <delete dir="${installer.cache.dir}"/> + <delete dir="${installer.cache.dir}" /> </tasks> </configuration> <goals> ===================================== t3-actions/pom.xml ===================================== --- a/t3-actions/pom.xml +++ b/t3-actions/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>t3-actions</artifactId> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>t3-domain</artifactId> ===================================== t3-input-avdthv33/pom.xml ===================================== --- a/t3-input-avdthv33/pom.xml +++ b/t3-input-avdthv33/pom.xml @@ -18,14 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv33</artifactId> ===================================== t3-input-avdthv35/pom.xml ===================================== --- a/t3-input-avdthv35/pom.xml +++ b/t3-input-avdthv35/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv35</artifactId> ===================================== t3-input-avdthv36/pom.xml ===================================== --- a/t3-input-avdthv36/pom.xml +++ b/t3-input-avdthv36/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv36</artifactId> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>t3-installer</artifactId> @@ -235,10 +235,10 @@ <configuration> <skip>${installer.cache.skip}</skip> <tasks> - <unzip src="${installer.cache.dir}/t3-data-${t3-data.version}-ddl.zip" dest="${installer.cache.dir}"/> - <unzip src="${installer.cache.dir}/t3-data-${t3-data.version}-referential.zip" dest="${installer.cache.dir}"/> - <unzip src="${installer.cache.dir}/t3-data-${t3-data.version}-zones.zip" dest="${installer.cache.dir}"/> - <unzip src="${installer.cache.dir}/t3-data-${t3-data.version}-h2.zip" dest="${installer.cache.dir}"/> + <unzip src="${installer.cache.dir}/t3-data-${t3-data.version}-ddl.zip" dest="${installer.cache.dir}" /> + <unzip src="${installer.cache.dir}/t3-data-${t3-data.version}-referential.zip" dest="${installer.cache.dir}" /> + <unzip src="${installer.cache.dir}/t3-data-${t3-data.version}-zones.zip" dest="${installer.cache.dir}" /> + <unzip src="${installer.cache.dir}/t3-data-${t3-data.version}-h2.zip" dest="${installer.cache.dir}" /> </tasks> </configuration> <goals> ===================================== t3-msaccess-importer/pom.xml ===================================== --- a/t3-msaccess-importer/pom.xml +++ b/t3-msaccess-importer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>t3-msaccess-importer</artifactId> ===================================== t3-output-balbayav32/pom.xml ===================================== --- a/t3-output-balbayav32/pom.xml +++ b/t3-output-balbayav32/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>t3-output-balbayav32</artifactId> ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>t3-web</artifactId> ===================================== t3/pom.xml ===================================== --- a/t3/pom.xml +++ b/t3/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ba647d4cae16afd39327a4467550b0fc… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ba647d4cae16afd39327a4467550b0fc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3] Pushed new branch release/2.3
by Tony CHEMIT 12 Mar '18

12 Mar '18

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

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: HiLander refactor : one test over many :)
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 6d32c17f by Tony CHEMIT at 2018-03-12T09:27:35Z HiLander refactor : one test over many :) - - - - - f34949f8 by Tony CHEMIT at 2018-03-12T10:49:45Z testing party \o/ - everything seems fine now, let's go for a release - - - - - 30 changed files: - pom.xml - t3-actions/src/main/java/fr/ird/t3/T3ActionFixtures.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripAction.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/Level1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-actions/src/main/java/fr/ird/t3/actions/io/output/ExportAction.java - − t3-actions/src/test/java/fr/ird/t3/actions/AbstractActionResumeTest.java - + t3-actions/src/test/java/fr/ird/t3/actions/ActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/admin/DeleteTripActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeRF1ActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeRF2ActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeRF2EmptyConfigurationActionResumeTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/81da80761e718fd28915a445237bdde… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/81da80761e718fd28915a445237bdde… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] HiLander refactor : one test over many :)
by Tony CHEMIT 11 Mar '18

11 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 81da8076 by Tony CHEMIT at 2018-03-11T13:10:59Z HiLander refactor : one test over many :) - - - - - 30 changed files: - pom.xml - t3-actions/src/main/java/fr/ird/t3/T3ActionFixtures.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripAction.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-actions/src/main/java/fr/ird/t3/actions/io/output/ExportAction.java - − t3-actions/src/test/java/fr/ird/t3/actions/AbstractActionResumeTest.java - + t3-actions/src/test/java/fr/ird/t3/actions/ActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/admin/DeleteTripActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeRF1ActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeRF2ActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeRF2EmptyConfigurationActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountActionResumeTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/81da80761e718fd28915a445237bddeb… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/81da80761e718fd28915a445237bddeb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: Revert "start to update struts"
by Tony CHEMIT 11 Mar '18

11 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: ecceb9b4 by Tony CHEMIT at 2018-03-11T10:05:34Z Revert "start to update struts" This reverts commit 856a8b2 - - - - - 364d7cf0 by Tony CHEMIT at 2018-03-11T12:48:47Z HiLander refactor : one test over many :) - - - - - 30 changed files: - pom.xml - t3-actions/src/main/java/fr/ird/t3/T3ActionFixtures.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-actions/src/main/java/fr/ird/t3/actions/io/output/ExportAction.java - − t3-actions/src/test/java/fr/ird/t3/actions/AbstractActionResumeTest.java - + t3-actions/src/test/java/fr/ird/t3/actions/ActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/admin/DeleteTripActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeRF1ActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeRF2ActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeRF2EmptyConfigurationActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsActionTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level1/AbstractLevel1ActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightActionResumeTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/8b5f382631e64ed4e5956388c3bb977… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/8b5f382631e64ed4e5956388c3bb977… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Update struts (namespace io) (still some pb on output, but who cares?
by Tony CHEMIT 10 Mar '18

10 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 8b5f3826 by Tony CHEMIT at 2018-03-10T18:44:25Z Update struts (namespace io) (still some pb on output, but who cares? - - - - - 13 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl - t3-web/src/main/resources/struts.xml - t3-web/src/main/webapp/WEB-INF/jsp/io/input/analyzeImportDataResult.jsp - t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp - t3-web/src/main/webapp/WEB-INF/jsp/io/input/importDataResult.jsp - t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/missingUserInputDatabaseSelected.jsp - t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceConfiguration.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceConfiguration.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceConfiguration.java @@ -75,10 +75,10 @@ public class AnalyzeInputSourceConfiguration implements InputSourceConfiguration result.setInputProvider(inputProvider); result.setUseWells(useWells); result.setTripType(TripType.getTripType(useSamplesOnly, canCreateVirtualActivity)); - result.setCanCreateVessel(canCreateVessel); - result.setCreateVirtualVessel(createVirtualVessel); result.setCanCreateVirtualActivity(canCreateVirtualActivity); result.setUseSamplesOnly(useSamplesOnly); + result.setCanCreateVessel(canCreateVessel); + result.setCreateVirtualVessel(createVirtualVessel); return result; } ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java @@ -73,6 +73,9 @@ public class ImportInputSourceConfiguration implements InputSourceConfiguration result.setTripType(analyzeConfiguration.getTripType()); result.setCanCreateVessel(analyzeConfiguration.isCanCreateVessel()); result.setCreateVirtualVessel(analyzeConfiguration.isCanCreateVessel()); + result.setTripType(analyzeConfiguration.getTripType()); + result.setCanCreateVirtualActivity(analyzeConfiguration.isCanCreateVirtualActivity()); + result.setUseSamplesOnly(analyzeConfiguration.isUseSamplesOnly()); return result; } ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl @@ -23,7 +23,11 @@ Pilote d'acquisition de données : ${configuration.inputProvider.label} Source de données : ${configuration.inputFile.name} Utilisation des plans de cuves : ${configuration.useWells?string} -Type de marées : ${configuration.tripType.label} +<#if configuration.useSamplesOnly> +Base échantillon seulement +<#else> +Autoriser à créer des activités : ${configuration.canCreateVirtualActivity?string} +</#if> Autoriser à créer des bateaux : ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Créer des bateaux virtuels : ${configuration.createVirtualVessel?string} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl @@ -23,7 +23,11 @@ Input Pilot: ${configuration.inputProvider.label} Input file: ${configuration.inputFile.name} Use wells: ${configuration.useWells?string} -Trip type: ${configuration.tripType.label} +<#if configuration.useSamplesOnly> +Database 'Samples only' +<#else> +Authorize to create virtual activities: ${configuration.canCreateVirtualActivity?string} +</#if> Authorise to create vessels: ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Create virtual vessels: ${configuration.createVirtualVessel?string} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl @@ -23,7 +23,12 @@ Pilote d'acquisition de données : ${configuration.inputProvider.label} Source de données : ${configuration.inputFile.name} Utilisation des plans de cuves : ${configuration.useWells?string} -Type de marées : ${configuration.tripType.label} +<#--Type de marées : ${configuration.tripType.label}--> +<#if configuration.useSamplesOnly> +Base échantillon seulement +<#else> +Autoriser à créer des activités : ${configuration.canCreateVirtualActivity?string} +</#if> Autoriser à créer des bateaux : ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Créer des bateaux virtuels : ${configuration.createVirtualVessel?string} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl @@ -23,7 +23,12 @@ Input Pilot: ${configuration.inputProvider.label} Input file: ${configuration.inputFile.name} Use wells: ${configuration.useWells?string} -Trip type: ${configuration.tripType.label} +<#if configuration.useSamplesOnly> +Database 'Samples only' +<#else> +Authorize to create virtual activities: ${configuration.canCreateVirtualActivity?string} +</#if> + Authorise to create vessels: ${configuration.canCreateVessel?string} <#if configuration.canCreateVessel> Create virtual vessels: ${configuration.createVirtualVessel?string} ===================================== t3-web/src/main/resources/struts.xml ===================================== --- a/t3-web/src/main/resources/struts.xml +++ b/t3-web/src/main/resources/struts.xml @@ -32,10 +32,11 @@ <constant name="struts.xworkTextProvider" value="i18nTextProvider"/> <constant name="struts.ognl.allowStaticMethodAccess" value="true"/> + <constant name="struts.enable.DynamicMethodInvocation" value="true"/> <constant name="struts.action.extension" value=",,"/> <constant name="struts.locale" value="fr_FR"/> <constant name="struts.i18n.reload" value="false"/> - <constant name="struts.configuration.xml.reload" value="false"/> + <constant name="struts.configuration.xml.reload" value="true"/>  <constant name="struts.ui.theme" value="css_xhtml"/> <constant name="struts.multipart.maxSize" value="314572800"/> @@ -64,7 +65,7 @@  <interceptor name="checkUserLoggued" class="fr.ird.t3.web.interceptors.CheckLogguedInterceptor"> - <param name="loginAction">user/loginEnter</param> + <param name="loginAction">user/login!input</param> <param name="redirectAction">/home</param> </interceptor> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/input/analyzeImportDataResult.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/input/analyzeImportDataResult.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/input/analyzeImportDataResult.jsp @@ -38,7 +38,7 @@ </s:text> </p> - <s:form method="post" validate="true" namespace="/io"> + <s:form method="post" validate="true" namespace="/io" action="prepareImportData"> <s:if test="needReplace"> <strong> <s:text name="t3.label.message.trips.to.replace"> @@ -49,7 +49,7 @@ </strong> <s:checkbox name="replaceTrip" key="t3.question.confirm.to.replace.trip" value="%{false}"/> </s:if> - <s:submit action="prepareImportData" key="t3.action.importData.doImport" align="right"/> + <s:submit key="t3.action.importData.doImport" align="right"/> </s:form> </s:if> <s:else> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp @@ -59,14 +59,14 @@ <title><s:text name="t3.label.data.configureImportData"/></title> <h2><s:text name="t3.label.data.configureImportData"/></h2> -<s:form method="post" validate="true" enctype="multipart/form-data" namespace="/io"> +<s:form method="post" validate="true" enctype="multipart/form-data" namespace="/io" action="configureImportData"> <s:hidden key="treatmentDirectoryPath" label=''/> <s:select key="inputProviderId" list="inputProviders" label='%{getText("t3.common.inputProvider")}' listKey="id" listValue="label" requiredLabel="true"/> <s:if test="loadedSource==null"> <s:hidden name="useWells" value="%{useWells}"/> <s:file name="sourceToLoad" requiredLabel="true" label='%{getText("t3.common.sourceToUpload")} (*)'/> - <s:submit action="configureImportData!doAddSource" key="t3.action.importData.addSource" align="right"/> + <s:submit method="doAddSource" key="t3.action.importData.addSource" align="right"/> <br/> <div class="cleanBoth"> @@ -84,8 +84,8 @@ <s:checkbox key="canCreateVirtualActivity" label='%{getText("t3.common.canCreateVirtualActivity")}'/> <s:checkbox key="canCreateVessel" label='%{getText("t3.common.canCreateVessel")}'/> <s:checkbox key="createVirtualVessel" label='%{getText("t3.common.createVirtualVessel")}'/> - <s:submit action="configureImportData!doDeleteSource" key="t3.action.importData.deleteSource" align="right"/> - <s:submit action="configureImportData!doPrepareAnalyze" key="t3.action.importData.analyze" align="right"/> + <s:submit method="doDeleteSource" key="t3.action.importData.deleteSource" align="right"/> + <s:submit method="doPrepareAnalyze" key="t3.action.importData.analyze" align="right"/> </s:else> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/input/importDataResult.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/input/importDataResult.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/input/importDataResult.jsp @@ -23,10 +23,7 @@ <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <title><s:text name="t3.label.data.importData"/></title> - -<h2><s:text name="t3.label.data.importData"/> - <s:text - name="t3.label.result"/></h2> - +<h2><s:text name="t3.label.data.importData"/> - <s:text name="t3.label.result"/></h2> <jsp:include page="importDataConfigResume.jsp"/> <s:if test="nbImportedTrips == 0"> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportConfig.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportConfig.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportConfig.jsp @@ -28,8 +28,7 @@ <s:url id="loadUrl" action='getUserOuputDatabase' namespace='/json'/> -<script type="text/javascript" charset="UTF-8" - src="<s:url value='/js/monthpicker.js' />"></script> +<script type="text/javascript" charset="UTF-8" src="<s:url value='/js/monthpicker.js' />"></script> <style type="text/css"> .ui-datepicker-calendar { display: none; @@ -40,40 +39,41 @@ } </style> <script type="text/javascript"> - jQuery(document).ready(function () { - jQuery.struts2_jquery.myBindingOptions = { - datatype : "json", - type : 'checkbox', - name : "operationIds", - list : "operations", - buttonset : false, - jqueryaction : "buttonset", - reloadtopics : "reloadList", - id:$('input[name$="operationIds"]')[0].parentNode.id - }; - $('[name="configuration.outputProviderId"]').change(function(event) { - var myOptions = jQuery.struts2_jquery.myBindingOptions; - myOptions.href = "<s:url action='getOutputProviderOperations' namespace='/json'><s:param name='outputProviderId'/></s:url>" + this.value; - var myDiv = $(jQuery.struts2_jquery.escId(myOptions.id)); - $.unsubscribe('reloadList', myDiv); - jQuery.struts2_jquery_ui.bind(myDiv, myOptions); - }); - - $('[name="databaseId"]').change(function(event) { - var url = "${loadUrl}?" + $.param({ databaseId:this.value}); - $.getJSON(url, - function(data) { - var database = data.database; - $('[name="configuration.url"]').attr('value', database.url ? database.url : ''); - $('[name="configuration.login"]').attr('value', database.login ? database.login : ''); - $('[name="configuration.password"]').attr('value', ""); + jQuery(document).ready(function () { + jQuery.struts2_jquery.myBindingOptions = { + datatype: "json", + type: 'checkbox', + name: "operationIds", + list: "operations", + buttonset: false, + jqueryaction: "buttonset", + reloadtopics: "reloadList", + id: $('input[name$="operationIds"]')[0].parentNode.id + }; + console.info("IDID: " + jQuery.struts2_jquery.myBindingOptions.id); + $('[name="configuration.outputProviderId"]').change(function (event) { + var myOptions = jQuery.struts2_jquery.myBindingOptions; + myOptions.href = "<s:url action='getOutputProviderOperations' namespace='/json'><s:param name='outputProviderId'/></s:url>" + this.value; + var myDiv = $(jQuery.struts2_jquery.escId(myOptions.id)); + $.unsubscribe('reloadList', myDiv); + jQuery.struts2_jquery_ui.bind(myDiv, myOptions); + }); + + $('[name="databaseId"]').change(function (event) { + var url = "${loadUrl}?" + $.param({databaseId: this.value}); + $.getJSON(url, + function (data) { + var database = data.database; + $('[name="configuration.url"]').attr('value', database.url ? database.url : ''); + $('[name="configuration.login"]').attr('value', database.login ? database.login : ''); + $('[name="configuration.password"]').attr('value', ""); } - ); + ); + }); }); - }); </script> -<s:form method="post" validate="true" namespace="/io"> +<s:form method="post" validate="true" namespace="/io" action="configureExport"> <fieldset> <legend><s:text name="t3.label.export.config.pilot"/></legend> @@ -85,17 +85,17 @@ listValue="libelle" headerKey="" headerValue="" requiredLabel="true"/> - - <sj:checkboxlist key="operationIds" buttonset="false" + <br/> + <sj:checkboxlist key="operationIds" buttonset="false" template="mycheckboxlist" label='%{getText("t3.output.operations")}' list="operations" requiredLabel="true"/> + </fieldset> <fieldset> <legend><s:text name="t3.label.export.config.jdbc"/></legend> - <s:select key="databaseId" list="databases" - label='%{getText("t3.common.userOutputDatabase")}' + <s:select key="databaseId" list="databases" label='%{getText("t3.common.userOutputDatabase")}' headerKey="" headerValue=""/> <s:textfield name="configuration.url" requiredLabel="true" size="40" @@ -118,9 +118,8 @@ label='%{getText("t3.common.ocean")}' requiredLabel="true"/> <%-- selected fleet country --%> - <s:select key="configuration.fleetId" list="fleets" - label='%{getText("t3.common.fleetCountry")}' requiredLabel="true"/> - + <s:select key="configuration.fleetId" list="fleets" label='%{getText("t3.common.fleetCountry")}' + requiredLabel="true"/> <%-- begin date --%> <sj:datepicker key="configuration.beginDate" requiredLabel="true" label='%{getText("t3.common.beginDate")}' @@ -132,23 +131,21 @@ appendText=" (mm-yyyy)"/> </fieldset> - <s:submit action="configureExport!execute" - key="t3.action.configuration.validateConfiguration" - align="right"/> + <s:submit method="execute" key="t3.action.configuration.validateConfiguration" align="right"/> </s:form> <script type="text/javascript"> - jQuery(document).ready(function () { + jQuery(document).ready(function () { - $.prepareMonthPickers( - { - minDateAsMonth:'<s:property value="configuration.minDate"/>', - maxDateAsMonth:'<s:property value="configuration.maxDate"/>' - }); + $.prepareMonthPickers( + { + minDateAsMonth: '<s:property value="configuration.minDate"/>', + maxDateAsMonth: '<s:property value="configuration.maxDate"/>' + }); - }); + }); </script> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/missingUserInputDatabaseSelected.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/missingUserInputDatabaseSelected.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/missingUserInputDatabaseSelected.jsp @@ -33,7 +33,7 @@ <ul> <li> - <s:a action="selectUserInputDatabase!input" namespace="/user"> + <s:a action="selectUserInputDatabase" method="input" namespace="/user"> <s:text name="t3.menu.select.t3Database"/> </s:a> </li> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp @@ -26,46 +26,36 @@ <script type="text/javascript"> - jQuery(document).ready(function () { - - $('[name="databaseId"]').change(function(event) { - var url = "${loadUrl}?" + $.param({ databaseId:this.value}); - $.getJSON(url, - function(data) { - var database = data.database; - $('[name="database.url"]').attr('value', database.url ? database.url : ''); - $('[name="database.login"]').attr('value', database.login ? database.login : ''); - $('[name="database.password"]').attr('value', ""); + jQuery(document).ready(function () { + + $('[name="databaseId"]').change(function (event) { + var url = "${loadUrl}?" + $.param({databaseId: this.value}); + $.getJSON(url, + function (data) { + var database = data.database; + $('[name="database.url"]').attr('value', database.url ? database.url : ''); + $('[name="database.login"]').attr('value', database.login ? database.login : ''); + $('[name="database.password"]').attr('value', ""); } - ); + ); + }); }); - }); </script> <title><s:text name="t3.label.user.selectT3Database"/></title> <h2><s:text name="t3.label.user.selectT3Database"/></h2> -<s:form method="post" validate="true" namespace="/user"> - +<s:form method="post" validate="true" namespace="/user" action="selectUserInputDatabase"> <fieldset> <legend><s:text name="t3.label.t3.config.jdbc"/></legend> - - <s:select key="databaseId" list="databases" - label='%{getText("t3.common.userT3Database")}' - headerKey="" headerValue=""/> - - <s:textfield name="database.url" requiredLabel="true" size="40" - label='%{getText("t3.common.url")}'/> - - <s:textfield name="database.login" requiredLabel="true" size="40" - label='%{getText("t3.common.login")}'/> - - <s:password name="database.password" requiredLabel="true" size="40" - label='%{getText("t3.common.password")}' + <s:select key="databaseId" list="databases" label='%{getText("t3.common.userT3Database")}' headerKey="" + headerValue=""/> + <s:textfield name="database.url" requiredLabel="true" size="40" label='%{getText("t3.common.url")}'/> + <s:textfield name="database.login" requiredLabel="true" size="40" label='%{getText("t3.common.login")}'/> + <s:password name="database.password" requiredLabel="true" size="40" label='%{getText("t3.common.password")}' autocomplete='off'/> </fieldset> <br/> - <s:submit action="selectUserInputDatabase" method="execute" - key="t3.action.connectToDatabase" align="right"/> + <s:submit key="t3.action.connectToDatabase" align="right"/> </s:form> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/8b5f382631e64ed4e5956388c3bb977d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/8b5f382631e64ed4e5956388c3bb977d… You're receiving this email because of your account on gitlab.com.

1 0