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

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

05 Apr '18

Tony CHEMIT pushed to branch release/2.6 at ultreiaio / ird-t3 Commits: fadf16a7 by Tony CHEMIT at 2018-04-05T17:04:02Z [jgitflow-maven-plugin]updating poms for branch'release/2.6' 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.6-SNAPSHOT</version> + <version>2.6</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.6-SNAPSHOT</version> + <version>2.6</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.6-SNAPSHOT</version> + <version>2.6</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.6-SNAPSHOT</version> + <version>2.6</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.6-SNAPSHOT</version> + <version>2.6</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.6-SNAPSHOT</version> + <version>2.6</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.6-SNAPSHOT</version> + <version>2.6</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.6-SNAPSHOT</version> + <version>2.6</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.6-SNAPSHOT</version> + <version>2.6</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.6-SNAPSHOT</version> + <version>2.6</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.6-SNAPSHOT</version> + <version>2.6</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/fadf16a795b9296c39f893ef24d79e1b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/fadf16a795b9296c39f893ef24d79e1b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][master] 13 commits: [jgitflow-maven-plugin]updating poms for 2.6-SNAPSHOT development[skip ci]
by Tony CHEMIT 05 Apr '18

05 Apr '18

Tony CHEMIT pushed to branch master at ultreiaio / ird-t3 Commits: 8230971e by Tony CHEMIT at 2018-03-23T19:08:34Z [jgitflow-maven-plugin]updating poms for 2.6-SNAPSHOT development[skip ci] - - - - - eec7d7d5 by Tony CHEMIT at 2018-03-23T19:15:11Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - dee53485 by Tony CHEMIT at 2018-03-23T19:15:11Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 1d637fad by Tony CHEMIT at 2018-03-23T19:15:11Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 4e78f0c0 by Tony CHEMIT at 2018-03-23T19:45:33Z fix ci [skip ci] - - - - - a580a2c3 by Tony CHEMIT at 2018-03-30T09:44:16Z fix doc - - - - - 77fda386 by Tony CHEMIT at 2018-03-30T09:45:30Z add comment in installer - - - - - b9691baf by Tony CHEMIT at 2018-03-30T11:14:34Z [IMPORT] Il manque un lien «Importer une autre marée» (closes #304) - - - - - 83f43d07 by Tony CHEMIT at 2018-04-04T20:27:58Z Correction des captures à utiliser dans le niveau 3 (See #263) - - - - - f7b27df4 by Tony CHEMIT at 2018-04-05T15:39:09Z [N3] Option à supprimer sur le N3 (closes #307) - - - - - a4966d74 by Tony CHEMIT at 2018-04-05T16:56:16Z Mise en page de certains écrans de configuration (Closes #306) - - - - - fadf16a7 by Tony CHEMIT at 2018-04-05T17:04:02Z [jgitflow-maven-plugin]updating poms for branch'release/2.6' with non-snapshot versions[skip ci] - - - - - e129e104 by Tony CHEMIT at 2018-04-05T17:08:49Z [jgitflow-maven-plugin]merging 'release/2.6' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - pom.xml - src/site/markdown/installer.md.vm - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Configuration.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl - t3-domain/pom.xml - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-installer/src/main/assembly/dist/db.properties - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-web/pom.xml - t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3ConfigureAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java - t3-web/src/main/resources/i18n/t3-web_en_GB.properties - t3-web/src/main/resources/i18n/t3-web_fr_FR.properties - t3-web/src/main/webapp/WEB-INF/jsp/admin/deleteTripConfirm.jsp - t3-web/src/main/webapp/WEB-INF/jsp/admin/tripListGrid.jsp - t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF2Config.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeSetDurationAndPositiveSetCountConfig.jsp The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/d2f28d83aa7cf8c5f09558b4f1adc31… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/d2f28d83aa7cf8c5f09558b4f1adc31… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/2.6' with non-snapshot versions[skip ci]
by Tony CHEMIT 05 Apr '18

05 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: fadf16a7 by Tony CHEMIT at 2018-04-05T17:04:02Z [jgitflow-maven-plugin]updating poms for branch'release/2.6' with non-snapshot versions[skip ci] - - - - - e129e104 by Tony CHEMIT at 2018-04-05T17:08:49Z [jgitflow-maven-plugin]merging 'release/2.6' into 'master' - - - - - 2d413e07 by Tony CHEMIT at 2018-04-05T17:08:50Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 3001ed31 by Tony CHEMIT at 2018-04-05T17:08:50Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 77c55a5f by Tony CHEMIT at 2018-04-05T17:08:51Z [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/194c302a517ce920546a3e470694964… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/194c302a517ce920546a3e470694964… 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.7-SNAPSHOT development[skip ci]
by Tony CHEMIT 05 Apr '18

05 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 194c302a by Tony CHEMIT at 2018-04-05T17:01:09Z [jgitflow-maven-plugin]updating poms for 2.7-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.6-SNAPSHOT</version> + <version>2.7-SNAPSHOT</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.6-SNAPSHOT</version> + <version>2.7-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.6-SNAPSHOT</version> + <version>2.7-SNAPSHOT</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.6-SNAPSHOT</version> + <version>2.7-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.6-SNAPSHOT</version> + <version>2.7-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.6-SNAPSHOT</version> + <version>2.7-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.6-SNAPSHOT</version> + <version>2.7-SNAPSHOT</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.6-SNAPSHOT</version> + <version>2.7-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.6-SNAPSHOT</version> + <version>2.7-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.6-SNAPSHOT</version> + <version>2.7-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.6-SNAPSHOT</version> + <version>2.7-SNAPSHOT</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/194c302a517ce920546a3e4706949642… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/194c302a517ce920546a3e4706949642… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3] Pushed new branch release/2.6
by Tony CHEMIT 05 Apr '18

05 Apr '18

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

1 0

[Git][ultreiaio/ird-t3][develop] Mise en page de certains écrans de configuration (Closes #306)
by Tony CHEMIT 05 Apr '18

05 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: a4966d74 by Tony CHEMIT at 2018-04-05T16:56:16Z Mise en page de certains écrans de configuration (Closes #306) - - - - - 17 changed files: - t3-web/src/main/webapp/WEB-INF/jsp/admin/deleteTripConfirm.jsp - t3-web/src/main/webapp/WEB-INF/jsp/admin/tripListGrid.jsp - t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF2Config.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeSetDurationAndPositiveSetCountConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeTripEffortsConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeWellPlanWeightCategoriesProportionsConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level1/level1Configuration.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2ConfigurationStep2.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2Start.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3Start.jsp - t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp - t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportValidate.jsp - t3-web/src/main/webapp/css/screen.css Changes: ===================================== t3-web/src/main/webapp/WEB-INF/jsp/admin/deleteTripConfirm.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/admin/deleteTripConfirm.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/admin/deleteTripConfirm.jsp @@ -46,12 +46,11 @@ <s:hidden name="tripEditAction" label=""/> </fieldset> <br/> - <s:submit action="confirmTripDelete!doDelete" key="t3.action.deleteTrips" - align="right"/> - <s:submit action="confirmTripDelete!doDeleteComputedData" - key="t3.action.deleteComputedData" align="right"/> - <s:submit action="backToTripList" key="t3.label.admin.backToTripList" - align="right"/> + <div class="actions"> + <s:submit action="confirmTripDelete!doDelete" key="t3.action.deleteTrips" align="right"/> + <s:submit action="confirmTripDelete!doDeleteComputedData" key="t3.action.deleteComputedData" align="right"/> + <s:submit action="backToTripList" key="t3.label.admin.backToTripList" align="right"/> + </div> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/admin/tripListGrid.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/admin/tripListGrid.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/admin/tripListGrid.jsp @@ -88,9 +88,8 @@ </sjg:grid> - - + <div class="actions"> <s:submit id='confirmTripDelete' action="confirmTripDelete" method="input"/> <s:submit id='tripDetail' action="tripDetail"/> - + </div> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp @@ -116,10 +116,12 @@ <s:checkbox key="user.admin" label="%{getText('t3.common.admin')}"/> </fieldset> <br/> + <div class="actions"> <s:submit action="userForm!doCreate" key="t3.action.create" align="right"/> <s:if test="userIsAdmin"> <s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/> </s:if> + </div> </s:form> </s:if> <s:elseif test="userEditAction == 'edit'"> @@ -145,10 +147,12 @@ </fieldset> <p><s:text name="t3.label.info.changePassword"/></p> <br/> + <div class="actions"> <s:submit action="userForm!doUpdate" key="t3.action.save" align="right"/> <s:if test="userIsAdmin"> <s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/> </s:if> + </div> </s:form> <br/> @@ -221,10 +225,12 @@ <s:checkbox value="%{user.admin}" key="t3.common.admin" disabled="true"/> </fieldset> <br/> + <div class="actions"> <s:submit action="userForm!doDelete" key="t3.action.delete" align="right"/> <s:if test="userIsAdmin"> <s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/> </s:if> + </div> </s:form> </s:elseif> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp @@ -46,10 +46,10 @@ <jsp:include page="ComputeRF1ConfigResume.jsp"/> <br/> - <s:submit action="configureComputeRF1" - key="t3.action.backToConfiguration" align="right"/> + <div class="actions"> + <s:submit action="configureComputeRF1" key="t3.action.backToConfiguration" align="right"/> <s:submit action="run-ComputeRF1" key="t3.action.runAction" align="right"/> - + </div> </s:form> </s:if> @@ -96,8 +96,7 @@ </fieldset> <br/> - <s:submit action="validateComputeRF1" - key="t3.action.validateConfiguration" align="right"/> + <s:submit action="validateComputeRF1" key="t3.action.validateConfiguration" align="right"/> </s:form> </s:else> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF2Config.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF2Config.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF2Config.jsp @@ -47,10 +47,10 @@ <jsp:include page="ComputeRF2ConfigResume.jsp"/> <br/> - <s:submit action="configureComputeRF2" key="t3.action.backToConfiguration" - align="right"/> + <div class="actions"> + <s:submit action="configureComputeRF2" key="t3.action.backToConfiguration" align="right"/> <s:submit action="run-ComputeRF2" key="t3.action.runAction" align="right"/> - + </div> </s:form> </s:if> <s:else> @@ -91,8 +91,7 @@ </fieldset> <br/> - <s:submit action="validateComputeRF2" key="t3.action.validateConfiguration" - align="right"/> + <s:submit action="validateComputeRF2" key="t3.action.validateConfiguration" align="right"/> </s:form> <script type="text/javascript"> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeSetDurationAndPositiveSetCountConfig.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeSetDurationAndPositiveSetCountConfig.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeSetDurationAndPositiveSetCountConfig.jsp @@ -43,11 +43,12 @@ <jsp:include page="ComputeSetDurationAndPositiveSetCountConfigResume.jsp"/> <br/> + <div class="actions"> <s:submit action="configureComputeSetDurationAndPositiveSetCount" key="t3.action.backToConfiguration" align="right"/> <s:submit action="run-ComputeSetDurationAndPositiveSetCount" key="t3.action.runAction" align="right"/> - + </div> </s:form> </s:if> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeTripEffortsConfig.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeTripEffortsConfig.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeTripEffortsConfig.jsp @@ -43,11 +43,10 @@ <jsp:include page="ComputeTripEffortsConfigResume.jsp"/> <br/> - <s:submit action="configureComputeTripEfforts" - key="t3.action.backToConfiguration" align="right"/> - <s:submit action="run-ComputeTripEfforts" key="t3.action.runAction" - align="right"/> - + <div class="actions"> + <s:submit action="configureComputeTripEfforts" key="t3.action.backToConfiguration" align="right"/> + <s:submit action="run-ComputeTripEfforts" key="t3.action.runAction" align="right"/> + </div> </s:form> </s:if> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeWellPlanWeightCategoriesProportionsConfig.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeWellPlanWeightCategoriesProportionsConfig.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeWellPlanWeightCategoriesProportionsConfig.jsp @@ -43,11 +43,10 @@ <jsp:include page="ComputeWellPlanWeightCategoriesProportionsConfigResume.jsp"/> <br/> - <s:submit action="configureComputeWellPlanWeightCategoriesProportions" - key="t3.action.backToConfiguration" align="right"/> - <s:submit action="run-ComputeWellPlanWeightCategoriesProportions" key="t3.action.runAction" - align="right"/> - + <div class="actions"> + <s:submit action="configureComputeWellPlanWeightCategoriesProportions" key="t3.action.backToConfiguration" align="right"/> + <s:submit action="run-ComputeWellPlanWeightCategoriesProportions" key="t3.action.runAction" align="right"/> + </div> </s:form> </s:if> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfig.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfig.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfig.jsp @@ -43,11 +43,10 @@ <jsp:include page="ConvertCatchesWeightCategoriesConfigResume.jsp"/> <br/> - <s:submit action="configureConvertCatchesWeightCategories" - key="t3.action.backToConfiguration" align="right"/> - <s:submit action="run-ConvertCatchesWeightCategories" - key="t3.action.runAction" align="right"/> - + <div class="actions"> + <s:submit action="configureConvertCatchesWeightCategories" key="t3.action.backToConfiguration" align="right"/> + <s:submit action="run-ConvertCatchesWeightCategories" key="t3.action.runAction" align="right"/> + </div> </s:form> </s:if> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level1/level1Configuration.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level1/level1Configuration.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level1/level1Configuration.jsp @@ -108,19 +108,16 @@ </fieldset> <br/> + <div class="actions"> <s:if test="configurationInSession"> <%--Can remove configuration--%> - <s:submit action="removeLevel1Configuration" - key="t3.action.remove.configuration" - align="right"/> + <s:submit action="removeLevel1Configuration" key="t3.action.remove.configuration" align="right"/> </s:if> <%--validate + save configuration--%> - <s:submit action="validateLevel1Configuration" - key="t3.action.save.configuration" - align="right"/> - + <s:submit action="validateLevel1Configuration" key="t3.action.save.configuration" align="right"/> + </div> </s:form> <s:if test="confirm && configurationInSession"> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2ConfigurationStep2.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2ConfigurationStep2.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2ConfigurationStep2.jsp @@ -73,7 +73,7 @@ </fieldset> <br/> - + <div class="actions"> <%-- back to step 1 --%> <s:submit action="configureLevel2Step1!input" key="t3.action.back.to.configuration.step1" align="right"/> @@ -82,5 +82,5 @@ <%--validate + go to resume --%> <s:submit action="configureLevel2Step2" key="t3.action.validate.configuration" align="right"/> </s:if> - + </div> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2Start.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2Start.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2Start.jsp @@ -35,7 +35,7 @@ <jsp:include page="level2ConfigurationResume.jsp"/> <br/> - + <div class="actions"> <%-- back to step 1 --%> <s:submit action="configureLevel2Step1!input" key="t3.action.back.to.configuration.step1" align="right"/> @@ -44,5 +44,5 @@ <%-- launch action --%> <s:submit action="configureLevel2Resume" key="t3.action.runAction" align="right"/> - + </div> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp @@ -100,10 +100,14 @@ <s:if test="!missingData"> <br/> + <div class="actions"> + <%-- back to step 1 --%> <s:submit action="configureLevel3Step1!input" key="t3.action.back.to.configuration.step1" align="right"/> <%--validate + go to resume --%> <s:submit action="configureLevel3Step2" key="t3.action.validate.configuration" align="right"/> + + </div> </s:if> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3Start.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3Start.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3Start.jsp @@ -35,6 +35,7 @@ <jsp:include page="level3ConfigurationResume.jsp"/> <br/> + <div class="actions"> <%-- back to step 1 --%> <s:submit action="configureLevel3Step1!input" key="t3.action.back.to.configuration.step1" align="right"/> @@ -43,5 +44,5 @@ <%-- launch action --%> <s:submit action="configureLevel3Resume" key="t3.action.runAction" align="right"/> - + </div> </s:form> ===================================== 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 @@ -66,7 +66,6 @@ <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"/> <br/> <div class="cleanBoth"> @@ -74,6 +73,9 @@ <s:param value="%{maxSize}"/> </s:text> </div> + <div class="actions"> + <s:submit action="configureImportData!doAddSource" key="t3.action.importData.addSource" align="right"/> + </div> </s:if> <s:else> <s:hidden key="loadedSource" label=''/> @@ -84,8 +86,10 @@ <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")}'/> + <div class="actions"> <s:submit action="configureImportData!doDeleteSource" key="t3.action.importData.deleteSource" align="right"/> <s:submit action="configureImportData!doPrepareAnalyze" key="t3.action.importData.analyze" align="right"/> + </div> </s:else> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportValidate.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportValidate.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportValidate.jsp @@ -31,9 +31,8 @@ <jsp:include page="exportConfigResume.jsp"/> - <s:submit action="configureExport!input" align="right" - key="t3.action.backToConfiguration"/> - + <div class="actions"> + <s:submit action="configureExport!input" align="right" key="t3.action.backToConfiguration"/> <s:submit action="runExport" key="t3.action.launch.export" align="right"/> - + </div> </s:form> ===================================== t3-web/src/main/webapp/css/screen.css ===================================== --- a/t3-web/src/main/webapp/css/screen.css +++ b/t3-web/src/main/webapp/css/screen.css @@ -117,6 +117,13 @@ fieldset, hr , .cleanBoth{ padding-top: 0.3em; } + +.wwgrp{ + float: left; + clear: both; + margin-bottom: 10px; +} + .wwlbl { float: left; clear: both; @@ -136,6 +143,16 @@ div.errorMessage{ clear: both; float: left; } + +.actions input[type=submit] { + margin-left:5px; +} +.actions { + clear: both; + display: flex; + flex-flow: row; + justify-content: flex-end; +} .errorMessage { background: url("../images/exclamation.png") no-repeat ; list-style: none; View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a4966d7401c0dddd0fae94ac912ed954… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a4966d7401c0dddd0fae94ac912ed954… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [N3] Option à supprimer sur le N3 (closes #307)
by Tony CHEMIT 05 Apr '18

05 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: f7b27df4 by Tony CHEMIT at 2018-04-05T15:39:09Z [N3] Option à supprimer sur le N3 (closes #307) - - - - - 14 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Configuration.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl - t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3ConfigureAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java - t3-web/src/main/resources/i18n/t3-web_en_GB.properties - t3-web/src/main/resources/i18n/t3-web_fr_FR.properties - t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationResume.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep1.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java @@ -334,7 +334,6 @@ public class Level3Action extends T3Action<Level3Configuration> { String key = aCatch.getWeightCategoryTreatment().getTopiaId() + aCatch.getSpecies().getTopiaId(); linearCorrectedCatches.put(key, aCatch); } - boolean useWeightCategories = getConfiguration().isUseWeightCategories(); // Generate for each species to fix for (Species aSpecies : catchSpecies) { // get all compositions for this species @@ -350,34 +349,19 @@ public class Level3Action extends T3Action<Level3Configuration> { continue; } LengthWeightConversion conversions = catchStratum.getConfiguration().getConversionHelper().getConversions(aSpecies); - if (useWeightCategories) { - for (WeightCategoryTreatment weightCategory : weightCategories) { - // get total catch weight for this species and weight category - String key = weightCategory.getTopiaId() + aSpecies.getTopiaId(); - CorrectedElementaryCatch aCatch = linearCorrectedCatches.get(key); - if (aCatch != null) { - // get weight to use in this stratum (in kg) - float totalWeight = 1000 * aCatch.getCorrectedCatchWeight() / nbZones; - // get composition for this weight category - LengthCompositionModel model = compositionModel.getModel(weightCategory); - generateFrequencies(activity, aSpecies, previousValues, model, totalWeight, speciesCountModel, conversions); - } - } - } else { - float totalWeight = 0f; - for (WeightCategoryTreatment weightCategory : weightCategories) { - // get total catch weight for this species and weight category - String key = weightCategory.getTopiaId() + aSpecies.getTopiaId(); - CorrectedElementaryCatch aCatch = linearCorrectedCatches.get(key); - if (aCatch != null) { - totalWeight += aCatch.getCorrectedCatchWeight(); - } + float totalWeight = 0f; + for (WeightCategoryTreatment weightCategory : weightCategories) { + // get total catch weight for this species and weight category + String key = weightCategory.getTopiaId() + aSpecies.getTopiaId(); + CorrectedElementaryCatch aCatch = linearCorrectedCatches.get(key); + if (aCatch != null) { + totalWeight += aCatch.getCorrectedCatchWeight(); } - totalWeight = 1000 * totalWeight / nbZones; - // get composition for all weight categories - LengthCompositionModel model = compositionModel.getTotalModel(); - generateFrequencies(activity, aSpecies, previousValues, model, totalWeight, speciesCountModel, conversions); } + totalWeight = 1000 * totalWeight / nbZones; + // get composition for all weight categories + LengthCompositionModel model = compositionModel.getTotalModel(); + generateFrequencies(activity, aSpecies, previousValues, model, totalWeight, speciesCountModel, conversions); } } } ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Configuration.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Configuration.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Configuration.java @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as 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, * but WITHOUT ANY WARRANTY; without even the implied warranty of * 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 Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% @@ -48,13 +48,6 @@ public class Level3Configuration extends LevelConfigurationWithStratum { */ private boolean useAllSamplesOfStratum; - /** - * Use weight categories when generating frequencies, or not. - * - * @since 2.0 - */ - private boolean useWeightCategories; - public Map<String, StratumMinimumSampleCount> getStratumMinimumSampleCount() { return stratumMinimumSampleCount; } @@ -71,14 +64,6 @@ public class Level3Configuration extends LevelConfigurationWithStratum { this.useAllSamplesOfStratum = useAllSamplesOfStratum; } - public boolean isUseWeightCategories() { - return useWeightCategories; - } - - public void setUseWeightCategories(boolean useWeightCategories) { - this.useWeightCategories = useWeightCategories; - } - @Override public String getName(Locale locale) { return l(locale, "t3.level3.action"); ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl @@ -42,12 +42,6 @@ Utilisation des catégories de poids +10/-10 dans la stratification. Catégories de poids +10/-10 non utilisés dans la stratification. </#if> -<#if configuration.useWeightCategories> -Générer les structures de tailles par catégories de poids -<#else> -Générer les structures de tailles toutes catégories de poids confondues -</#if> - <#list oceans?values as ocean> Océan sélectionné : ${ocean} </#list> ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl @@ -42,12 +42,6 @@ Use weight categories +10/-10 in stratification. Do not use weight categories +10/-10 in stratification. </#if> -<#if configuration.useWeightCategories> -Generate length structures by weight category -<#else> -Generate length structures for all weight categories -</#if> - <#list oceans?values as ocean> Selected ocean: ${ocean} </#list> ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java @@ -316,12 +316,6 @@ public class T3ActionSupport extends ActionSupport implements T3TopiaPersistence "true", t("t3.label.data.level3.configuration.useAllSamples")); } - protected ImmutableMap<String, String> createLevel3UseWeightCategoriesOrNotMap() { - return ImmutableMap.of( - "true", t("t3.label.data.level3.configuration.useWeightCategories"), - "false", t("t3.label.data.level3.configuration.ignoreWeightCategories")); - } - protected ImmutableMap<String, String> createUseRfMinus10AndRfPlus10OrNot() { return ImmutableMap.of( "true", t("t3.label.data.level1.configuration.useRfMinus10AndRfPlus10"), ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java @@ -109,7 +109,6 @@ public class ConfigureLevel3Step1Action extends AbstractConfigureAction<Level3Co conf.setOceans(sortToList(oceanDAO.findAllUsedInActivity())); conf.setSpecies(sortToList(specieDAO.findAllSpeciesUsedInCatch())); conf.setZoneTypes(sortToList(getZoneStratumService().getZoneStratumAwareMetas())); - conf.setUseWeightCategories(true); } if (StringUtils.isNotEmpty(conf.getZoneTypeId())) { // let's fill the zone versions for the selected zone type ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java @@ -25,7 +25,6 @@ import fr.ird.t3.actions.stratum.SchoolTypeIndeterminate; import fr.ird.t3.actions.stratum.StratumMinimumSampleCount; import fr.ird.t3.entities.reference.Country; import fr.ird.t3.entities.reference.CountryTopiaDao; -import fr.ird.t3.entities.reference.SchoolTypeTopiaDao; import fr.ird.t3.entities.reference.Species; import fr.ird.t3.services.ioc.InjectDAO; import fr.ird.t3.services.ioc.InjectDecoratedBeans; @@ -66,7 +65,6 @@ public class ConfigureLevel3Step2Action extends AbstractConfigureAction<Level3Co private Map<String, String> species; private Map<String, String> schoolTypeIndeterminate; private Map<String, String> useSamplesOrNot; - private Map<String, String> useWeightCategoriesOrNot; private Map<String, String> useWeightCategoriesInStratumOrNot; /** * Flag to know if some data are missing. @@ -82,7 +80,6 @@ public class ConfigureLevel3Step2Action extends AbstractConfigureAction<Level3Co @Override public void prepare() throws Exception { useSamplesOrNot = createLevel3UseSamplesOrNotMap(); - useWeightCategoriesOrNot = createLevel3UseWeightCategoriesOrNotMap(); useWeightCategoriesInStratumOrNot = createUseWeightCategoriesInStratumOrNot(); schoolTypeIndeterminate = sortAndDecorateIdAbles(Arrays.asList(SchoolTypeIndeterminate.values())); // on level 3, can't treat Indeterminate school type @@ -279,11 +276,6 @@ public class ConfigureLevel3Step2Action extends AbstractConfigureAction<Level3Co } @SuppressWarnings("unused") - public Map<String, String> getUseWeightCategoriesOrNot() { - return useWeightCategoriesOrNot; - } - - @SuppressWarnings("unused") public Map<String, String> getUseWeightCategoriesInStratumOrNot() { return useWeightCategoriesInStratumOrNot; } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3ConfigureAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3ConfigureAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3ConfigureAction.java @@ -74,7 +74,6 @@ public class Level3ConfigureAction extends AbstractConfigureAction<Level3Configu private Map<String, String> sampleFlags; private Map<String, String> schoolTypeIndeterminate; private Map<String, String> useSamplesOrNot; - private Map<String, String> useWeightCategoriesOrNot; private Map<String, String> useWeightCategoriesInStratumOrNot; public Level3ConfigureAction() { @@ -85,7 +84,6 @@ public class Level3ConfigureAction extends AbstractConfigureAction<Level3Configu public void prepare() throws Exception { log.info(String.format("Prepare with configuration %s", getConfiguration())); useSamplesOrNot = createLevel3UseSamplesOrNotMap(); - useWeightCategoriesOrNot = createLevel3UseWeightCategoriesOrNotMap(); useWeightCategoriesInStratumOrNot = createUseWeightCategoriesInStratumOrNot(); schoolTypeIndeterminate = sortAndDecorateIdAbles(Arrays.asList(SchoolTypeIndeterminate.values())); // on level 3, can't treat Indeterminate school type @@ -165,11 +163,6 @@ public class Level3ConfigureAction extends AbstractConfigureAction<Level3Configu } @SuppressWarnings("unused") - public Map<String, String> getUseWeightCategoriesOrNot() { - return useWeightCategoriesOrNot; - } - - @SuppressWarnings("unused") public Map<String, String> getUseWeightCategoriesInStratumOrNot() { return useWeightCategoriesInStratumOrNot; } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java @@ -72,7 +72,6 @@ public class Level3RunAction extends AbstractRunAction<Level3Configuration, Leve private Map<String, String> sampleFlags; private Map<String, String> schoolTypeIndeterminate; private Map<String, String> useSamplesOrNot; - private Map<String, String> useWeightCategoriesOrNot; private Map<String, String> useWeightCategoriesInStratumOrNot; public Level3RunAction() { @@ -145,11 +144,6 @@ public class Level3RunAction extends AbstractRunAction<Level3Configuration, Leve } @SuppressWarnings("unused") - public Map<String, String> getUseWeightCategoriesOrNot() { - return useWeightCategoriesOrNot; - } - - @SuppressWarnings("unused") public Map<String, String> getUseWeightCategoriesInStratumOrNot() { return useWeightCategoriesInStratumOrNot; } @@ -157,7 +151,6 @@ public class Level3RunAction extends AbstractRunAction<Level3Configuration, Leve @Override public void prepare() throws Exception { useSamplesOrNot = createLevel3UseSamplesOrNotMap(); - useWeightCategoriesOrNot = createLevel3UseWeightCategoriesOrNotMap(); useWeightCategoriesInStratumOrNot = createUseWeightCategoriesInStratumOrNot(); schoolTypeIndeterminate = sortAndDecorateIdAbles(Arrays.asList(SchoolTypeIndeterminate.values())); super.prepare(); ===================================== t3-web/src/main/resources/i18n/t3-web_en_GB.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_en_GB.properties +++ b/t3-web/src/main/resources/i18n/t3-web_en_GB.properties @@ -263,15 +263,12 @@ t3.label.data.level2.configuration.step1=Level 2 configuration step 1 t3.label.data.level2.configuration.step2=Level 2 configuration step 2 t3.label.data.level2.configuration.useAllSamples=Use their own sample t3.label.data.level2.configuration.useCatchSamples=Use their stratum sample -t3.label.data.level3.configuration.ignoreWeightCategories=Do not use weight categories t3.label.data.level3.configuration.resume=Level 3 configuration resume t3.label.data.level3.configuration.samplesToUse=Treatment to apply to catches with samples t3.label.data.level3.configuration.step1=Level 3 configuration step 1 t3.label.data.level3.configuration.step2=Level 3 configuration step 2 t3.label.data.level3.configuration.useAllSamples=Keep their own sample (do nothing) t3.label.data.level3.configuration.useCatchSamples=Apply length structures from the sample stratum -t3.label.data.level3.configuration.useWeightCategories=Use weight categories -t3.label.data.level3.configuration.useWeightCategoriesOrNot=Extrapolation method t3.label.data.treatment.level0=Level 0 treatment t3.label.data.treatment.level1=Level 0 treatment t3.label.data.treatment.level2=Level 2 treatment\: Species composition correction ===================================== t3-web/src/main/resources/i18n/t3-web_fr_FR.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties +++ b/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties @@ -263,15 +263,12 @@ t3.label.data.level2.configuration.step1=Configuration du niveau 2 (étape 1) t3.label.data.level2.configuration.step2=Configuration du niveau 2 (étape 2) t3.label.data.level2.configuration.useAllSamples=Les échantillons de leur strate échantillon t3.label.data.level2.configuration.useCatchSamples=Leur propre échantillon -t3.label.data.level3.configuration.ignoreWeightCategories=Extrapoler les échantillons uniformément t3.label.data.level3.configuration.resume=Résumé de la configuration t3.label.data.level3.configuration.samplesToUse=Traitement à appliquer aux calées avec échantillon t3.label.data.level3.configuration.step1=Configuration du niveau 3 (étape 1) t3.label.data.level3.configuration.step2=Configuration du niveau 3 (étape 2) t3.label.data.level3.configuration.useAllSamples=Appliquer les structures de tailles de la strate échantillons t3.label.data.level3.configuration.useCatchSamples=Conserver leurs échantillons en l'état -t3.label.data.level3.configuration.useWeightCategories=Extrapoler les échantillons proportionnellement aux captures des catégories de poids -t3.label.data.level3.configuration.useWeightCategoriesOrNot=Méthode d'extrapolation t3.label.data.treatment.level0=Traitement du niveau 0 t3.label.data.treatment.level1=Traitement du niveau 1 t3.label.data.treatment.level2=Traitement du niveau 2 \: Correction de la composition spécifique ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationResume.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationResume.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationResume.jsp @@ -68,10 +68,6 @@ <s:radio key="configuration.useAllSamplesOfStratum" disabled="true" list="useSamplesOrNot" label='%{getText("t3.label.data.level3.configuration.samplesToUse")}'/> - <%-- use weight categories --%> - <s:radio key="configuration.useWeightCategories" disabled="true" list="useWeightCategoriesOrNot" - label='%{getText("t3.label.data.level3.configuration.useWeightCategoriesOrNot")}'/> - <%--use weight categories in stratum--%> <s:radio key="configuration.useWeightCategoriesInStratum" disabled="true" list="useWeightCategoriesInStratumOrNot" label='%{getText("t3.label.data.useWeightCategoriesInStratum")}'/> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep1.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep1.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep1.jsp @@ -99,10 +99,6 @@ label='%{getText("t3.common.endDate")}' appendText=" (mm-yyyy)"/> <%-- selected species --%> - <%--<s:iterator value="configuration.speciesIds" var="id">--%> - <%--<s:hidden name="configuration.speciesIds" value='%{#id}'/>--%> - <%--</s:iterator>--%> - <s:checkboxlist key="configuration.speciesIds" requiredLabel="true" list="species" label='%{getText("t3.common.species")}' template="mycheckboxlist"/> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp @@ -57,10 +57,6 @@ <s:radio key="configuration.useAllSamplesOfStratum" requiredLabel="true" list="useSamplesOrNot" label='%{getText("t3.label.data.level3.configuration.samplesToUse")}'/> - <%-- use weight categories --%> - <s:radio key="configuration.useWeightCategories" requiredLabel="true" list="useWeightCategoriesOrNot" - label='%{getText("t3.label.data.level3.configuration.useWeightCategoriesOrNot")}'/> - <%--use weight categories in stratum--%> <s:radio key="configuration.useWeightCategoriesInStratum" requiredLabel="true" list="useWeightCategoriesInStratumOrNot" label='%{getText("t3.label.data.useWeightCategoriesInStratum")}'/> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/f7b27df40d4086b84428812cf752bc05… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/f7b27df40d4086b84428812cf752bc05… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Correction des captures à utiliser dans le niveau 3 (See #263)
by Tony CHEMIT 04 Apr '18

04 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 83f43d07 by Tony CHEMIT at 2018-04-04T20:27:58Z Correction des captures à utiliser dans le niveau 3 (See #263) - - - - - 1 changed file: - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java @@ -324,12 +324,13 @@ public class Level3Action extends T3Action<Level3Configuration> { addInfoMessage(message); Map<Species, LengthCompositionAggregateModel> compositionModels = sampleStratum.getCompositionModel(); // get all species found in catches - Set<Species> catchSpecies = new HashSet<>(ActivityTopiaDao.getSpecies(activity.getCorrectedElementaryCatch())); + Collection<CorrectedElementaryCatch> correctedElementaryCatch = catchStratum.getCorrectedElementaryCatch(activity); + Set<Species> catchSpecies = new HashSet<>(ActivityTopiaDao.getSpecies(correctedElementaryCatch)); // and keep only the one to fix catchSpecies.retainAll(inputContext.getSpecies()); // compute a linear representation of corrected catches (by species and weight category) Map<String, CorrectedElementaryCatch> linearCorrectedCatches = new TreeMap<>(); - for (CorrectedElementaryCatch aCatch : activity.getCorrectedElementaryCatch()) { + for (CorrectedElementaryCatch aCatch : correctedElementaryCatch) { String key = aCatch.getWeightCategoryTreatment().getTopiaId() + aCatch.getSpecies().getTopiaId(); linearCorrectedCatches.put(key, aCatch); } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/83f43d07db50243d7521760b764cb023… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/83f43d07db50243d7521760b764cb023… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [IMPORT] Il manque un lien «Importer une autre marée» (closes #304)
by Tony CHEMIT 30 Mar '18

30 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: b9691baf by Tony CHEMIT at 2018-03-30T11:14:34Z [IMPORT] Il manque un lien «Importer une autre marée» (closes #304) - - - - - 1 changed file: - t3-web/src/main/webapp/WEB-INF/jsp/io/input/analyzeImportDataResult.jsp Changes: ===================================== 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 @@ -60,4 +60,7 @@ </s:param> </s:text> </p> + <s:a action="configureImportData!input" namespace="/io"> + <s:text name="t3.menu.io.importData.again"/> + </s:a> </s:else> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b9691bafff893aa5ca916b1e7b870e39… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b9691bafff893aa5ca916b1e7b870e39… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] add comment in installer
by Tony CHEMIT 30 Mar '18

30 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 77fda386 by Tony CHEMIT at 2018-03-30T09:45:30Z add comment in installer - - - - - 1 changed file: - t3-installer/src/main/assembly/dist/db.properties Changes: ===================================== t3-installer/src/main/assembly/dist/db.properties ===================================== --- a/t3-installer/src/main/assembly/dist/db.properties +++ b/t3-installer/src/main/assembly/dist/db.properties @@ -23,5 +23,5 @@ login=t3-admin # Super user password that can create and should be also owner of all t3 databases password=a -# Url pattern used to connect to any base +# Url pattern used to connect to any base (if you need to change it, please keep the %s, it will be replaced by db name) url=jdbc:postgresql:%s \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/77fda386c6d955160fc5fe503df18e46… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/77fda386c6d955160fc5fe503df18e46… You're receiving this email because of your account on gitlab.com.

1 0