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

r2158 - trunk/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com July 21, 2014

July 21, 2014

Author: bleny Date: 2014-07-21 10:58:50 +0200 (Mon, 21 Jul 2014) New Revision: 2158 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2158 Log: fixes #5391 do NOT create service context before returning redirect-to-login (finally clause not called) Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-07-16 15:32:29 UTC (rev 2157) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-07-21 08:58:50 UTC (rev 2158) @@ -65,95 +65,101 @@ WaoActionSupport waoAction = (WaoActionSupport) action; - Locale locale = waoAction.getLocale(); - - WaoServiceContext serviceContext = newServiceContext(invocation, locale); - WaoSession waoSession = getWaoSession(invocation); if (waoSession.getAuthenticatedWaoUser() == null && ! ACTIONS_ACCESSIBLE_WITHOUT_LOGIN.contains(waoAction.getClass())) { return "redirect-to-login"; - } + } else { - if (CollectionUtils.isNotEmpty(waoSession.getMessages())) { + if (CollectionUtils.isNotEmpty(waoSession.getMessages())) { - for (String message : waoSession.getMessages()) { + for (String message : waoSession.getMessages()) { - waoAction.addActionMessage(message); + waoAction.addActionMessage(message); + } + + waoSession.getMessages().clear(); + } - waoSession.getMessages().clear(); + if (CollectionUtils.isNotEmpty(waoSession.getErrorMessages())) { - } + for (String message : waoSession.getErrorMessages()) { - if (CollectionUtils.isNotEmpty(waoSession.getErrorMessages())) { + waoAction.addActionError(message); - for (String message : waoSession.getErrorMessages()) { + } - waoAction.addActionError(message); + waoSession.getErrorMessages().clear(); } - waoSession.getErrorMessages().clear(); + Set<PropertyDescriptor> descriptors = + BeanUtil.getDescriptors( + action.getClass(), + BeanUtil.IS_WRITE_DESCRIPTOR); - } + Locale locale = waoAction.getLocale(); - Set<PropertyDescriptor> descriptors = - BeanUtil.getDescriptors( - action.getClass(), - BeanUtil.IS_WRITE_DESCRIPTOR); + WaoServiceContext serviceContext = null; - for (PropertyDescriptor propertyDescriptor : descriptors) { + try { - Class<?> propertyType = propertyDescriptor.getPropertyType(); + serviceContext = newServiceContext(invocation, locale); - Object toInject = null; + for (PropertyDescriptor propertyDescriptor : descriptors) { - if (WaoService.class.isAssignableFrom(propertyType)) { + Class<?> propertyType = propertyDescriptor.getPropertyType(); - Class<? extends WaoService> serviceClass = - (Class<? extends WaoService>) propertyType; + Object toInject = null; - toInject = serviceContext.newService(serviceClass); + if (WaoService.class.isAssignableFrom(propertyType)) { - } else if (WaoSession.class.isAssignableFrom(propertyType)) { + Class<? extends WaoService> serviceClass = + (Class<? extends WaoService>) propertyType; - toInject = waoSession; + toInject = serviceContext.newService(serviceClass); - } else if (WaoApplicationConfig.class.isAssignableFrom(propertyType)) { + } else if (WaoSession.class.isAssignableFrom(propertyType)) { - toInject = getWaoApplicationContext(invocation).getApplicationConfig(); + toInject = waoSession; - } + } else if (WaoApplicationConfig.class.isAssignableFrom(propertyType)) { - if (toInject != null) { + toInject = getWaoApplicationContext(invocation).getApplicationConfig(); - if (log.isTraceEnabled()) { - log.trace("injecting " + toInject + " in action " + action); - } + } - propertyDescriptor.getWriteMethod().invoke(action, toInject); + if (toInject != null) { - } - } + if (log.isTraceEnabled()) { + log.trace("injecting " + toInject + " in action " + action); + } - try { + propertyDescriptor.getWriteMethod().invoke(action, toInject); - return invocation.invoke(); + } + } - } finally { + return invocation.invoke(); - serviceContext.getPersistenceContext().rollback(); + } finally { - serviceContext.getPersistenceContext().close(); + // TODO brendan 21/07/14 use try with resources + if (serviceContext != null) { + serviceContext.getPersistenceContext().close(); + } + } + } } else { + // access to a static data (css, image...) just process return invocation.invoke(); }

