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

r1804 - in trunk/wao-web/src/main/webapp: . WEB-INF/decorators spin.js-2.0.0
by bleny＠users.forge.codelutin.com April 2, 2014

April 2, 2014

Author: bleny Date: 2014-04-02 16:06:41 +0200 (Wed, 02 Apr 2014) New Revision: 1804 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1804 Log: add a spinner Added: trunk/wao-web/src/main/webapp/spin.js-2.0.0/ trunk/wao-web/src/main/webapp/spin.js-2.0.0/LICENSE.txt trunk/wao-web/src/main/webapp/spin.js-2.0.0/jquery.spin.js trunk/wao-web/src/main/webapp/spin.js-2.0.0/spin.js Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-02 12:44:52 UTC (rev 1803) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-02 14:06:41 UTC (rev 1804) @@ -35,6 +35,8 @@ <script type="text/javascript" src="<s:url value="/select2-3.4.5/select2_locale_fr.js" />"></script> <script type="text/javascript" src="<s:url value="/bootstrap-2.3.1/bootstrap-tooltip.js" />"></script> <script type="text/javascript" src="<s:url value="/bootstrap-2.3.1/bootstrap-popover.js" />"></script> + <script type="text/javascript" src="<s:url value="/spin.js-2.0.0/spin.js" />"></script> + <script type="text/javascript" src="<s:url value="/spin.js-2.0.0/jquery.spin.js" />"></script> <script type="text/javascript" src="<s:url value="/wao.js" />"></script> <script type="text/javascript" src="<s:url value='/enpoints-js.jsp'/>"></script> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2.css" />" /> Added: trunk/wao-web/src/main/webapp/spin.js-2.0.0/LICENSE.txt =================================================================== --- trunk/wao-web/src/main/webapp/spin.js-2.0.0/LICENSE.txt (rev 0) +++ trunk/wao-web/src/main/webapp/spin.js-2.0.0/LICENSE.txt 2014-04-02 14:06:41 UTC (rev 1804) @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de] + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file Added: trunk/wao-web/src/main/webapp/spin.js-2.0.0/jquery.spin.js =================================================================== --- trunk/wao-web/src/main/webapp/spin.js-2.0.0/jquery.spin.js (rev 0) +++ trunk/wao-web/src/main/webapp/spin.js-2.0.0/jquery.spin.js 2014-04-02 14:06:41 UTC (rev 1804) @@ -0,0 +1,80 @@ +/** + * Copyright (c) 2011-2013 Felix Gnass + * Licensed under the MIT license + */ + +/* + +Basic Usage: +============ + +$('#el').spin(); // Creates a default Spinner using the text color of #el. +$('#el').spin({ ... }); // Creates a Spinner using the provided options. + +$('#el').spin(false); // Stops and removes the spinner. + +Using Presets: +============== + +$('#el').spin('small'); // Creates a 'small' Spinner using the text color of #el. +$('#el').spin('large', '#fff'); // Creates a 'large' white Spinner. + +Adding a custom preset: +======================= + +$.fn.spin.presets.flower = { + lines: 9 + length: 10 + width: 20 + radius: 0 +} + +$('#el').spin('flower', 'red'); + +*/ + +(function(factory) { + + if (typeof exports == 'object') { + // CommonJS + factory(require('jquery'), require('spin')) + } + else if (typeof define == 'function' && define.amd) { + // AMD, register as anonymous module + define(['jquery', 'spin'], factory) + } + else { + // Browser globals + if (!window.Spinner) throw new Error('Spin.js not present') + factory(window.jQuery, window.Spinner) + } + +}(function($, Spinner) { + + $.fn.spin = function(opts, color) { + + return this.each(function() { + var $this = $(this), + data = $this.data(); + + if (data.spinner) { + data.spinner.stop(); + delete data.spinner; + } + if (opts !== false) { + opts = $.extend( + { color: color || $this.css('color') }, + $.fn.spin.presets[opts] || opts + ) + data.spinner = new Spinner(opts).spin(this) + } + }) + } + + $.fn.spin.presets = { + tiny: { lines: 8, length: 2, width: 2, radius: 3 }, + small: { lines: 8, length: 4, width: 3, radius: 5 }, + large: { lines: 10, length: 8, width: 4, radius: 8 } + } + +})); Added: trunk/wao-web/src/main/webapp/spin.js-2.0.0/spin.js =================================================================== --- trunk/wao-web/src/main/webapp/spin.js-2.0.0/spin.js (rev 0) +++ trunk/wao-web/src/main/webapp/spin.js-2.0.0/spin.js 2014-04-02 14:06:41 UTC (rev 1804) @@ -0,0 +1,348 @@ +/** + * Copyright (c) 2011-2014 Felix Gnass + * Licensed under the MIT license + */ +(function(root, factory) { + + /* CommonJS */ + if (typeof exports == 'object') module.exports = factory() + + /* AMD module */ + else if (typeof define == 'function' && define.amd) define(factory) + + /* Browser global */ + else root.Spinner = factory() +} +(this, function() { + "use strict"; + + var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */ + , animations = {} /* Animation rules keyed by their name */ + , useCssAnimations /* Whether to use CSS animations or setTimeout */ + + /** + * Utility function to create elements. If no tag name is given, + * a DIV is created. Optionally properties can be passed. + */ + function createEl(tag, prop) { + var el = document.createElement(tag || 'div') + , n + + for(n in prop) el[n] = prop[n] + return el + } + + /** + * Appends children and returns the parent. + */ + function ins(parent /* child1, child2, ...*/) { + for (var i=1, n=arguments.length; i<n; i++) + parent.appendChild(arguments[i]) + + return parent + } + + /** + * Insert a new stylesheet to hold the @keyframe or VML rules. + */ + var sheet = (function() { + var el = createEl('style', {type : 'text/css'}) + ins(document.getElementsByTagName('head')[0], el) + return el.sheet || el.styleSheet + }()) + + /** + * Creates an opacity keyframe animation rule and returns its name. + * Since most mobile Webkits have timing issues with animation-delay, + * we create separate rules for each line/segment. + */ + function addAnimation(alpha, trail, i, lines) { + var name = ['opacity', trail, ~~(alpha*100), i, lines].join('-') + , start = 0.01 + i/lines * 100 + , z = Math.max(1 - (1-alpha) / trail * (100-start), alpha) + , prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase() + , pre = prefix && '-' + prefix + '-' || '' + + if (!animations[name]) { + sheet.insertRule( + '@' + pre + 'keyframes ' + name + '{' + + '0%{opacity:' + z + '}' + + start + '%{opacity:' + alpha + '}' + + (start+0.01) + '%{opacity:1}' + + (start+trail) % 100 + '%{opacity:' + alpha + '}' + + '100%{opacity:' + z + '}' + + '}', sheet.cssRules.length) + + animations[name] = 1 + } + + return name + } + + /** + * Tries various vendor prefixes and returns the first supported property. + */ + function vendor(el, prop) { + var s = el.style + , pp + , i + + prop = prop.charAt(0).toUpperCase() + prop.slice(1) + for(i=0; i<prefixes.length; i++) { + pp = prefixes[i]+prop + if(s[pp] !== undefined) return pp + } + if(s[prop] !== undefined) return prop + } + + /** + * Sets multiple style properties at once. + */ + function css(el, prop) { + for (var n in prop) + el.style[vendor(el, n)||n] = prop[n] + + return el + } + + /** + * Fills in default values. + */ + function merge(obj) { + for (var i=1; i < arguments.length; i++) { + var def = arguments[i] + for (var n in def) + if (obj[n] === undefined) obj[n] = def[n] + } + return obj + } + + /** + * Returns the absolute page-offset of the given element. + */ + function pos(el) { + var o = { x:el.offsetLeft, y:el.offsetTop } + while((el = el.offsetParent)) + o.x+=el.offsetLeft, o.y+=el.offsetTop + + return o + } + + /** + * Returns the line color from the given string or array. + */ + function getColor(color, idx) { + return typeof color == 'string' ? color : color[idx % color.length] + } + + // Built-in defaults + + var defaults = { + lines: 12, // The number of lines to draw + length: 7, // The length of each line + width: 5, // The line thickness + radius: 10, // The radius of the inner circle + rotate: 0, // Rotation offset + corners: 1, // Roundness (0..1) + color: '#000', // #rgb or #rrggbb + direction: 1, // 1: clockwise, -1: counterclockwise + speed: 1, // Rounds per second + trail: 100, // Afterglow percentage + opacity: 1/4, // Opacity of the lines + fps: 20, // Frames per second when using setTimeout() + zIndex: 2e9, // Use a high z-index by default + className: 'spinner', // CSS class to assign to the element + top: '50%', // center vertically + left: '50%', // center horizontally + position: 'absolute' // element position + } + + /** The constructor */ + function Spinner(o) { + this.opts = merge(o || {}, Spinner.defaults, defaults) + } + + // Global defaults that override the built-ins: + Spinner.defaults = {} + + merge(Spinner.prototype, { + + /** + * Adds the spinner to the given target element. If this instance is already + * spinning, it is automatically removed from its previous target b calling + * stop() internally. + */ + spin: function(target) { + this.stop() + + var self = this + , o = self.opts + , el = self.el = css(createEl(0, {className: o.className}), {position: o.position, width: 0, zIndex: o.zIndex}) + , mid = o.radius+o.length+o.width + + if (target) { + target.insertBefore(el, target.firstChild||null) + css(el, { + left: o.left, + top: o.top + }) + } + + el.setAttribute('role', 'progressbar') + self.lines(el, self.opts) + + if (!useCssAnimations) { + // No CSS animation support, use setTimeout() instead + var i = 0 + , start = (o.lines - 1) * (1 - o.direction) / 2 + , alpha + , fps = o.fps + , f = fps/o.speed + , ostep = (1-o.opacity) / (f*o.trail / 100) + , astep = f/o.lines + + ;(function anim() { + i++; + for (var j = 0; j < o.lines; j++) { + alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity) + + self.opacity(el, j * o.direction + start, alpha, o) + } + self.timeout = self.el && setTimeout(anim, ~~(1000/fps)) + })() + } + return self + }, + + /** + * Stops and removes the Spinner. + */ + stop: function() { + var el = this.el + if (el) { + clearTimeout(this.timeout) + if (el.parentNode) el.parentNode.removeChild(el) + this.el = undefined + } + return this + }, + + /** + * Internal method that draws the individual lines. Will be overwritten + * in VML fallback mode below. + */ + lines: function(el, o) { + var i = 0 + , start = (o.lines - 1) * (1 - o.direction) / 2 + , seg + + function fill(color, shadow) { + return css(createEl(), { + position: 'absolute', + width: (o.length+o.width) + 'px', + height: o.width + 'px', + background: color, + boxShadow: shadow, + transformOrigin: 'left', + transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)', + borderRadius: (o.corners * o.width>>1) + 'px' + }) + } + + for (; i < o.lines; i++) { + seg = css(createEl(), { + position: 'absolute', + top: 1+~(o.width/2) + 'px', + transform: o.hwaccel ? 'translate3d(0,0,0)' : '', + opacity: o.opacity, + animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1/o.speed + 's linear infinite' + }) + + if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'})) + ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)'))) + } + return el + }, + + /** + * Internal method that adjusts the opacity of a single line. + * Will be overwritten in VML fallback mode below. + */ + opacity: function(el, i, val) { + if (i < el.childNodes.length) el.childNodes[i].style.opacity = val + } + + }) + + + function initVML() { + + /* Utility function to create a VML tag */ + function vml(tag, attr) { + return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr) + } + + // No CSS transforms but VML support, add a CSS rule for VML elements: + sheet.addRule('.spin-vml', 'behavior:url(#default#VML)') + + Spinner.prototype.lines = function(el, o) { + var r = o.length+o.width + , s = 2*r + + function grp() { + return css( + vml('group', { + coordsize: s + ' ' + s, + coordorigin: -r + ' ' + -r + }), + { width: s, height: s } + ) + } + + var margin = -(o.width+o.length)*2 + 'px' + , g = css(grp(), {position: 'absolute', top: margin, left: margin}) + , i + + function seg(i, dx, filter) { + ins(g, + ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}), + ins(css(vml('roundrect', {arcsize: o.corners}), { + width: r, + height: o.width, + left: o.radius, + top: -o.width>>1, + filter: filter + }), + vml('fill', {color: getColor(o.color, i), opacity: o.opacity}), + vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change + ) + ) + ) + } + + if (o.shadow) + for (i = 1; i <= o.lines; i++) + seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)') + + for (i = 1; i <= o.lines; i++) seg(i) + return ins(el, g) + } + + Spinner.prototype.opacity = function(el, i, val, o) { + var c = el.firstChild + o = o.shadow && o.lines || 0 + if (c && i+o < c.childNodes.length) { + c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild + if (c) c.opacity = val + } + } + } + + var probe = css(createEl('group'), {behavior: 'url(#default#VML)'}) + + if (!vendor(probe, 'transform') && probe.adj) initVML() + else useCssAnimations = vendor(probe, 'animation') + + return Spinner + +})); Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-04-02 12:44:52 UTC (rev 1803) +++ trunk/wao-web/src/main/webapp/wao.js 2014-04-02 14:06:41 UTC (rev 1804) @@ -35,7 +35,7 @@ var successCallback = function (data) { self.setFilterValues(data.filterValues) }; - $.get(this.filterValuesUrl, filter, successCallback); + WAO.get(this.filterValuesUrl, filter, successCallback); } }; @@ -173,12 +173,34 @@ this.notifications = new Notifications(); + this.startSpinner = function () { + if ( ! this.$spinner) { + this.$spinner = $('body').spin(); + } else { + this.$spinner.spin(); + } + } + + this.stopSpinner = function () { + this.$spinner.spin(false); + } + this.getData = function(path, data) { return path.split('.').reduce(function(prev, prop){ return prev && prev[prop] }, data) }; + this.get = function (url, data, successCallback) { + this.startSpinner(); + var stopSpinningAfterCallingSuccessCallback = function () { + var result = successCallback.apply(this, arguments); + self.stopSpinner(); + return result; + } + $.get(url, data, stopSpinningAfterCallingSuccessCallback); + } + }; $(document).ready(function () {

1 0

r1803 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com April 2, 2014

April 2, 2014

Author: bleny Date: 2014-04-02 14:44:52 +0200 (Wed, 02 Apr 2014) New Revision: 1803 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1803 Log: refs #4483 fix npe on latestSampleLogCreateDate Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-02 12:33:40 UTC (rev 1802) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-02 12:44:52 UTC (rev 1803) @@ -631,7 +631,8 @@ } public boolean isRecentlyUpdated() { - boolean isRecentlyUpdated = DateUtil.getDifferenceInDays(latestSampleLogCreateDate, new Date()) <= 2 * 7; + boolean isRecentlyUpdated = latestSampleLogCreateDate != null + && DateUtil.getDifferenceInDays(latestSampleLogCreateDate, new Date()) <= 2 * 7; return isRecentlyUpdated; }

1 0

r1802 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-web wao-web/src/main/resources wao-web/src/main/webapp wao-web/src/main/webapp/WEB-INF/content/obsmer wao-web/src/main/webapp/WEB-INF/decorators
by tchemit＠users.forge.codelutin.com April 2, 2014

April 2, 2014

Author: tchemit Date: 2014-04-02 14:33:40 +0200 (Wed, 02 Apr 2014) New Revision: 1802 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1802 Log: fix endpoints fix configuration filtering fix some bad el add I18nAble contract on ObsProgram Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java trunk/wao-web/pom.xml trunk/wao-web/src/main/resources/struts.xml trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/enpoints-js.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java 2014-04-02 10:10:28 UTC (rev 1801) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java 2014-04-02 12:33:40 UTC (rev 1802) @@ -22,7 +22,7 @@ import static org.nuiton.i18n.I18n.n; -public enum ObsProgram { +public enum ObsProgram implements I18nAble{ OBSMER("M", n("ObsProgram.OBSMER")), OBSVENTE("V", n("ObsProgram.OBSVENTE")), @@ -62,6 +62,7 @@ return OBSDEB == this; } + @Override public String getI18nKey() { return i18nKey; } Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-04-02 10:10:28 UTC (rev 1801) +++ trunk/wao-web/pom.xml 2014-04-02 12:33:40 UTC (rev 1802) @@ -162,8 +162,7 @@ <build> <finalName>wao-${project.version}</finalName> -  -  + </resources> <pluginManagement> <plugins> <plugin> Modified: trunk/wao-web/src/main/resources/struts.xml =================================================================== --- trunk/wao-web/src/main/resources/struts.xml 2014-04-02 10:10:28 UTC (rev 1801) +++ trunk/wao-web/src/main/resources/struts.xml 2014-04-02 12:33:40 UTC (rev 1802) @@ -29,7 +29,8 @@  <constant name="struts.devMode" value="${devMode}"/> <constant name="struts.ognl.logMissingProperties" value="${devMode}"/> - <constant name="struts.el.throwExceptionOnFailure" value="${devMode}"/> +  + <constant name="struts.el.throwExceptionOnFailure" value="false"/> <constant name="struts.i18n.reload" value="${devMode}"/> <constant name="struts.custom.i18n.resources" value="resources"/> <constant name="struts.configuration.xml.reload" value="${devMode}"/> @@ -38,7 +39,6 @@   <constant name="struts.freemarker.templatesCache" value="true"/> - <constant name="struts.convention.package.locators.basePackage" value="fr.ifremer.wao.web.action"/>  <constant name="struts.mapper.action.prefix.enabled" value="true"/> +  + <constant name="struts.convention.package.locators.basePackage" value="fr.ifremer.wao.web.action"/> <constant name="struts.convention.default.parent.package" value="waoPackage"/> <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider"/> 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-04-02 10:10:28 UTC (rev 1801) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-02 12:33:40 UTC (rev 1802) @@ -32,7 +32,7 @@ $(document).ready(function () { - var boatsFilterController = new FilterController(WAO.BOATS_FILTER_VALUES_JSON_URL, $('#boats-filters-form')); + var boatsFilterController = new FilterController(WAO.OBSMER_BOATS_FILTER_VALUES_JSON_URL, $('#boats-filters-form')); boatsFilterController.init(); }); 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-04-02 10:10:28 UTC (rev 1801) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-02 12:33:40 UTC (rev 1802) @@ -32,7 +32,7 @@ $(document).ready(function () { - var sampleRowsFilterController = new FilterController(WAO.SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); + var sampleRowsFilterController = new FilterController(WAO.OBSMER_SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); sampleRowsFilterController.init(); $('#switch-estimated-real').click(function () { @@ -125,7 +125,6 @@ list="filterValues.fishingGearDcfs" listKey="value" listValue="label" - value="%getText(#value)" multiple="true" dataBinding="fishingGearDcfs" /> @@ -249,7 +248,7 @@  <s:iterator value="samplingPlan.months" var="month"> - <th class="effort <s:if test="isCurrentMonth(#month)"> now</s:if>"> + <th class="effort <s:if test="%{isCurrentMonth(#month)}"> now</s:if>"> <s:property value="%{formatMonth(#month)}"/> </th> </s:iterator> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-02 10:10:28 UTC (rev 1801) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-02 12:33:40 UTC (rev 1802) @@ -36,6 +36,7 @@ <script type="text/javascript" src="<s:url value="/bootstrap-2.3.1/bootstrap-tooltip.js" />"></script> <script type="text/javascript" src="<s:url value="/bootstrap-2.3.1/bootstrap-popover.js" />"></script> <script type="text/javascript" src="<s:url value="/wao.js" />"></script> + <script type="text/javascript" src="<s:url value='/enpoints-js.jsp'/>"></script> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2.css" />" /> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2-bootstrap.css" />" /> <link rel="stylesheet" type="text/css" href="<s:url value="/wao.css" />" media="all" /> @@ -48,7 +49,9 @@ <div class="navbar"> <div class="navbar-inner"> - <a class="brand" href="#">Wao <s:property value="getText(obsProgram)" /></a> + <a class="brand" href="#">Wao <s:text name="%{obsProgram.getI18nKey()}"/></a> + + <%--<a class="brand" href="#">Wao <s:property value="%{getText(#obsProgram.getI18nKey())}" /></a>--%> <ul class="nav"> <li> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="news" id="newsUrl" /> @@ -118,7 +121,11 @@ <s:param name="companyId" value="authenticatedWaoUser.waoUser.company.topiaId" /> </s:url> <s:a href="%{companyUsersUrl}"> - <i class="icon-user"></i> <s:property value="t('wao.ui.page.waoUsers.titleForCompany', authenticatedWaoUser.waoUser.company.name)" /> + <i class="icon-user"></i> + <%--<s:property value="t('wao.ui.page.waoUsers.titleForCompany', authenticatedWaoUser.waoUser.company.name)" />--%> + <s:text name="wao.ui.page.waoUsers.titleForCompany"> + <s:param value="authenticatedWaoUser.waoUser.company.name"/> + </s:text> </s:a> </li> </s:if> Modified: trunk/wao-web/src/main/webapp/enpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/enpoints-js.jsp 2014-04-02 10:10:28 UTC (rev 1801) +++ trunk/wao-web/src/main/webapp/enpoints-js.jsp 2014-04-02 12:33:40 UTC (rev 1802) @@ -6,8 +6,8 @@ $(document).ready(function () { - WAO.SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url action="sample-rows-filter-values-json"/>'; - WAO.BOATS_FILTER_VALUES_JSON_URL = '<s:url action="boats-filter-values-json"/>'; + WAO.OBSMER_SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="sample-rows-filter-values-json"/>'; + WAO.OBSMER_BOATS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="boats-filter-values-json"/>'; });

1 0

r1801 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com April 2, 2014

April 2, 2014

Author: bleny Date: 2014-04-02 12:10:28 +0200 (Wed, 02 Apr 2014) New Revision: 1801 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1801 Log: restore methods wrongly removed Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-02 09:54:55 UTC (rev 1800) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-02 10:10:28 UTC (rev 1801) @@ -29,6 +29,7 @@ import fr.ifremer.wao.entity.SampleRowLog; import fr.ifremer.wao.entity.TerrestrialLocation; import org.apache.commons.collections4.CollectionUtils; +import org.nuiton.util.DateUtil; import java.io.Serializable; import java.text.NumberFormat; @@ -464,10 +465,6 @@ return sampleRowId; } - public Date getLatestSampleLogCreateDate() { - return latestSampleLogCreateDate; - } - public Date getFirstSampleMonthDate() { return firstSampleMonthDate; } @@ -476,10 +473,6 @@ return lastSampleMonthDate; } - public Date getLastSampleMonthEndOfMonth() { - return lastSampleMonthEndOfMonth; - } - public int getNbObservants() { return nbObservants; } @@ -636,6 +629,16 @@ public boolean isElligibleBoatsProvided() { return elligibleBoatsProvided; } + + public boolean isRecentlyUpdated() { + boolean isRecentlyUpdated = DateUtil.getDifferenceInDays(latestSampleLogCreateDate, new Date()) <= 2 * 7; + return isRecentlyUpdated; + } + + public boolean isNewContactCreatable() { + boolean isNewContactCreatable = new Date().before(lastSampleMonthEndOfMonth); + return isNewContactCreatable; + } } public static class ObsMerSamplingPlanStatistics implements Serializable {

1 0

r1800 - in trunk/wao-web: . src/main/webapp src/main/webapp/WEB-INF/content/obsmer src/main/webapp/WEB-INF/decorators
by tchemit＠users.forge.codelutin.com April 2, 2014

April 2, 2014

Author: tchemit Date: 2014-04-02 11:54:55 +0200 (Wed, 02 Apr 2014) New Revision: 1800 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1800 Log: comment resources filtering + add js endpoints file Added: trunk/wao-web/src/main/webapp/enpoints-js.jsp Modified: trunk/wao-web/pom.xml trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-04-02 09:24:15 UTC (rev 1799) +++ trunk/wao-web/pom.xml 2014-04-02 09:54:55 UTC (rev 1800) @@ -162,7 +162,8 @@ <build> <finalName>wao-${project.version}</finalName> - <resources> +  +  <pluginManagement> <plugins> <plugin> 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-04-02 09:24:15 UTC (rev 1799) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-02 09:54:55 UTC (rev 1800) @@ -30,11 +30,9 @@ <script> - var BOATS_FILTER_VALUES_JSON_URL = '<s:url action="boats-filter-values-json" />'; - $(document).ready(function () { - var boatsFilterController = new FilterController(BOATS_FILTER_VALUES_JSON_URL, $('#boats-filters-form')); + var boatsFilterController = new FilterController(WAO.BOATS_FILTER_VALUES_JSON_URL, $('#boats-filters-form')); boatsFilterController.init(); }); 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-04-02 09:24:15 UTC (rev 1799) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-02 09:54:55 UTC (rev 1800) @@ -30,11 +30,9 @@ <script> - var SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url action="sample-rows-filter-values-json" />'; - $(document).ready(function () { - var sampleRowsFilterController = new FilterController(SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); + var sampleRowsFilterController = new FilterController(WAO.SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); sampleRowsFilterController.init(); $('#switch-estimated-real').click(function () { Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-04-02 09:24:15 UTC (rev 1799) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-04-02 09:54:55 UTC (rev 1800) @@ -30,9 +30,10 @@ <title><decorator:title default="Wao"/> - Wao</title> <sj:head locale="fr" jqueryui="true" loadAtOnce="true" jquerytheme="start" /> <sb:head /> - <script type="text/javascript" src="<s:url value='/wao.js' />"></script> - <link rel="stylesheet" type="text/css" href="<s:url value='/wao.css' />" media="all" /> - <link rel="stylesheet" type="text/css" href="<s:url value='/wao-screen.css' />" media="screen"> + <script type="text/javascript" src="<s:url value='/wao.js'/>"></script> + <script type="text/javascript" src="<s:url value='/enpoints-js.jsp'/>"></script> + <link rel="stylesheet" type="text/css" href="<s:url value='/wao.css'/>" media="all" /> + <link rel="stylesheet" type="text/css" href="<s:url value='/wao-screen.css'/>" media="screen"> <decorator:head /> </head> Added: trunk/wao-web/src/main/webapp/enpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/enpoints-js.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/enpoints-js.jsp 2014-04-02 09:54:55 UTC (rev 1800) @@ -0,0 +1,13 @@ +<%@ page language="java" contentType="text/javascript; charset=utf-8" pageEncoding="utf-8"%><%@ taglib uri="/struts-tags" prefix="s" %> +<% + // allow this page to be cached by browser + response.setDateHeader("Expires", System.currentTimeMillis() + 3600000L); // 1 hour in future. +%> + +$(document).ready(function () { + + WAO.SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url action="sample-rows-filter-values-json"/>'; + WAO.BOATS_FILTER_VALUES_JSON_URL = '<s:url action="boats-filter-values-json"/>'; +}); + + Property changes on: trunk/wao-web/src/main/webapp/enpoints-js.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r1799 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-services/src/main/resources/i18n
by bleny＠users.forge.codelutin.com April 2, 2014

April 2, 2014

Author: bleny Date: 2014-04-02 11:24:15 +0200 (Wed, 02 Apr 2014) New Revision: 1799 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1799 Log: fix NPE Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-02 09:16:05 UTC (rev 1798) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-02 09:24:15 UTC (rev 1799) @@ -193,7 +193,7 @@ SampleRowsFilter that = (SampleRowsFilter) o; - boolean equals = obsProgram.equals(that.obsProgram) + boolean equals = Objects.equals(obsProgram, that.obsProgram) && Objects.equals(periodFrom, that.periodFrom) && Objects.equals(periodTo, that.periodTo) && WaoUtils.isEqualCollection(sampleRowIds, that.sampleRowIds) @@ -214,7 +214,7 @@ @Override public int hashCode() { - int hashCode = obsProgram.hashCode(); + int hashCode = Objects.hashCode(obsProgram); hashCode = 31 * hashCode + WaoUtils.collectionHashcode(sampleRowIds); hashCode = 31 * hashCode + WaoUtils.collectionHashcode(fishingZoneFacadeNames); hashCode = 31 * hashCode + WaoUtils.collectionHashcode(fishingZoneSectorNames); Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-04-02 09:16:05 UTC (rev 1798) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-04-02 09:24:15 UTC (rev 1799) @@ -46,9 +46,9 @@ wao.import.failure.wrongUser=There is no user with login '%s' wao.import.sampleRow.failure.fishingZoneMissing=You must precise at least one fishing zone wao.import.sampleRow.failure.missingSampleRowCode=You must precise a code for the sample row +wao.import.sampleRow.failure.unknownFishingGearDcfCode=Unknown fishing gear code\: %s +wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Unknown target species code\: %s wao.import.sampleRow.failure.wrongFishingZone=There is no fishing zone with the code '%s' wao.import.sampleRow.failure.wrongSampleRowCodeFormat=The sample row code '%s' is not compliant with the format "YYYY_PIIII" -wao.import.sampleRow.failure.unknownFishingGearDcfCode=Unknown fishing gear code\: %s -wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Unknown target species code\: %s wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-04-02 09:16:05 UTC (rev 1798) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-04-02 09:24:15 UTC (rev 1799) @@ -46,9 +46,9 @@ wao.import.failure.wrongUser=Il n'y a pas d'utilisateur ayant pour identifiant '%s' wao.import.sampleRow.failure.fishingZoneMissing=Il faut préciser au moins une zone de pêche wao.import.sampleRow.failure.missingSampleRowCode=Il faut préciser un code pour a ligne du plan +wao.import.sampleRow.failure.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel +wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel wao.import.sampleRow.failure.wrongFishingZone=Le code '%s' ne correspond à aucune zone de pêche connue du référentiel wao.import.sampleRow.failure.wrongSampleRowCodeFormat=Le code '%s' n'est pas un code de ligne valide selon le format "AAAA_PIIII" -wao.import.sampleRow.failure.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel -wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut être associé à la ligne %s car il doit observer, le même jour, pour la ligne %s wao.validation.sampleRow.observerNotInCompany=L'observateur %s ne fait pas parti de la société %s

1 0

r1798 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration
by bleny＠users.forge.codelutin.com April 2, 2014

April 2, 2014

Author: bleny Date: 2014-04-02 11:16:05 +0200 (Wed, 02 Apr 2014) New Revision: 1798 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1798 Log: use user locale to tranlate ui message Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java 2014-04-02 09:15:32 UTC (rev 1797) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java 2014-04-02 09:16:05 UTC (rev 1798) @@ -22,7 +22,6 @@ */ import fr.ifremer.wao.services.service.ImportErrorException; -import org.nuiton.i18n.I18n; import java.io.InputStream; @@ -37,7 +36,7 @@ @Override protected String getSuccessMessage() { - return I18n.t("wao.import.boatGroups.success"); + return t("wao.import.boatGroups.success"); } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java 2014-04-02 09:15:32 UTC (rev 1797) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java 2014-04-02 09:16:05 UTC (rev 1798) @@ -22,7 +22,6 @@ */ import fr.ifremer.wao.services.service.ImportErrorException; -import org.nuiton.i18n.I18n; import java.io.InputStream; @@ -37,7 +36,7 @@ @Override protected String getSuccessMessage() { - return I18n.t("wao.import.boats.success"); + return t("wao.import.boats.success"); } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java 2014-04-02 09:15:32 UTC (rev 1797) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java 2014-04-02 09:16:05 UTC (rev 1798) @@ -22,7 +22,6 @@ */ import fr.ifremer.wao.services.service.ImportErrorException; -import org.nuiton.i18n.I18n; import java.io.InputStream; @@ -32,7 +31,7 @@ @Override protected String getSuccessMessage() { - return I18n.t("wao.import.contactStateMotives.success"); + return t("wao.import.contactStateMotives.success"); } @Override Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java 2014-04-02 09:15:32 UTC (rev 1797) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java 2014-04-02 09:16:05 UTC (rev 1798) @@ -22,7 +22,6 @@ */ import fr.ifremer.wao.services.service.ImportErrorException; -import org.nuiton.i18n.I18n; import java.io.InputStream; @@ -32,7 +31,7 @@ @Override protected String getSuccessMessage() { - return I18n.t("wao.import.fishingZones.success"); + return t("wao.import.fishingZones.success"); } @Override Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java 2014-04-02 09:15:32 UTC (rev 1797) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java 2014-04-02 09:16:05 UTC (rev 1798) @@ -22,7 +22,6 @@ */ import fr.ifremer.wao.services.service.ImportErrorException; -import org.nuiton.i18n.I18n; import java.io.InputStream; @@ -32,7 +31,7 @@ @Override protected String getSuccessMessage() { - return I18n.t("wao.import.obsDebCodes.success"); + return t("wao.import.obsDebCodes.success"); } @Override Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java 2014-04-02 09:15:32 UTC (rev 1797) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java 2014-04-02 09:16:05 UTC (rev 1798) @@ -22,7 +22,6 @@ */ import fr.ifremer.wao.services.service.ImportErrorException; -import org.nuiton.i18n.I18n; import java.io.InputStream; @@ -32,7 +31,7 @@ @Override protected String getSuccessMessage() { - return I18n.t("wao.import.terrestrialDivisions.success"); + return t("wao.import.terrestrialDivisions.success"); } @Override Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java 2014-04-02 09:15:32 UTC (rev 1797) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java 2014-04-02 09:16:05 UTC (rev 1798) @@ -22,7 +22,6 @@ */ import fr.ifremer.wao.services.service.ImportErrorException; -import org.nuiton.i18n.I18n; import java.io.InputStream; @@ -32,7 +31,7 @@ @Override protected String getSuccessMessage() { - return I18n.t("wao.import.terrestrialLocations.success"); + return t("wao.import.terrestrialLocations.success"); } @Override

1 0

r1797 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer
by bleny＠users.forge.codelutin.com April 2, 2014

April 2, 2014

Author: bleny Date: 2014-04-02 11:15:32 +0200 (Wed, 02 Apr 2014) New Revision: 1797 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1797 Log: remove fixed fixme Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java 2014-04-02 09:05:05 UTC (rev 1796) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java 2014-04-02 09:15:32 UTC (rev 1797) @@ -130,8 +130,6 @@ addFieldError("updateSampleRowCommand.sampleRow.samplingStrategy", t("wao.ui.form.SampleRow.error.missingProfessionSpecies")); } - // FIXME brendan 06/03/14 check code uniqueness - } @Override

1 0

r1796 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com April 2, 2014

April 2, 2014

Author: bleny Date: 2014-04-02 11:05:05 +0200 (Wed, 02 Apr 2014) New Revision: 1796 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1796 Log: remove fixme in ObsMerContactsService#newContactFilter Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-04-02 08:57:00 UTC (rev 1795) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-04-02 09:05:05 UTC (rev 1796) @@ -18,6 +18,8 @@ protected SampleRowsFilter sampleRowFilter; + protected BoatsFilter boatFilter; + /** * Filter contact on {@link fr.ifremer.wao.entity.Contact#getCreationDate()} or on * {@link fr.ifremer.wao.entity.Contact#getObservationBeginDate()} according to @@ -72,6 +74,7 @@ public ContactsFilter() { sampleRowFilter = new SampleRowsFilter(); + boatFilter = new BoatsFilter(); } public SampleRowsFilter getSampleRowFilter() { @@ -82,6 +85,14 @@ this.sampleRowFilter = sampleRowFilter; } + public BoatsFilter getBoatFilter() { + return boatFilter; + } + + public void setBoatFilter(BoatsFilter boatFilter) { + this.boatFilter = boatFilter; + } + public Date getPeriodFrom() { return periodFrom; } @@ -259,6 +270,7 @@ ContactsFilter that = (ContactsFilter) o; boolean equals = Objects.equals(sampleRowFilter, that.sampleRowFilter) + && Objects.equals(boatFilter, that.boatFilter) && Objects.equals(periodFrom, that.periodFrom) && Objects.equals(periodTo, that.periodTo) && WaoUtils.isEqualCollection(contactIds, that.contactIds) @@ -286,6 +298,7 @@ @Override public int hashCode() { int hashCode = Objects.hashCode(sampleRowFilter); + hashCode = 31 * hashCode + Objects.hashCode(boatFilter); hashCode = 31 * hashCode + Objects.hashCode(periodFrom); hashCode = 31 * hashCode + Objects.hashCode(periodFrom); hashCode = 31 * hashCode + WaoUtils.collectionHashcode(contactIds); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-02 08:57:00 UTC (rev 1795) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-02 09:05:05 UTC (rev 1796) @@ -82,14 +82,13 @@ if (authenticatedWaoUser.isProfessional()) { // Pour le profesionnel, on restreint d'office à la liste des bateaux qu'il peut voir - Collection<Boat> canReadBoats = authenticatedWaoUser.getWaoUser().getCanReadBoats(); - - if (CollectionUtils.isEmpty(canReadBoats)) { + Collection<String> canReadBoatsTopiaIds = authenticatedWaoUser.getWaoUser().getCanReadBoatsTopiaIds(); + if (CollectionUtils.isEmpty(canReadBoatsTopiaIds)) { if (log.isWarnEnabled()) { log.warn("user " + authenticatedWaoUser.getWaoUser() + " is professional but can't read any boat"); } } else { - boatsFilter.setBoatIds(new HashSet<>(authenticatedWaoUser.getWaoUser().getCanReadBoatsTopiaIds())); + boatsFilter.setBoatIds(new HashSet<>(canReadBoatsTopiaIds)); } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-04-02 08:57:00 UTC (rev 1795) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-04-02 09:05:05 UTC (rev 1796) @@ -2,18 +2,23 @@ import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.ContactsFilter; -import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.services.AuthenticatedWaoUser; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.util.Calendar; import java.util.Collection; import java.util.Date; +import java.util.HashSet; import java.util.List; public class ObsMerContactsService extends WaoServiceSupport { + private static final Log log = LogFactory.getLog(ObsMerContactsService.class); + public List<Contact> findAll(ContactsFilter filter) { List<Contact> all = getContactDao().findAll(filter); @@ -53,15 +58,14 @@ if (authenticatedWaoUser.isProfessional()) { // Pour le profesionnel, on restreint d'office à la liste des contacts portant sur les bateaux qu'il peut voir - Collection<Boat> canReadBoats = authenticatedWaoUser.getWaoUser().getCanReadBoats(); -// FIXME brendan 25/03/14 -// if (CollectionUtils.isEmpty(canReadBoats)) { -// if (log.isWarnEnabled()) { -// log.warn("user " + connectedUser.getUser() + " is professional but can't read any boat"); -// } -// } else { -// newContactsFilter.getBoatFilter().setBoats(new ArrayList<Boat>(canReadBoats)); -// } + Collection<String> canReadBoatsTopiaIds = authenticatedWaoUser.getWaoUser().getCanReadBoatsTopiaIds(); + if (CollectionUtils.isEmpty(canReadBoatsTopiaIds)) { + if (log.isWarnEnabled()) { + log.warn("user " + authenticatedWaoUser.getWaoUser() + " is professional but can't read any boat"); + } + } else { + newContactsFilter.getBoatFilter().setBoatIds(new HashSet<>(canReadBoatsTopiaIds)); + } } return newContactsFilter;

1 0

r1795 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations wao-services/src/main/resources/i18n wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com April 2, 2014

April 2, 2014

Author: bleny Date: 2014-04-02 10:57:00 +0200 (Wed, 02 Apr 2014) New Revision: 1795 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1795 Log: refs #4483 fix error messages about DCF5codes not displayed while importing sampling plan Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java 2014-04-02 08:50:25 UTC (rev 1794) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java 2014-04-02 08:57:00 UTC (rev 1795) @@ -29,8 +29,8 @@ import fr.ifremer.wao.services.service.administration.ReferentialService; import fr.ifremer.wao.services.service.administration.UnknownFishingGearDcfCodeException; import fr.ifremer.wao.services.service.administration.UnknownTargetSpeciesDcfCodeException; -import org.nuiton.csv.ImportRuntimeException; import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import org.nuiton.util.StringUtil; import java.util.ArrayList; @@ -57,15 +57,14 @@ @Override public List<DCF5Code> parse(String codes) { - // FIXME brendan 20/03/14 la gestion d'exception fait qu'on a pas le message d'erreur dans l'UI try { Collection<DCF5Code> dcf5Codes = referentialService.getDcf5Codes(codes); List<DCF5Code> value = new ArrayList<>(dcf5Codes); return value; } catch (UnknownFishingGearDcfCodeException e) { - throw new ImportRuntimeException(e.getMessage(), e); + throw new IllegalArgumentException(I18n.t("wao.import.sampleRow.failure.unknownFishingGearDcfCode", e.getCode()), e); } catch (UnknownTargetSpeciesDcfCodeException e) { - throw new ImportRuntimeException(e); + throw new IllegalArgumentException(I18n.t("wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode", e.getCode()), e); } } } Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-04-02 08:50:25 UTC (rev 1794) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-04-02 08:57:00 UTC (rev 1795) @@ -48,5 +48,7 @@ wao.import.sampleRow.failure.missingSampleRowCode=You must precise a code for the sample row wao.import.sampleRow.failure.wrongFishingZone=There is no fishing zone with the code '%s' wao.import.sampleRow.failure.wrongSampleRowCodeFormat=The sample row code '%s' is not compliant with the format "YYYY_PIIII" +wao.import.sampleRow.failure.unknownFishingGearDcfCode=Unknown fishing gear code\: %s +wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Unknown target species code\: %s wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-04-02 08:50:25 UTC (rev 1794) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-04-02 08:57:00 UTC (rev 1795) @@ -48,5 +48,7 @@ wao.import.sampleRow.failure.missingSampleRowCode=Il faut préciser un code pour a ligne du plan wao.import.sampleRow.failure.wrongFishingZone=Le code '%s' ne correspond à aucune zone de pêche connue du référentiel wao.import.sampleRow.failure.wrongSampleRowCodeFormat=Le code '%s' n'est pas un code de ligne valide selon le format "AAAA_PIIII" +wao.import.sampleRow.failure.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel +wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut être associé à la ligne %s car il doit observer, le même jour, pour la ligne %s wao.validation.sampleRow.observerNotInCompany=L'observateur %s ne fait pas parti de la société %s Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java 2014-04-02 08:50:25 UTC (rev 1794) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java 2014-04-02 08:57:00 UTC (rev 1795) @@ -40,7 +40,7 @@ private static final long serialVersionUID = 1L; - protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-dd-MM_HHhmm"); + protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-dd-MM_HH-mm"); public abstract String getFileName();

1 0