June 2014 - Wao-commits - mailman.cloud.codelutin.com

Build failed in Jenkins: wao-nightly » Wao :: Web #57
by admin+ci-codelutin.com＠codelutin.com June 5, 2014

June 5, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/57/chang…> Changes: [bleny] introduce CacheInvalidationTopiaEntityListener ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Wao :: Web 4.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-web --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-web --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-web --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-web --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ wao-web --- [INFO] Will create or update license file [agpl_v3] to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/LICEN…> [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ wao-web --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/l…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/l…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/l…> [INFO] [INFO] --- i18n-maven-plugin:3.1:parserStruts2 (parseJsp) @ wao-web --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…,> includes:[**/*.jsp] [INFO] 23 file(s) to process (among 23 files) [INFO] Parsing is done. [treated file(s) : 20/23](total time:1.137s) ( ~ 49.427ms / file) [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (parseOthersAndGen) @ wao-web --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…,> includes:[**/*.java] [INFO] 67 file(s) to process (among 67 files) [INFO] Parsing is done. [treated file(s) : 22/67](total time:2.374s) ( ~ 35.434ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-web >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ wao-web --- [INFO] config - basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 199796ns [INFO] import getter struts2.getter in 326225ns [INFO] Copying wao-web.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] Copying wao-web.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-web <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-web --- [INFO] config - src basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] config - out basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 20/548 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] >>> i18n-maven-plugin:3.1:bundle (parseOthersAndGen) @ wao-web >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ wao-web --- [INFO] detected i18n artifact fr.ifremer:wao-persistence:4.0-SNAPSHOT [INFO] detected i18n artifact fr.ifremer:wao-services:4.0-SNAPSHOT [INFO] detected i18n artifact org.nuiton:nuiton-csv:3.0-rc-2 [INFO] detected i18n artifact org.nuiton:nuiton-utils:3.0-20140604.092010-29 [INFO] detected i18n artifact org.nuiton:nuiton-validator:3.0-rc-1 [INFO] detected i18n artifact org.nuiton.web:nuiton-struts2:1.16 [INFO] detected i18n artifact fr.ifremer:wao-web:4.0-SNAPSHOT [INFO] generate collected i18n artifacts for locale fr_FR [INFO] collected 7 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] generate collected i18n artifacts for locale en_GB [INFO] collected 7 i18n artifacts for locale en_GB stored in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:bundle (parseOthersAndGen) @ wao-web <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:bundle (parseOthersAndGen) @ wao-web --- [INFO] config - resources dir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] config - package name : META-INF [INFO] config - bundle name : wao [INFO] config - input encoding : UTF-8 [INFO] config - output encoding : UTF-8 [INFO] config - locales : [fr_FR, en_GB] [INFO] config - version : 4.0 [INFO] generate bundle for locale fr_FR from 7 i18n resource(s) [INFO] i18n/nuiton-utils_fr_FR.properties [INFO] i18n/nuiton-struts2_fr_FR.properties [INFO] i18n/nuiton-csv_fr_FR.properties [INFO] i18n/nuiton-validator_fr_FR.properties [INFO] i18n/wao-persistence_fr_FR.properties [INFO] i18n/wao-services_fr_FR.properties [INFO] i18n/wao-web_fr_FR.properties [WARNING] bundle fr_FR contains 1/834 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] generate bundle for locale en_GB from 7 i18n resource(s) [INFO] i18n/nuiton-utils_en_GB.properties [INFO] i18n/nuiton-struts2_en_GB.properties [INFO] i18n/nuiton-csv_en_GB.properties [INFO] i18n/nuiton-validator_en_GB.properties [INFO] i18n/wao-persistence_en_GB.properties [INFO] i18n/wao-services_en_GB.properties [INFO] i18n/wao-web_en_GB.properties [WARNING] bundle en_GB contains 23/837 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] prepare i18n definition file in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ wao-web --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 17 resources [INFO] Copying 1 resource [INFO] Copying 2 resources [INFO] Copying 3 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ wao-web --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] Scan 185 files header done in 6.43s. [INFO] * update header on 5 files. * uptodate header on 90 files. * add header on 80 files. * ignore header on 10 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-web --- [INFO] Compiling 67 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…>:[28,31] org.apache.struts2.impl.StrutsObjectFactory in org.apache.struts2.impl has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.11:check (default) @ wao-web --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.8.2:generate-changes (jredmine-generate-changes) @ wao-web --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-web --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-web --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-web --- [INFO] Nothing to compile - all classes are up to date [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ wao-web --- [JENKINS] Recording test results [INFO] [INFO] --- maven-war-plugin:2.4:war (default-war) @ wao-web --- [INFO] Packaging webapp [INFO] Assembling webapp [wao-web] in [<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…]> [INFO] Processing war project [INFO] Copying webapp webResources [<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…]> to [<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…]> [INFO] Copying webapp resources [<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…]> [INFO] Webapp assembled in [5116 msecs] [INFO] Building war: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ wao-web >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-web --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-web --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-web --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ wao-web <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ wao-web --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ wao-web --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ wao-web --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ wao-web --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ wao-web --- [INFO] Loaded /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect-artifacts.txt [INFO] Copying wao-4.0-SNAPSHOT.war to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-web/wao-4.0-SNAPSHOT.war [INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-web/THIRD-PARTY.properties [INFO] Copying wao-4.0-SNAPSHOT-sources.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-web/wao-4.0-SNAPSHOT-sources.jar [INFO] Copying wao-4.0-SNAPSHOT-javadoc.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-web/wao-4.0-SNAPSHOT-javadoc.jar [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ wao-web --- [INFO] Copying wao-4.0-SNAPSHOT.war to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-web/wao-4.0-SNAPSHOT.war [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ wao-web --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ wao-web --- [INFO] Used declared dependencies found: [INFO] fr.ifremer:wao-persistence:jar:4.0-SNAPSHOT:compile [INFO] fr.ifremer:wao-services:jar:4.0-SNAPSHOT:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-beta-4:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] commons-io:commons-io:jar:2.4:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.1:compile [INFO] com.google.guava:guava:jar:17.0:compile [INFO] org.nuiton.web:nuiton-struts2:jar:1.16:compile [INFO] org.apache.struts:struts2-core:jar:2.3.16.3:compile [INFO] org.apache.struts.xwork:xwork-core:jar:2.3.16.3:compile [INFO] org.apache.commons:commons-collections4:jar:4.0:compile [INFO] javax.servlet:servlet-api:jar:2.5:provided [INFO] org.apache.struts:struts2-convention-plugin:jar:2.3.16.3:compile [INFO] log4j:log4j:jar:1.2.17:compile [INFO] org.jsoup:jsoup:jar:1.7.3:compile [WARNING] Unused declared dependencies found: [WARNING] net.sf.ehcache:ehcache-core:jar:2.6.9:compile [JENKINS] Archiving disabled

1 1

r2010 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 17:46:38 +0200 (Thu, 05 Jun 2014) New Revision: 2010 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2010 Log: refs #5188 add a todo Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-05 15:43:15 UTC (rev 2009) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-05 15:46:38 UTC (rev 2010) @@ -684,6 +684,8 @@ // le temps qui a vraiment été passé en mer. // temps de mer réalisé par ligne du plan = somme [arrondi-supérieur (nb d'heures total de la marée/ 24)] + + // TODO brendan 05/06/14 issue #5188 long real = 0; long estimated = 0; for (Contact contact : contacts) {

1 0

r2009 - trunk/wao-web/src/main/webapp
by lkaufmann＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: lkaufmann Date: 2014-06-05 17:43:15 +0200 (Thu, 05 Jun 2014) New Revision: 2009 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2009 Log: Refs #4997 : Modify actions menu position Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-05 15:29:20 UTC (rev 2008) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-05 15:43:15 UTC (rev 2009) @@ -573,9 +573,10 @@ text-align: center; } -table.sampling-plan .actions .dropdown-menu { - left: -367px; - width: 450px; +table.sampling-plan .actions .dropdown-menu, +table.contacts-list .actions .dropdown-menu { + left: auto; + right: 0; } #boats-list th, #boats-list td {

1 0

r2008 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by lkaufmann＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: lkaufmann Date: 2014-06-05 17:29:20 +0200 (Thu, 05 Jun 2014) New Revision: 2008 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2008 Log: Refs #4997 : Tiny display modification Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-05 15:12:29 UTC (rev 2007) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-05 15:29:20 UTC (rev 2008) @@ -429,7 +429,7 @@ </span> </s:if> </td> - <td> + <td class="align-center"> <s:if test=" ! comment.empty"> <span data-original-title="<s:property value="comment" escapeHtml="false"/>" data-toggle="tooltip" data-placement="left"> <i class="fa fa-comment"></i>

1 0

r2007 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 17:12:29 +0200 (Thu, 05 Jun 2014) New Revision: 2007 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2007 Log: remove 404 from css Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-05 14:37:27 UTC (rev 2006) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-05 15:12:29 UTC (rev 2007) @@ -379,23 +379,24 @@ margin-left: 5px; margin-right: 5px; } -#sampling-plan-filters-form, + +#sampling-plan-filters-form, #contacts-filters-form, #synthesis-filters-form { - padding-top:20px; - background:#f5f5f5 url(images/bg-filtres.jpg) repeat-x 0 bottom; - border-bottom:1px solid #CCC; + padding-top: 20px; + background-color: #f5f5f5; + border-bottom: 1px solid #ccc; } - form.filters-form .filters-group { - float: left; - margin-right: 30px; - } +form.filters-form .filters-group { + float: left; + margin-right: 30px; +} - .selected-options-container ul { - list-style-type: none; - margin: 0; - } +.selected-options-container ul { + list-style-type: none; + margin: 0; +} /** * Les boutons

1 0

r2006 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 16:37:27 +0200 (Thu, 05 Jun 2014) New Revision: 2006 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2006 Log: refs #4493 change chart label Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 14:29:53 UTC (rev 2005) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 14:37:27 UTC (rev 2006) @@ -202,7 +202,7 @@ BarChartData.BarChartDataSeries actualObservationsMyMonthsBarChartDataSeries = new BarChartData.BarChartDataSeries(); - actualObservationsMyMonthsBarChartDataSeries.setLabel(I18n.l(locale, "wao.synthesis.estimated")); + actualObservationsMyMonthsBarChartDataSeries.setLabel(I18n.l(locale, "wao.ui.samplingPlan.Actual")); for (Map.Entry<Date, Integer> actualObservationsMyMonth : actualObservationsMyMonths.entrySet()) { Date month = actualObservationsMyMonth.getKey(); String tick = WaoUtils.formatMonth(locale, month);

1 0

r2005 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 16:29:53 +0200 (Thu, 05 Jun 2014) New Revision: 2005 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2005 Log: refs #4493 fix some NPEs Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 14:15:10 UTC (rev 2004) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 14:29:53 UTC (rev 2005) @@ -410,6 +410,7 @@ HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter); hqlAndParametersBuilder.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); + hqlAndParametersBuilder.addNotNull(Contact.PROPERTY_DATA_INPUT_DATE); String hql = "select c.sampleRow.company.topiaId, c.observationEndDate, c.dataInputDate " + hqlAndParametersBuilder.getHql(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 14:15:10 UTC (rev 2004) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 14:29:53 UTC (rev 2005) @@ -76,11 +76,11 @@ } public double getDataReliabilityRatio() { + Long reliableObservationsCount = getReliableObservationsCount(); Long doneObservationsCount = getContactsStatesStatistics().get(ContactState.OBSERVATION_DONE); double ratio = 0.; - if (doneObservationsCount != null && doneObservationsCount > 0) { - double reliableObservationsCount = (double) getReliableObservationsCount(); - ratio = reliableObservationsCount / doneObservationsCount; + if (reliableObservationsCount != null && doneObservationsCount != null && doneObservationsCount > 0) { + ratio = (double) reliableObservationsCount / doneObservationsCount; } return ratio; }

1 0

r2004 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web java/fr/ifremer/wao/web/action/obsmer webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 16:15:10 +0200 (Thu, 05 Jun 2014) New Revision: 2004 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2004 Log: refs #4493 user different filter object in session for synthesis Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteContactAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -54,6 +54,8 @@ protected ContactsFilter contactsFilter; + protected ContactsFilter synthesisFilter; + public Collection<String> getMessages() { if (messages == null) { messages = Lists.newLinkedList(); @@ -143,4 +145,12 @@ public void setContactsFilter(ContactsFilter contactsFilter) { this.contactsFilter = contactsFilter; } + + public void setSynthesisFilter(ContactsFilter synthesisFilter) { + this.synthesisFilter = synthesisFilter; + } + + public ContactsFilter getSynthesisFilter() { + return synthesisFilter; + } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteContactAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteContactAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -59,7 +59,7 @@ } @Override - public String execute() throws Exception { + public String execute() { Contact contact = service.getContact(contactId); String contactCode = contact.getMainObserver().getFullName(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -299,4 +299,5 @@ session.setContactToHighlightId(updateContactCommand.getContact().getTopiaId()); return SUCCESS; } + } \ No newline at end of file Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -37,7 +37,7 @@ private static final long serialVersionUID = 1L; @Override - public String execute() throws Exception { + public String execute() { // clean boats filter from session getSession().setBoatsFilter(null); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -37,7 +37,7 @@ private static final long serialVersionUID = 1L; @Override - public String execute() throws Exception { + public String execute() { // clean contacts filter from session getSession().setContactsFilter(null); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -37,7 +37,7 @@ private static final long serialVersionUID = 1L; @Override - public String execute() throws Exception { + public String execute() { // clean sampling plan filter from session getSession().setSampleRowsFilter(null); Copied: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java (from rev 1985, trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java) =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -0,0 +1,40 @@ +package fr.ifremer.wao.web.action.obsmer; + +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * 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% + */ + +import fr.ifremer.wao.web.WaoJspActionSupport; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({@Result(name = WaoJspActionSupport.SUCCESS, type = "redirectAction", params = {"actionName", "synthesis"})}) +public class ResetSynthesisFilterAction extends WaoJspActionSupport { + + private static final long serialVersionUID = 1L; + + @Override + public String execute() { + + // clean sampling plan filter from session + getSession().setSynthesisFilter(null); + return SUCCESS; + } +} Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -28,7 +28,11 @@ @Override public void prepare() { - filter = service.newFilter(getAuthenticatedWaoUser()); + filter = getSession().getContactsFilter(); + if (filter == null) { + filter = service.newFilter(getAuthenticatedWaoUser()); + getSession().setSynthesisFilter(filter); + } } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-06-05 14:15:10 UTC (rev 2004) @@ -148,9 +148,10 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:submit action="reset-boats-filter" type="button" cssClass="btn"> - <i class="icon-reset"></i> <s:text name="wao.ui.action.reset" /> - </s:submit> + <s:url action="reset-boats-filter" id="resetFilterUrl" /> + <s:a href="%{resetFilterUrl}" cssClass="btn"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> + </s:a> <s:submit action="export-boats" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-05 14:15:10 UTC (rev 2004) @@ -207,9 +207,10 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:submit action="reset-contacts-filter" type="button" cssClass="btn"> - <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> - </s:submit> + <s:url action="reset-contacts-filter" id="resetFilterUrl" /> + <s:a href="%{resetFilterUrl}" cssClass="btn"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> + </s:a> <s:submit action="export-contacts" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-05 14:15:10 UTC (rev 2004) @@ -137,9 +137,10 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.filter" /> </s:submit> - <s:submit action="reset-sample-rows-filter" type="button" cssClass="btn"> - <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> - </s:submit> + <s:url action="reset-sample-rows-filter" id="resetFilterUrl" /> + <s:a href="%{resetFilterUrl}" cssClass="btn"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> + </s:a> <s:submit action="export-sampling-plan" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport" /> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 14:15:10 UTC (rev 2004) @@ -174,9 +174,9 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:url action="reset-synthesis-filter" id="resetSynthesisFilterUrl" /> - <s:a href="%{resetSynthesisFilterUrl}" cssClass="btn"> - <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> + <s:url action="reset-sample-rows-filter" id="resetFilterUrl" /> + <s:a href="%{resetFilterUrl}" cssClass="btn"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> </s:a> </div>

1 0

r2003 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 15:52:12 +0200 (Thu, 05 Jun 2014) New Revision: 2003 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2003 Log: refs #4493 review filter Removed: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp trunk/wao-web/src/main/webapp/wao.css Deleted: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp 2014-06-05 13:39:25 UTC (rev 2002) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp 2014-06-05 13:52:12 UTC (rev 2003) @@ -1,163 +0,0 @@ -<head> - <script> - - $(document).ready(function () { - - var contactsFilterMappings = [ - <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> - { - filterName: 'sampleRowFilter.companyIds', - filterLabel: "<s:text name="wao.ui.entity.Company"/>", - filterValuesField: 'sampleRowsFilterValues.companies', - }, - </s:if> - { - filterName: 'sampleRowFilter.sampleRowCodes', - filterLabel: "<s:text name="wao.ui.field.SampleRow.code"/>", - filterValuesField: 'sampleRowsFilterValues.sampleRowCodes', - }, - { - filterName: 'sampleRowFilter.programNames', - filterLabel: "<s:text name="wao.ui.field.SampleRow.programName"/>", - filterValuesField: 'sampleRowsFilterValues.programNames', - }, - { - filterName: 'sampleRowFilter.fishingZoneFacadeNames', - filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>", - filterValuesField: 'sampleRowsFilterValues.fishingZoneFacadeNames', - }, - { - filterName: 'sampleRowFilter.fishingZoneSectorNames', - filterLabel: "<s:text name="wao.ui.field.FishingZone.sectorName"/>", - filterValuesField: 'sampleRowsFilterValues.fishingZoneSectorNames', - }, - { - filterName: 'sampleRowFilter.fishingGearDcfIds', - filterLabel: "<s:text name="wao.ui.entity.fishingGearDCF"/>", - filterValuesField: 'sampleRowsFilterValues.fishingGearDcfs', - }, - { - filterName: 'sampleRowFilter.targetSpeciesDcfIds', - filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDCF"/>", - filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs', - }, - { - filterName: 'boatFilter.boatIds', - filterLabel: "<s:text name="wao.ui.entity.Boat"/>", - filterValuesField: 'boatsFilterValues.boats', - minimumInputLength: 3 - }, - { - filterName: 'boatFilter.districtIds', - filterLabel: "<s:text name="wao.ui.field.Boat.district"/>", - filterValuesField: 'boatsFilterValues.districts' - }, - { - filterName: 'observerIds', - filterLabel: "<s:text name="wao.ui.misc.observer"/>", - filterValuesField: 'observers' - }, - { - filterName: 'contactStates', - filterLabel: "<s:text name="wao.ui.field.Contact.contactState"/>", - filterValuesField: 'contactStates' - }, - { - filterName: 'companyAcceptations', - filterLabel: "<s:text name="wao.ui.field.Contact.validationCompany"/>", - filterValuesField: 'companyAcceptations' - }, - { - filterName: 'programAcceptations', - filterLabel: "<s:text name="wao.ui.field.Contact.validationProgram"/>", - filterValuesField: 'programAcceptations' - }, - { - filterName: 'observedDataControls', - filterLabel: "<s:text name="wao.ui.field.Contact.observedDataControl"/>", - filterValuesField: 'observedDataControls' - }, - { - filterName: 'dataReliabilities', - filterLabel: "<s:text name="wao.ui.field.Contact.dataReliability"/>", - filterValuesField: 'dataReliabilities' - } - ]; - - filter = <s:property value="filter" escapeHtml="false"/>; - - contactsFilterController2 = new FilterController2(contactsFilterMappings, filter, WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form fieldset.extra-filters')); - contactsFilterController2.init(); - - }); - - </script> -</head> - - -<s:form method="GET" id="contacts-filters-form" cssClass="filters-form"> - - <fieldset> - - <s:textfield name="filter.periodFrom" - label="%{getText('wao.ui.form.periodFrom')}" - placeholder="%{getFilterPeriodFromPlaceholder()}" - cssClass="input-small"/> - - <s:textfield name="filter.periodTo" - label="%{getText('wao.ui.form.period.to')}" - placeholder="%{getFilterPeriodToPlaceholder()}" - cssClass="input-small"/> - - <s:checkbox name="filter.filterOnObservationBeginDate" - label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> - - </fieldset> - - <fieldset class="extra-filters"> - - </fieldset> - - <fieldset> - - <s:checkbox name="filter.mammalsObservationOnly" - label="%{getText('wao.ui.misc.observations')}"/> - - <s:checkbox name="filter.mammalsCaptureOnly" - label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> - - <s:checkbox name="filter.commentDefinedOnly" - label="%{getText('wao.ui.field.Contact.comment')}"/> - - <s:checkbox name="filter.commentCompanyDefinedOnly" - label="%{getText('wao.ui.field.Contact.commentCompany')}"/> - - <s:checkbox name="filter.commentAdminDefinedOnly" - label="%{getText('wao.ui.field.Contact.commentAdmin')}"/> - - </fieldset> - - <fieldset> - - <s:checkbox name="filter.sortedByBoardingDate" - label="%{getText('wao.ui.form.sortByTideBegin')}"/> - - </fieldset> - - <div class="form-actions"> - - <s:submit type="button" cssClass="btn btn-primary"> - <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> - </s:submit> - - <s:submit action="reset-contacts-filter" type="button" cssClass="btn"> - <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> - </s:submit> - - <s:submit action="export-contacts" type="button" cssClass="btn"> - <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> - </s:submit> - - </div> - -</s:form> \ No newline at end of file Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-05 13:39:25 UTC (rev 2002) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-05 13:52:12 UTC (rev 2003) @@ -32,6 +32,92 @@ $(document).ready(function () { + var contactsFilterMappings = [ + <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> + { + filterName: 'sampleRowFilter.companyIds', + filterLabel: "<s:text name="wao.ui.entity.Company"/>", + filterValuesField: 'sampleRowsFilterValues.companies', + }, + </s:if> + { + filterName: 'sampleRowFilter.sampleRowCodes', + filterLabel: "<s:text name="wao.ui.field.SampleRow.code"/>", + filterValuesField: 'sampleRowsFilterValues.sampleRowCodes', + }, + { + filterName: 'sampleRowFilter.programNames', + filterLabel: "<s:text name="wao.ui.field.SampleRow.programName"/>", + filterValuesField: 'sampleRowsFilterValues.programNames', + }, + { + filterName: 'sampleRowFilter.fishingZoneFacadeNames', + filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>", + filterValuesField: 'sampleRowsFilterValues.fishingZoneFacadeNames', + }, + { + filterName: 'sampleRowFilter.fishingZoneSectorNames', + filterLabel: "<s:text name="wao.ui.field.FishingZone.sectorName"/>", + filterValuesField: 'sampleRowsFilterValues.fishingZoneSectorNames', + }, + { + filterName: 'sampleRowFilter.fishingGearDcfIds', + filterLabel: "<s:text name="wao.ui.entity.fishingGearDCF"/>", + filterValuesField: 'sampleRowsFilterValues.fishingGearDcfs', + }, + { + filterName: 'sampleRowFilter.targetSpeciesDcfIds', + filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDCF"/>", + filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs', + }, + { + filterName: 'boatFilter.boatIds', + filterLabel: "<s:text name="wao.ui.entity.Boat"/>", + filterValuesField: 'boatsFilterValues.boats', + minimumInputLength: 3 + }, + { + filterName: 'boatFilter.districtIds', + filterLabel: "<s:text name="wao.ui.field.Boat.district"/>", + filterValuesField: 'boatsFilterValues.districts' + }, + { + filterName: 'observerIds', + filterLabel: "<s:text name="wao.ui.misc.observer"/>", + filterValuesField: 'observers' + }, + { + filterName: 'contactStates', + filterLabel: "<s:text name="wao.ui.field.Contact.contactState"/>", + filterValuesField: 'contactStates' + }, + { + filterName: 'companyAcceptations', + filterLabel: "<s:text name="wao.ui.field.Contact.validationCompany"/>", + filterValuesField: 'companyAcceptations' + }, + { + filterName: 'programAcceptations', + filterLabel: "<s:text name="wao.ui.field.Contact.validationProgram"/>", + filterValuesField: 'programAcceptations' + }, + { + filterName: 'observedDataControls', + filterLabel: "<s:text name="wao.ui.field.Contact.observedDataControl"/>", + filterValuesField: 'observedDataControls' + }, + { + filterName: 'dataReliabilities', + filterLabel: "<s:text name="wao.ui.field.Contact.dataReliability"/>", + filterValuesField: 'dataReliabilities' + } + ]; + + filter = <s:property value="filter" escapeHtml="false"/>; + + contactsFilterController2 = new FilterController2(contactsFilterMappings, filter, WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form fieldset.extra-filters')); + contactsFilterController2.init(); + $('#switch-compact-full-view').click(function () { $('#switch-compact-full-view').toggleClass('full-view').toggleClass('compact-view'); $('table.contacts-list').toggleClass('full-view').toggleClass('compact-view'); @@ -66,8 +152,73 @@ <content tag="mainClass">large</content> <content tag="contactsMenuItemClass">active</content> -<%@include file="contacts-filter.jsp"%> +<s:form method="GET" id="contacts-filters-form" cssClass="filters-form"> + <fieldset> + + <s:textfield name="filter.periodFrom" + label="%{getText('wao.ui.form.periodFrom')}" + placeholder="%{getFilterPeriodFromPlaceholder()}" + cssClass="input-small"/> + + <s:textfield name="filter.periodTo" + label="%{getText('wao.ui.form.period.to')}" + placeholder="%{getFilterPeriodToPlaceholder()}" + cssClass="input-small"/> + + <s:checkbox name="filter.filterOnObservationBeginDate" + label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> + + </fieldset> + + <fieldset class="extra-filters"> + + </fieldset> + + <fieldset> + + <s:checkbox name="filter.mammalsObservationOnly" + label="%{getText('wao.ui.misc.observations')}"/> + + <s:checkbox name="filter.mammalsCaptureOnly" + label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> + + <s:checkbox name="filter.commentDefinedOnly" + label="%{getText('wao.ui.field.Contact.comment')}"/> + + <s:checkbox name="filter.commentCompanyDefinedOnly" + label="%{getText('wao.ui.field.Contact.commentCompany')}"/> + + <s:checkbox name="filter.commentAdminDefinedOnly" + label="%{getText('wao.ui.field.Contact.commentAdmin')}"/> + + </fieldset> + + <fieldset> + + <s:checkbox name="filter.sortedByBoardingDate" + label="%{getText('wao.ui.form.sortByTideBegin')}"/> + + </fieldset> + + <div class="form-actions"> + + <s:submit type="button" cssClass="btn btn-primary"> + <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> + </s:submit> + + <s:submit action="reset-contacts-filter" type="button" cssClass="btn"> + <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> + </s:submit> + + <s:submit action="export-contacts" type="button" cssClass="btn"> + <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> + </s:submit> + + </div> + +</s:form> + <h3> <s:text name="wao.ui.contacts.title"> <s:param value="%{pagination.nbRecords}"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 13:39:25 UTC (rev 2002) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 13:52:12 UTC (rev 2003) @@ -45,6 +45,77 @@ $(document).ready(function() { + var contactsFilterMappings = [ + <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> + { + filterName: 'sampleRowFilter.companyIds', + filterLabel: "<s:text name="wao.ui.entity.Company"/>", + filterValuesField: 'sampleRowsFilterValues.companies', + }, + </s:if> + { + filterName: 'sampleRowFilter.sampleRowCodes', + filterLabel: "<s:text name="wao.ui.field.SampleRow.code"/>", + filterValuesField: 'sampleRowsFilterValues.sampleRowCodes', + }, + { + filterName: 'sampleRowFilter.programNames', + filterLabel: "<s:text name="wao.ui.field.SampleRow.programName"/>", + filterValuesField: 'sampleRowsFilterValues.programNames', + }, + { + filterName: 'sampleRowFilter.fishingZoneFacadeNames', + filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>", + filterValuesField: 'sampleRowsFilterValues.fishingZoneFacadeNames', + }, + { + filterName: 'sampleRowFilter.fishingZoneSectorNames', + filterLabel: "<s:text name="wao.ui.field.FishingZone.sectorName"/>", + filterValuesField: 'sampleRowsFilterValues.fishingZoneSectorNames', + }, + { + filterName: 'sampleRowFilter.fishingGearDcfIds', + filterLabel: "<s:text name="wao.ui.entity.fishingGearDCF"/>", + filterValuesField: 'sampleRowsFilterValues.fishingGearDcfs', + }, + { + filterName: 'sampleRowFilter.targetSpeciesDcfIds', + filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDCF"/>", + filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs', + }, + { + filterName: 'boatFilter.boatIds', + filterLabel: "<s:text name="wao.ui.entity.Boat"/>", + filterValuesField: 'boatsFilterValues.boats', + minimumInputLength: 3 + }, + { + filterName: 'boatFilter.districtIds', + filterLabel: "<s:text name="wao.ui.field.Boat.district"/>", + filterValuesField: 'boatsFilterValues.districts' + }, + { + filterName: 'observerIds', + filterLabel: "<s:text name="wao.ui.misc.observer"/>", + filterValuesField: 'observers' + }, + { + filterName: 'companyAcceptations', + filterLabel: "<s:text name="wao.ui.field.Contact.validationCompany"/>", + filterValuesField: 'companyAcceptations' + }, + { + filterName: 'programAcceptations', + filterLabel: "<s:text name="wao.ui.field.Contact.validationProgram"/>", + filterValuesField: 'programAcceptations' + } + ]; + + filter = <s:property value="filter" escapeHtml="false"/>; + + contactsFilterController2 = new FilterController2(contactsFilterMappings, filter, WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#synthesis-filters-form fieldset.extra-filters')); + contactsFilterController2.init(); + $.jqplot('expected-vs-actual-observations-by-months-chart', <s:property value="synthesis.expectedVsActualObservationsByMonthsBarChartData" escapeHtml="false"/>); $.jqplot('boarding-boats-chart', <s:property value="synthesis.boardingBoatsBarChartData" escapeHtml="false"/>); @@ -55,8 +126,63 @@ <content tag="mainClass">large syntheses</content> - <%@include file="contacts-filter.jsp"%> + <s:form method="GET" id="synthesis-filters-form" cssClass="filters-form"> + <fieldset> + + <s:textfield name="filter.periodFrom" + label="%{getText('wao.ui.form.periodFrom')}" + placeholder="%{getFilterPeriodFromPlaceholder()}" + cssClass="input-small"/> + + <s:textfield name="filter.periodTo" + label="%{getText('wao.ui.form.period.to')}" + placeholder="%{getFilterPeriodToPlaceholder()}" + cssClass="input-small"/> + + <s:checkbox name="filter.filterOnObservationBeginDate" + label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> + + </fieldset> + + <fieldset class="extra-filters"> + + </fieldset> + + <fieldset> + + <s:checkbox name="filter.mammalsObservationOnly" + label="%{getText('wao.ui.misc.observations')}"/> + + <s:checkbox name="filter.mammalsCaptureOnly" + label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> + + <s:checkbox name="filter.commentDefinedOnly" + label="%{getText('wao.ui.field.Contact.comment')}"/> + + <s:checkbox name="filter.commentCompanyDefinedOnly" + label="%{getText('wao.ui.field.Contact.commentCompany')}"/> + + <s:checkbox name="filter.commentAdminDefinedOnly" + label="%{getText('wao.ui.field.Contact.commentAdmin')}"/> + + </fieldset> + + <div class="form-actions"> + + <s:submit type="button" cssClass="btn btn-primary"> + <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> + </s:submit> + + <s:url action="reset-synthesis-filter" id="resetSynthesisFilterUrl" /> + <s:a href="%{resetSynthesisFilterUrl}" cssClass="btn"> + <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> + </s:a> + + </div> + + </s:form> + <article> <h2> <s:text name="SynthesisId.GRAPH_SAMPLING"/> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-05 13:39:25 UTC (rev 2002) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-05 13:52:12 UTC (rev 2003) @@ -380,7 +380,8 @@ margin-right: 5px; } #sampling-plan-filters-form, -#contacts-filters-form { +#contacts-filters-form, +#synthesis-filters-form { padding-top:20px; background:#f5f5f5 url(images/bg-filtres.jpg) repeat-x 0 bottom; border-bottom:1px solid #CCC;

1 0

r2002 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 15:39:25 +0200 (Thu, 05 Jun 2014) New Revision: 2002 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2002 Log: fix copyright year in layout Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-06-05 13:26:56 UTC (rev 2001) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-06-05 13:39:25 UTC (rev 2002) @@ -111,7 +111,11 @@ } public String getOneYearAgoDatePlaceHolder() { - return formatDate(DateUtils.addYears(new Date(), -1)); + return formatDate(DateUtils.addYears(getNow(), -1)); } + protected Date getNow() { + return new Date(); + } + } Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-05 13:26:56 UTC (rev 2001) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-05 13:39:25 UTC (rev 2002) @@ -235,7 +235,7 @@ </a> </li> <li> - Copyright 2009-${currentYear} + Copyright 2009-2014 <a href="http://www.ifremer.fr" title="Ifremer" target="_blank">Ifremer</a>, <a href="http://www.codelutin.com" title="Code Lutin" target="_blank">Code Lutin</a> </li>

1 0