1 0

[ANN] - Wao 4.0.3 released
by codelutin.com Release Notification July 16, 2014

July 16, 2014

The Wao team is pleased to announce the wao-4.0.3 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: Fixed Bugs: o La création d'un utilisateur en tant que coordinateur n'est pas possible car la validation indique que la société n'a pas été précisée Issue: 5430. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Manque % total en jours de mer en bas du plan d'échantionnage Issue: 5413. Thanks to Vincent BADTS. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.0.3.war - http://forge.codelutin.com/attachments/download/2065 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2157 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: maven-release Date: 2014-07-16 17:32:29 +0200 (Wed, 16 Jul 2014) New Revision: 2157 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2157 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-16 15:32:23 UTC (rev 2156) +++ trunk/pom.xml 2014-07-16 15:32:29 UTC (rev 2157) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.3</version> + <version>4.0.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.3</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.3</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.3</url> + <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-07-16 15:32:23 UTC (rev 2156) +++ trunk/wao-persistence/pom.xml 2014-07-16 15:32:29 UTC (rev 2157) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.3</version> + <version>4.0.4-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-07-16 15:32:23 UTC (rev 2156) +++ trunk/wao-services/pom.xml 2014-07-16 15:32:29 UTC (rev 2157) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.3</version> + <version>4.0.4-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-07-16 15:32:23 UTC (rev 2156) +++ trunk/wao-web/pom.xml 2014-07-16 15:32:29 UTC (rev 2157) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.3</version> + <version>4.0.4-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2156 - in tags: . wao-4.0.3
by maven-release＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: maven-release Date: 2014-07-16 17:32:23 +0200 (Wed, 16 Jul 2014) New Revision: 2156 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2156 Log: [maven-release-plugin] copy for tag wao-4.0.3 Added: tags/wao-4.0.3/ Property changes on: tags/wao-4.0.3 ___________________________________________________________________ Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085

1 0

r2155 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: maven-release Date: 2014-07-16 17:32:17 +0200 (Wed, 16 Jul 2014) New Revision: 2155 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2155 Log: [maven-release-plugin] prepare release wao-4.0.3 Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-16 15:26:24 UTC (rev 2154) +++ trunk/pom.xml 2014-07-16 15:32:17 UTC (rev 2155) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url> + <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.3</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.3</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.3</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-07-16 15:26:24 UTC (rev 2154) +++ trunk/wao-persistence/pom.xml 2014-07-16 15:32:17 UTC (rev 2155) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-07-16 15:26:24 UTC (rev 2154) +++ trunk/wao-services/pom.xml 2014-07-16 15:32:17 UTC (rev 2155) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-07-16 15:26:24 UTC (rev 2154) +++ trunk/wao-web/pom.xml 2014-07-16 15:32:17 UTC (rev 2155) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2154 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/java/fr/ifremer/wao/web/converter wao-web/src/main/webapp/WEB-INF/content wao-web/src/main/webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: bleny Date: 2014-07-16 17:26:24 +0200 (Wed, 16 Jul 2014) New Revision: 2154 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2154 Log: refs #5446 make better user locale detection Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/AbstractDateConverter.java trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-07-16 09:56:58 UTC (rev 2153) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-07-16 15:26:24 UTC (rev 2154) @@ -57,6 +57,8 @@ @Deprecated protected static final String TIME_PATTERN = "HH:mm"; + protected static final String FRENCH_LANGUAGE = new Locale("fr").getLanguage(); + @Deprecated public static String formatMonth(Date date) { return formatDate(date, MONTH_PATTERN); @@ -178,4 +180,9 @@ public static String getMonthPattern(Locale locale) { return I18n.l(locale, "wao.month.pattern"); } + + public static boolean isFrench(Locale locale) { + boolean isFrench = FRENCH_LANGUAGE.equals(locale.getLanguage()); + return isFrench; + } } 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-07-16 09:56:58 UTC (rev 2153) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-07-16 15:26:24 UTC (rev 2154) @@ -167,4 +167,8 @@ return result; } + public boolean isLocaleFrench() { + return WaoUtils.isFrench(getLocale()); + } + } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/AbstractDateConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/AbstractDateConverter.java 2014-07-16 09:56:58 UTC (rev 2153) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/AbstractDateConverter.java 2014-07-16 15:26:24 UTC (rev 2154) @@ -22,8 +22,10 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.conversion.TypeConversionException; +import fr.ifremer.wao.WaoUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -71,18 +73,30 @@ Locale locale = (Locale) map.get(ActionContext.LOCALE); Preconditions.checkNotNull(locale, "No locale found in ActionContext"); - parsedValue = parseDate(locale, string, strings, true); + if (log.isDebugEnabled()) { + log.debug("to convert date, will use locale " + locale.toLanguageTag()); + } - if (parsedValue == null) { + if ( ! ImmutableSet.of(Locale.FRENCH, Locale.ENGLISH).contains(locale)) { + if (log.isWarnEnabled()) { + log.warn("locale " + locale + " is not french nor english, will default to french"); + } + locale = Locale.FRENCH; + } + + try { + parsedValue = parse(locale, string); + } catch (ParseException e) { + //FIXME If action is changing language, then date are not in good format //FIXME Let's try why other locale... - if (Locale.FRENCH.equals(locale)) { - locale = Locale.ENGLISH; - } else { - locale = Locale.FRENCH; + locale = WaoUtils.isFrench(locale) ? Locale.ENGLISH : Locale.FRENCH; + try { + parsedValue = parse(locale, string); + } catch (ParseException e1) { + throw new TypeConversionException("strings=" + Arrays.toString(strings)); } - parsedValue = parseDate(locale, string, strings, false); } } @@ -93,22 +107,6 @@ } } - protected Date parseDate(Locale locale, String string, String[] strings, boolean swallonError) { - Preconditions.checkNotNull(locale); - try { - return parse(locale, string); - } catch (ParseException e) { - if (swallonError) { - return null; - } - //FIXME See why we don't see the error - if (log.isWarnEnabled()) { - log.warn("could not format parse date " + string, e); - } - throw new TypeConversionException("strings=" + Arrays.toString(strings)); - } - } - @Override public String convertToString(Map map, Object o) { Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-07-16 09:56:58 UTC (rev 2153) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-07-16 15:26:24 UTC (rev 2154) @@ -71,7 +71,7 @@ $('input.date').datetimepicker({ minView: 2, - <s:if test="\"fr-FR\".equals(locale.toLanguageTag())"> + <s:if test="localeFrench"> language: 'fr', format: 'dd/mm/yyyy' </s:if> @@ -82,7 +82,7 @@ }); $('input.date-time').datetimepicker({ - <s:if test="\"fr-FR\".equals(locale.toLanguageTag())"> + <s:if test="localeFrench"> language: 'fr', format: 'dd/mm/yyyy hh:ii' </s:if> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-07-16 09:56:58 UTC (rev 2153) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-07-16 15:26:24 UTC (rev 2154) @@ -28,17 +28,26 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><decorator:title default="Wao"/> - Wao</title> - <sj:head locale="fr" jqueryui="true" loadAtOnce="true"/> + <s:if test="localeFrench"> + <sj:head locale="fr" jqueryui="true" loadAtOnce="true"/> + </s:if> + <s:else> + <sj:head locale="en" jqueryui="true" loadAtOnce="true"/> + </s:else> <sb:head /> <script src="<s:url value="/moment-js-2.5.1/moment-with-langs.js" />"></script> <script src="<s:url value="/select2-3.4.5/select2.min.js" />"></script> - <script src="<s:url value="/select2-3.4.5/select2_locale_fr.js" />"></script> + <s:if test="localeFrench"> + <script src="<s:url value="/select2-3.4.5/select2_locale_fr.js" />"></script> + </s:if> <script src="<s:url value="/bootstrap-2.3.1/bootstrap-tooltip.js" />"></script> <script src="<s:url value="/bootstrap-2.3.1/bootstrap-popover.js" />"></script> <script src="<s:url value="/spin.js-2.0.0/spin.js" />"></script> <script src="<s:url value="/spin.js-2.0.0/jquery.spin.js" />"></script> <script src="<s:url value="/bootstrap-datetimepicker-2.3.1/js/bootstrap-datetimepicker.min.js" />"></script> - <script src="<s:url value="/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js" />"></script> + <s:if test="localeFrench"> + <script src="<s:url value="/bootstrap-datetimepicker-2.3.1/js/locales/bootstrap-datetimepicker.fr.js" />"></script> + </s:if> <script src="<s:url value="/wao.js" />"></script> <script src="<s:url value='/endpoints-js.jsp'/>"></script> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2.css" />" /> @@ -162,7 +171,7 @@ <li> <s:url id="changeLocaleUrl" includeParams="get"> <s:param name="request_locale"> - <s:if test="\"fr\".equals(locale.toLanguageTag())"> + <s:if test="localeFrench"> en </s:if> <s:else>

1 0

r2153 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com July 16, 2014

July 16, 2014

Author: bleny Date: 2014-07-16 11:56:58 +0200 (Wed, 16 Jul 2014) New Revision: 2153 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2153 Log: prevent npe of main observer field is not filled in contact form Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-15 13:01:47 UTC (rev 2152) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-16 09:56:58 UTC (rev 2153) @@ -475,10 +475,13 @@ public void preValidate(UpdateContactCommand updateContactCommand) { String mainObserverId = updateContactCommand.getMainObserverId(); + if (StringUtils.isBlank(mainObserverId)) { + updateContactCommand.getContact().setMainObserver(null); + } else { + WaoUser mainObserver = getWaoUserDao().forTopiaIdEquals(mainObserverId).findUnique(); + updateContactCommand.getContact().setMainObserver(mainObserver); + } - WaoUser mainObserver = getWaoUserDao().forTopiaIdEquals(mainObserverId).findUnique(); - updateContactCommand.getContact().setMainObserver(mainObserver); - List<WaoUser> secondaryObservers = getWaoUserDao().forTopiaIdIn(updateContactCommand.getSecondaryObserverIds()).findAll(); updateContactCommand.getContact().setSecondaryObservers(new HashSet<>(secondaryObservers));

1 0

r2152 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com July 15, 2014

July 15, 2014

Author: bleny Date: 2014-07-15 15:01:47 +0200 (Tue, 15 Jul 2014) New Revision: 2152 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2152 Log: css for instance disclaimer 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-07-15 10:08:16 UTC (rev 2151) +++ trunk/wao-web/src/main/webapp/wao.css 2014-07-15 13:01:47 UTC (rev 2152) @@ -148,6 +148,8 @@ margin-left: auto; margin-right: auto; clear: both; + + margin-bottom: 100px; } footer ul { @@ -243,6 +245,20 @@ background-image: linear-gradient(to bottom, #00b2b2, #0c9696); } +#instance-disclaimer { + padding: 10px; + background: #B63030; + border-top: 1px solid #777777; + color: #ffffff; + position: fixed; + padding: 5px; + bottom: 0; + left: 0; + width: 100%; + height: 50px; + z-index: 99999; +} + /** * Le style général des formulaires */

1 0

r2151 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com July 15, 2014

July 15, 2014

Author: bleny Date: 2014-07-15 12:08:16 +0200 (Tue, 15 Jul 2014) New Revision: 2151 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2151 Log: fixes #5413 add grand total pourcentage in observation days in sampling plan Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 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-07-15 09:37:47 UTC (rev 2150) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-07-15 10:08:16 UTC (rev 2151) @@ -55,6 +55,10 @@ */ protected Long observationTimesInDaysTotalEstimated; + protected Double observationTimesInDaysTotalRealRatio; + + protected Double observationTimesInDaysTotalEstimatedRatio; + public ObsMerSamplingPlan(List<Date> months, Collection<SamplingPlanFacadePart> facadeParts, Map<Date, SamplingPlanStatistics> totalsPerMonth, @@ -68,8 +72,24 @@ this.observationTimesInDaysTotalExpected = observationTimesInDaysTotalExpected; this.observationTimesInDaysTotalReal = observationTimesInDaysTotalReal; this.observationTimesInDaysTotalEstimated = observationTimesInDaysTotalEstimated; + if (observationTimesInDaysTotalExpected != null) { + if (observationTimesInDaysTotalReal != null) { + this.observationTimesInDaysTotalRealRatio = (double) observationTimesInDaysTotalReal / observationTimesInDaysTotalExpected; + } + if (observationTimesInDaysTotalEstimated != null) { + this.observationTimesInDaysTotalEstimatedRatio = (double) observationTimesInDaysTotalEstimated / observationTimesInDaysTotalExpected; + } + } } + public Double getObservationTimesInDaysTotalRealRatio() { + return observationTimesInDaysTotalRealRatio; + } + + public Double getObservationTimesInDaysTotalEstimatedRatio() { + return observationTimesInDaysTotalEstimatedRatio; + } + public Double getObservationTimesInDaysTotalExpected() { return observationTimesInDaysTotalExpected; } 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-07-15 09:37:47 UTC (rev 2150) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-07-15 10:08:16 UTC (rev 2151) @@ -599,6 +599,15 @@ / </s:if> <s:property value="#expected"/> <s:text name="wao.ui.misc.day"/> + + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + <span class="estimated<s:if test="#estimated < #expected"> lower-than-expected</s:if><s:if test="#estimated > #expected"> higher-than-expected</s:if>"> + <s:property value="samplingPlan.observationTimesInDaysTotalEstimatedRatio * 100" /> % + </span> + <span class="real<s:if test="#real < #expected"> lower-than-expected</s:if><s:if test="#real > #expected"> higher-than-expected</s:if>"> + <s:property value="samplingPlan.observationTimesInDaysTotalRealRatio * 100" /> % + </span> + </s:if> </td> <th colspan="${nbColumnsForOther}"></th> </tfoot>

1 0

r2150 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-web/src/main/java/fr/ifremer/wao/web/action/administration
by bleny＠users.forge.codelutin.com July 15, 2014

July 15, 2014

Author: bleny Date: 2014-07-15 11:37:47 +0200 (Tue, 15 Jul 2014) New Revision: 2150 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2150 Log: refs #5430 review company initialisation when creating wao user as coordinator Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-07-15 09:37:08 UTC (rev 2149) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-07-15 09:37:47 UTC (rev 2150) @@ -102,17 +102,25 @@ } - public WaoUser newWaoUser() { + public WaoUser newWaoUser(Optional<String> optionalCompanyId) { WaoUserImpl newWaoUser = new WaoUserImpl(); newWaoUser.setActive(true); + if (optionalCompanyId.isPresent()) { + + Company company = getCompanyDao().forTopiaIdEquals(optionalCompanyId.get()).findUnique(); + + newWaoUser.setCompany(company); + + } + return newWaoUser; } - public UpdateWaoUserCommand newUpdateWaoUserCommand(ObsProgram obsProgram, Optional<String> optionalUserId) { + public UpdateWaoUserCommand newUpdateWaoUserCommand(ObsProgram obsProgram, Optional<String> optionalUserId, Optional<String> optionalCompanyId) { UpdateWaoUserCommand updateWaoUserCommand = new UpdateWaoUserCommand(); @@ -144,7 +152,7 @@ } else { - updateWaoUserCommand.setWaoUser(newWaoUser()); + updateWaoUserCommand.setWaoUser(newWaoUser(optionalCompanyId)); updateWaoUserCommand.setPasswordStrategy(UpdateWaoUserCommandPasswordStrategy.GENERATE_NEW_PASSWORD); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-07-15 09:37:08 UTC (rev 2149) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-07-15 09:37:47 UTC (rev 2150) @@ -24,12 +24,10 @@ import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Strings; -import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.services.service.administration.LoginMustBeUniqueException; import fr.ifremer.wao.services.service.administration.UnknownBoatImmatriculationsException; import fr.ifremer.wao.services.service.administration.UpdateWaoUserCommand; -import fr.ifremer.wao.services.service.administration.UpdateWaoUserCommandPasswordStrategy; import fr.ifremer.wao.services.service.administration.WaoUsersService; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.StringUtils; @@ -67,12 +65,8 @@ @Override public void prepare() { - updateWaoUserCommand = service.newUpdateWaoUserCommand(getObsProgram(), optionalWaoUserId); + updateWaoUserCommand = service.newUpdateWaoUserCommand(getObsProgram(), optionalWaoUserId, optionalCompanyId); - if (optionalCompanyId.isPresent()) { - updateWaoUserCommand.setCompanyId(optionalCompanyId.get()); - } - } @Override @@ -129,7 +123,7 @@ public UpdateWaoUserCommand getUpdateWaoUserCommand() { if (updateWaoUserCommand == null) { - return service.newUpdateWaoUserCommand(getObsProgram(), optionalWaoUserId); + prepare(); } return updateWaoUserCommand; }

1 0