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

r2073 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 17:50:28 +0200 (Thu, 19 Jun 2014) New Revision: 2073 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2073 Log: fixes #5282 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-19 15:45:23 UTC (rev 2072) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-19 15:50:28 UTC (rev 2073) @@ -192,9 +192,6 @@ <fieldset> <legend><s:text name="wao.ui.misc.observers"/></legend> - <s:set name="editObservers" - value="%{authenticatedWaoUser.isAuthorizedToEditContactObservers(updateContactCommand.contact)}"/> - <s:select name="updateContactCommand.mainObserverId" value="%{updateContactCommand.mainObserverId}" label="%{getText('wao.ui.field.Contact.mainObserver')}"

1 0

r2072 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 17:45:23 +0200 (Thu, 19 Jun 2014) New Revision: 2072 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2072 Log: fixes #5283 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-06-19 14:33:56 UTC (rev 2071) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-06-19 15:45:23 UTC (rev 2072) @@ -101,7 +101,7 @@ e.preventDefault(); if (confirm("<s:text name="wao.ui.removeBoatEligibility.confirm"/>")) { var url = $(this).attr('href'); - var $toRemove = $(this).parents('li, div') + var $toRemove = $(this).parents('.elligible-sample-row') var successCallback = function (data) { $toRemove.remove(); }; @@ -201,7 +201,7 @@ <div class="control-group"> <div class="controls"> <s:iterator value="boatDetails.elligibleForSampleRows" status="status"> - <div> + <div class="elligible-sample-row"> <s:set name="radioId">radio-<s:property value="#status.index"/></s:set> <input type="radio" name="sampleRowId" id="<s:property value="#radioId"/>" value="<s:property value="topiaId"/>"/> <%-- @@ -233,7 +233,7 @@ <s:else> <ul> <s:iterator value="boatDetails.elligibleForSampleRows"> - <li> + <li class="elligible-sample-row"> <s:property value="code"/> <s:url action="update-boat-elligibility-json" id="updateBoatElligibilityUrl"> <s:param name="boatId" value="boatDetails.boatInfos.boat.topiaId"/>

1 0

r2071 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web/action java/fr/ifremer/wao/web/action/obsmer webapp/WEB-INF/content webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 16:33:56 +0200 (Thu, 19 Jun 2014) New Revision: 2071 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2071 Log: refs #4552 news page for obsvente Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/DeleteNewsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditNewsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/NewsAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/edit-news-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/news.jsp Removed: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp Copied: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/DeleteNewsAction.java (from rev 2060, trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java) =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/DeleteNewsAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/DeleteNewsAction.java 2014-06-19 14:33:56 UTC (rev 2071) @@ -0,0 +1,59 @@ +package fr.ifremer.wao.web.action; + +/* + * #%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.services.service.administration.NewsService; +import fr.ifremer.wao.web.WaoJspActionSupport; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "news" }) +}) +public class DeleteNewsAction extends WaoJspActionSupport { + + private static final long serialVersionUID = 1L; + + protected transient NewsService service; + + protected String newsId; + + public void setService(NewsService service) { + this.service = service; + } + + public void setNewsId(String newsId) { + this.newsId = newsId; + } + + @Override + public String execute() { + + service.delete(newsId); + + addActionMessage("Suppression effectuée"); + + return SUCCESS; + + } + +} Copied: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditNewsAction.java (from rev 2060, trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java) =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditNewsAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditNewsAction.java 2014-06-19 14:33:56 UTC (rev 2071) @@ -0,0 +1,93 @@ +package fr.ifremer.wao.web.action; + +/* + * #%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 com.opensymphony.xwork2.Preparable; +import fr.ifremer.wao.entity.News; +import fr.ifremer.wao.services.service.administration.NewsService; +import fr.ifremer.wao.web.WaoJspActionSupport; +import org.apache.commons.lang3.StringUtils; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; +import org.jsoup.Jsoup; +import org.jsoup.safety.Whitelist; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "news" }) +}) +public class EditNewsAction extends WaoJspActionSupport implements Preparable { + + private static final long serialVersionUID = 1L; + + protected static final Whitelist WHITE_LIST = Whitelist.basicWithImages().addTags("h1", "h2", "h3"); + + protected transient NewsService service; + + protected String newsId; + + protected News news; + + public void setService(NewsService service) { + this.service = service; + } + + public void setNewsId(String newsId) { + this.newsId = newsId; + } + + public void setNews(News news) { + this.news = news; + } + + @Override + public void prepare() { + if (StringUtils.isEmpty(newsId)) { + news = service.newNews(getAuthenticatedWaoUser()); + } else { + news = service.getNews(newsId); + } + } + + @Override + public String execute() { + + //filtrage de news + String clean = Jsoup.clean(news.getContent(), WHITE_LIST); + news.setContent(clean); + + service.save(news); + + addActionMessage(t("wao.ui.action.createNews.success")); + + return SUCCESS; + + } + + public String getNewsId() { + return newsId; + } + + public News getNews() { + return news; + } + +} Copied: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/NewsAction.java (from rev 2060, trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java) =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/NewsAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/NewsAction.java 2014-06-19 14:33:56 UTC (rev 2071) @@ -0,0 +1,55 @@ +package fr.ifremer.wao.web.action; + +/* + * #%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.entity.News; +import fr.ifremer.wao.services.service.administration.NewsService; +import fr.ifremer.wao.web.WaoJspActionSupport; + +import java.util.List; + +public class NewsAction extends WaoJspActionSupport { + + private static final long serialVersionUID = 1L; + + protected transient NewsService service; + + protected List<News> recentNews; + + public void setService(NewsService service) { + this.service = service; + } + + @Override + public String execute() { + + recentNews = service.getRecentNews(getAuthenticatedWaoUser(), 15); + + return SUCCESS; + + } + + public List<News> getRecentNews() { + return recentNews; + } + +} Deleted: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java 2014-06-19 13:47:26 UTC (rev 2070) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java 2014-06-19 14:33:56 UTC (rev 2071) @@ -1,59 +0,0 @@ -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.services.service.administration.NewsService; -import fr.ifremer.wao.web.WaoJspActionSupport; -import org.apache.struts2.convention.annotation.Result; -import org.apache.struts2.convention.annotation.Results; - -@Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "news" }) -}) -public class DeleteNewsAction extends WaoJspActionSupport { - - private static final long serialVersionUID = 1L; - - protected transient NewsService service; - - protected String newsId; - - public void setService(NewsService service) { - this.service = service; - } - - public void setNewsId(String newsId) { - this.newsId = newsId; - } - - @Override - public String execute() { - - service.delete(newsId); - - addActionMessage("Suppression effectuée"); - - return SUCCESS; - - } - -} Deleted: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java 2014-06-19 13:47:26 UTC (rev 2070) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java 2014-06-19 14:33:56 UTC (rev 2071) @@ -1,93 +0,0 @@ -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 com.opensymphony.xwork2.Preparable; -import fr.ifremer.wao.entity.News; -import fr.ifremer.wao.services.service.administration.NewsService; -import fr.ifremer.wao.web.WaoJspActionSupport; -import org.apache.commons.lang3.StringUtils; -import org.apache.struts2.convention.annotation.Result; -import org.apache.struts2.convention.annotation.Results; -import org.jsoup.Jsoup; -import org.jsoup.safety.Whitelist; - -@Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "news" }) -}) -public class EditNewsAction extends WaoJspActionSupport implements Preparable { - - private static final long serialVersionUID = 1L; - - protected static final Whitelist WHITE_LIST = Whitelist.basicWithImages().addTags("h1", "h2", "h3"); - - protected transient NewsService service; - - protected String newsId; - - protected News news; - - public void setService(NewsService service) { - this.service = service; - } - - public void setNewsId(String newsId) { - this.newsId = newsId; - } - - public void setNews(News news) { - this.news = news; - } - - @Override - public void prepare() { - if (StringUtils.isEmpty(newsId)) { - news = service.newNews(getAuthenticatedWaoUser()); - } else { - news = service.getNews(newsId); - } - } - - @Override - public String execute() { - - //filtrage de news - String clean = Jsoup.clean(news.getContent(), WHITE_LIST); - news.setContent(clean); - - service.save(news); - - addActionMessage(t("wao.ui.action.createNews.success")); - - return SUCCESS; - - } - - public String getNewsId() { - return newsId; - } - - public News getNews() { - return news; - } - -} Deleted: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java 2014-06-19 13:47:26 UTC (rev 2070) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java 2014-06-19 14:33:56 UTC (rev 2071) @@ -1,55 +0,0 @@ -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.entity.News; -import fr.ifremer.wao.services.service.administration.NewsService; -import fr.ifremer.wao.web.WaoJspActionSupport; - -import java.util.List; - -public class NewsAction extends WaoJspActionSupport { - - private static final long serialVersionUID = 1L; - - protected transient NewsService service; - - protected List<News> recentNews; - - public void setService(NewsService service) { - this.service = service; - } - - @Override - public String execute() { - - recentNews = service.getRecentNews(getAuthenticatedWaoUser(), 15); - - return SUCCESS; - - } - - public List<News> getRecentNews() { - return recentNews; - } - -} Copied: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-news-input.jsp (from rev 2060, trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp) =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-news-input.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-news-input.jsp 2014-06-19 14:33:56 UTC (rev 2071) @@ -0,0 +1,69 @@ +<%-- + #%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% + --%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@taglib uri="/struts-tags" prefix="s" %> + +<html> + <head> + <link rel="stylesheet" type="text/css" href="<s:url value='/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.css' />" /> + <script src="<s:url value='/wysihtml5-0.3.0/wysihtml5.js'/>"></script> + <script src="<s:url value='/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.js' />"></script> + <s:if test="!getText('wao.ui.wysihtml5.lang').equals('en')"> + <script src="<s:url value='/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.%{getText("wao.ui.wysihtml5.lang")}.js' />"></script> + </s:if> + <script> + $(document).ready(function () { + $("#editor").wysihtml5({ + locale: "<s:property value="%{getText('wao.ui.wysihtml5.lang')}"/>", + stylesheets: ["<s:url value='/bootstrap-wysihtml5-0.0.2/wysiwyg-color.css' />"] + }); + }); + </script> + <content tag="mainClass">form</content> + + </head> + + <s:form onsubmit="save();"> + + <s:hidden name="newsId" value="%{newsId}" /> + + <s:textfield name="news.title" label="%{getText('wao.ui.news.title')}" cssClass="input-xxlarge" /> + + <s:textarea label="%{getText('wao.ui.news.content')}" + name="news.content" + id="editor" + rows="8"/> + + <div class="form-actions"> + <s:url action="news" id="newsUrl" /> + <s:a href="%{newsUrl}" cssClass="btn"> + <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.cancel" /> + </s:a> + + <s:submit type="button" cssClass="btn"> + <i class="icon-hdd"></i> <s:text name="wao.ui.action.save" /> + </s:submit> + </div> + + </s:form> + +</html> + Copied: trunk/wao-web/src/main/webapp/WEB-INF/content/news.jsp (from rev 2060, trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp) =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/news.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/news.jsp 2014-06-19 14:33:56 UTC (rev 2071) @@ -0,0 +1,88 @@ +<%-- + #%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% + --%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@taglib uri="/struts-tags" prefix="s" %> + +<content tag="newsMenuItemClass">active</content> + +<html> + + <head> + + </head> + + <content tag="mainClass">home</content> + + <s:if test="authenticatedWaoUser.authorizedToCreateNews"> + <content tag="administrationMenuOtherOptions"> + <li> + <s:url action="edit-news!input" id="createNewsUrl"/> + <s:a href="%{createNewsUrl}"> + <i class="fa fa-plus-square"></i> <s:text name="wao.ui.action.createNews"/> + </s:a> + </li> + </content> + </s:if> + + <div class="buttons-area"> + </div> + + <s:iterator value="recentNews" var="aRecentNews"> + + <div class="news"> + <h2> + <s:property value="title" /> + </h2> + + <s:property value="content" escapeHtml="false" /> + + <p class="publication"> + <s:if test="fromAdmin"> + <s:text name="wao.ui.publishedByProgram" /> + </s:if> + <s:else> + <s:text name="wao.ui.publishedByYourCompany" /> + </s:else> + <s:text name="wao.ui.misc.onDate" /> + <s:property value="topiaCreateDate" /> + + <s:if test="authenticatedWaoUser.isAuthorizedToEditOrDeleteNews(#aRecentNews)"> + + <s:url action="delete-news" id="deleteNewsUrl"> + <s:param name="newsId" value="topiaId" /> + </s:url> + <s:a href="%{deleteNewsUrl}" cssClass="btn-link" title="%{getText('wao.ui.action.delete')}" > + <i class="fa fa-trash-o"></i> + </s:a> + + <s:url action="edit-news!input" id="editNewsUrl"> + <s:param name="newsId" value="topiaId" /> + </s:url> + <s:a href="%{editNewsUrl}" cssClass="btn-link btn-link-edit" title="%{getText('wao.ui.action.edit')}"> + <i class="fa fa-edit"></i> + </s:a> + </s:if> + </p> + </div> + + </s:iterator> + +</html> Deleted: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-06-19 13:47:26 UTC (rev 2070) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-06-19 14:33:56 UTC (rev 2071) @@ -1,69 +0,0 @@ -<%-- - #%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% - --%> -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@taglib uri="/struts-tags" prefix="s" %> - -<html> - <head> - <link rel="stylesheet" type="text/css" href="<s:url value='/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.css' />" /> - <script src="<s:url value='/wysihtml5-0.3.0/wysihtml5.js'/>"></script> - <script src="<s:url value='/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.js' />"></script> - <s:if test="!getText('wao.ui.wysihtml5.lang').equals('en')"> - <script src="<s:url value='/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.%{getText("wao.ui.wysihtml5.lang")}.js' />"></script> - </s:if> - <script> - $(document).ready(function () { - $("#editor").wysihtml5({ - locale: "<s:property value="%{getText('wao.ui.wysihtml5.lang')}"/>", - stylesheets: ["<s:url value='/bootstrap-wysihtml5-0.0.2/wysiwyg-color.css' />"] - }); - }); - </script> - <content tag="mainClass">form</content> - - </head> - - <s:form onsubmit="save();"> - - <s:hidden name="newsId" value="%{newsId}" /> - - <s:textfield name="news.title" label="%{getText('wao.ui.news.title')}" cssClass="input-xxlarge" /> - - <s:textarea label="%{getText('wao.ui.news.content')}" - name="news.content" - id="editor" - rows="8"/> - - <div class="form-actions"> - <s:url action="news" id="newsUrl" /> - <s:a href="%{newsUrl}" cssClass="btn"> - <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.cancel" /> - </s:a> - - <s:submit type="button" cssClass="btn"> - <i class="icon-hdd"></i> <s:text name="wao.ui.action.save" /> - </s:submit> - </div> - - </s:form> - -</html> - Deleted: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-06-19 13:47:26 UTC (rev 2070) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-06-19 14:33:56 UTC (rev 2071) @@ -1,88 +0,0 @@ -<%-- - #%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% - --%> -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@taglib uri="/struts-tags" prefix="s" %> - -<content tag="newsMenuItemClass">active</content> - -<html> - - <head> - - </head> - - <content tag="mainClass">home</content> - - <s:if test="authenticatedWaoUser.authorizedToCreateNews"> - <content tag="administrationMenuOtherOptions"> - <li> - <s:url action="edit-news!input" id="createNewsUrl"/> - <s:a href="%{createNewsUrl}"> - <i class="fa fa-plus-square"></i> <s:text name="wao.ui.action.createNews"/> - </s:a> - </li> - </content> - </s:if> - - <div class="buttons-area"> - </div> - - <s:iterator value="recentNews" var="aRecentNews"> - - <div class="news"> - <h2> - <s:property value="title" /> - </h2> - - <s:property value="content" escapeHtml="false" /> - - <p class="publication"> - <s:if test="fromAdmin"> - <s:text name="wao.ui.publishedByProgram" /> - </s:if> - <s:else> - <s:text name="wao.ui.publishedByYourCompany" /> - </s:else> - <s:text name="wao.ui.misc.onDate" /> - <s:property value="topiaCreateDate" /> - - <s:if test="authenticatedWaoUser.isAuthorizedToEditOrDeleteNews(#aRecentNews)"> - - <s:url action="delete-news" id="deleteNewsUrl"> - <s:param name="newsId" value="topiaId" /> - </s:url> - <s:a href="%{deleteNewsUrl}" cssClass="btn-link" title="%{getText('wao.ui.action.delete')}" > - <i class="fa fa-trash-o"></i> - </s:a> - - <s:url action="edit-news!input" id="editNewsUrl"> - <s:param name="newsId" value="topiaId" /> - </s:url> - <s:a href="%{editNewsUrl}" cssClass="btn-link btn-link-edit" title="%{getText('wao.ui.action.edit')}"> - <i class="fa fa-edit"></i> - </s:a> - </s:if> - </p> - </div> - - </s:iterator> - -</html>

1 0

r2070 - trunk/wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 15:47:26 +0200 (Thu, 19 Jun 2014) New Revision: 2070 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2070 Log: fixes #5278 Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-19 13:36:10 UTC (rev 2069) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-19 13:47:26 UTC (rev 2070) @@ -484,7 +484,7 @@ wao.ui.page.waoUsers.titleForCompany=Users for company %s wao.ui.publishedByProgram=Pusblished by program wao.ui.publishedByYourCompany=Published by company -wao.ui.removeBoatEligibility.confirm=Êtes-vous sûr de vouloir rendre le navire inéligible pour cette ligne ? +wao.ui.removeBoatEligibility.confirm=Are you sure you want to make this boat ineligible for sample row ? wao.ui.sampleRow.creation=Creation of a sample row wao.ui.sampleRow.edition=Edition of line %s wao.ui.sampleRowLog.title=%s line historic Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-19 13:36:10 UTC (rev 2069) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-19 13:47:26 UTC (rev 2070) @@ -484,7 +484,7 @@ wao.ui.page.waoUsers.titleForCompany=Utilisateurs de la société %s wao.ui.publishedByProgram=Publiée par le programme wao.ui.publishedByYourCompany=Publiée par la société -wao.ui.removeBoatEligibility.confirm=Are you sure you want to make this boat ineligible for sample row ? +wao.ui.removeBoatEligibility.confirm=Êtes-vous sûr de vouloir rendre le navire inéligible pour cette ligne ? wao.ui.sampleRow.creation=Création d'une ligne du plan d'échantillonnage wao.ui.sampleRow.edition=Modification de la ligne %s wao.ui.sampleRowLog.title=Historique de la ligne %s

1 0

r2069 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 15:36:10 +0200 (Thu, 19 Jun 2014) New Revision: 2069 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2069 Log: fixes #5279 always show edit contact link Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-19 13:28:17 UTC (rev 2068) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-19 13:36:10 UTC (rev 2069) @@ -273,12 +273,6 @@ return result; } - public boolean isAuthorizedToEditContactObservers(Contact contact) { - return isCoordinatorOrObserver() && - contact.getValidationProgram() == null - && isCanWrite(); - } - public boolean isAuthorizedToEditObservationReport(Contact contact) { return isCoordinatorOrObserver() && contact.getValidationCompany() == null 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-19 13:28:17 UTC (rev 2068) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-19 13:36:10 UTC (rev 2069) @@ -496,23 +496,20 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <s:if test="authenticatedWaoUser.isAuthorizedToEditOrDeleteContact(#contact)"> - <li> - <s:if test="authenticatedWaoUser.admin"> - <s:set name="focusAnchor">adminFocus</s:set> - </s:if> - <s:else> - <s:set name="focusAnchor">coordinatorOrObserverFocus</s:set> - </s:else> - <s:url action="edit-contact!input" id="editContactUrl" anchor='%{focusAnchor}'> - <s:param name="contactId" value="topiaId"/> - - </s:url> - <s:a href="%{editContactUrl}"> - <i class="icon-edit"></i> <s:text name="wao.ui.action.editOrDeleteContact"/> - </s:a> - </li> - </s:if> + <li> + <s:if test="authenticatedWaoUser.admin"> + <s:set name="focusAnchor">adminFocus</s:set> + </s:if> + <s:else> + <s:set name="focusAnchor">coordinatorOrObserverFocus</s:set> + </s:else> + <s:url action="edit-contact!input" id="editContactUrl" anchor='%{focusAnchor}'> + <s:param name="contactId" value="topiaId"/> + </s:url> + <s:a href="%{editContactUrl}"> + <i class="icon-edit"></i> <s:text name="wao.ui.action.editOrDeleteContact"/> + </s:a> + </li> <s:if test="authenticatedWaoUser.authorizedToChangeContactValidation"> <li> <s:url action="validate-contact-json" id="acceptContactUrl" escapeAmp="false"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-19 13:28:17 UTC (rev 2068) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-19 13:36:10 UTC (rev 2069) @@ -184,6 +184,9 @@ <s:form> + <s:set name="editObservationReport" + value="%{authenticatedWaoUser.isAuthorizedToEditObservationReport(updateContactCommand.contact)}"/> + <s:hidden name="contactId" value="%{contactId}"/> <fieldset> @@ -197,7 +200,7 @@ label="%{getText('wao.ui.field.Contact.mainObserver')}" list="observers" emptyOption="true" - disabled="%{!#editObservers}" + disabled="%{!#editObservationReport}" cssClass="input-large" /> @@ -206,7 +209,7 @@ label="%{getText('wao.ui.field.Contact.secondaryObservers')}" list="observers" multiple="true" - disabled="%{!#editObservers}" + disabled="%{!#editObservationReport}" cssClass="input-xlarge" /> @@ -216,9 +219,6 @@ <fieldset id="coordinatorOrObserverFocus"> <legend><s:text name="wao.ui.misc.observationReport"/></legend> - <s:set name="editObservationReport" - value="%{authenticatedWaoUser.isAuthorizedToEditObservationReport(updateContactCommand.contact)}"/> - <s:textfield name="updateContactCommand.contact.observationBeginDate" label="%{getText('wao.ui.field.Contact.beginDate')}" placeholder="%{getDateTimePlaceholder()}"

1 0

r2068 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/test/java/fr/ifremer/wao wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 15:28:17 +0200 (Thu, 19 Jun 2014) New Revision: 2068 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2068 Log: fixes #5276, prevent formatting month when a date is given Added: trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 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/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-06-19 10:37:22 UTC (rev 2067) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-06-19 13:28:17 UTC (rev 2068) @@ -109,6 +109,9 @@ public static Date parseMonth(Locale locale, String monthYear) throws ParseException { String pattern = I18n.l(locale, "wao.month.parser"); + if (monthYear.length() != pattern.length()) { + throw new ParseException(monthYear, 0); + } DateFormat dateFormat = new SimpleDateFormat(pattern); return dateFormat.parse(monthYear); } Added: trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java (rev 0) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2014-06-19 13:28:17 UTC (rev 2068) @@ -0,0 +1,34 @@ +package fr.ifremer.wao; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +import java.text.ParseException; +import java.util.Locale; + +public class WaoUtilsTest { + + private static final Log log = LogFactory.getLog(WaoUtilsTest.class); + + @Test + public void testParseMonth() { + + try { + WaoUtils.parseMonth(Locale.FRANCE, "12/2014"); + } catch (ParseException e) { + Assert.fail(); + } + + try { + WaoUtils.parseMonth(Locale.FRANCE, "01/12/2014"); + Assert.fail(); + } catch (ParseException e) { + if (log.isDebugEnabled()) { + log.debug("exception raised", e); + } + } + + } +} \ No newline at end of file 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-19 10:37:22 UTC (rev 2067) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-06-19 13:28:17 UTC (rev 2068) @@ -21,15 +21,15 @@ * #L% */ -import java.util.Date; - -import org.apache.commons.lang3.time.DateUtils; -import org.nuiton.util.pagination.PaginationResult; - import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; +import fr.ifremer.wao.web.action.obsmer.SamplingPlanAction; +import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.util.pagination.PaginationResult; +import java.util.Date; + public class WaoJspActionSupport extends WaoActionSupport { private static final long serialVersionUID = 1L; @@ -66,6 +66,19 @@ return getText(enumeration.getClass().getSimpleName() + "." + enumeration.name()); } + @Override + public String getText(String aTextName, String defaultValue) { + String text = super.getText(aTextName, defaultValue); + if ("invalid.fieldvalue.filter.periodFrom".equals(aTextName)) { + if (this instanceof SamplingPlanAction) { + text = getText("wao.ui.invalidMonthFormat"); + } else { + text = getText("wao.ui.invalidDateFormat"); + } + } + return text; + } + public String formatMonth(Date date) { return date == null ? "" : WaoUtils.formatMonth(getLocale(), date); } Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-19 10:37:22 UTC (rev 2067) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-19 13:28:17 UTC (rev 2068) @@ -415,7 +415,9 @@ wao.ui.indicator.useRightDecimalSymbol=Use '.' for non-round values wao.ui.indicators.coefficientsSum=Coefficients sum wao.ui.indicators.title=Providers quality indicators +wao.ui.invalidDateFormat=Expected format is yyyy-mm-dd wao.ui.invalidLogin=Invalid identifier +wao.ui.invalidMonthFormat=Expected format is yyyy-mm wao.ui.layout.userDescription=You are %s of company %s (%s) wao.ui.message.chooseProfile=Choose your profile \: wao.ui.misc.METIER=METIER Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-19 10:37:22 UTC (rev 2067) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-19 13:28:17 UTC (rev 2068) @@ -415,7 +415,9 @@ wao.ui.indicator.useRightDecimalSymbol=Attention à bien utiliser ',' et non '.' pour les décimales wao.ui.indicators.coefficientsSum=Total coefficient wao.ui.indicators.title=Indicateurs qualités prestataires +wao.ui.invalidDateFormat=Le format attendu est jj/mm/aaaa wao.ui.invalidLogin=Identifiant invalide +wao.ui.invalidMonthFormat=Le format attendu est mm/aaaa wao.ui.layout.userDescription=Vous êtes %s de la société %s (%s) wao.ui.message.chooseProfile=Choisissez dans la liste votre profil de connexion \: wao.ui.misc.METIER=MÉTIER

1 0

r2067 - trunk/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 12:37:22 +0200 (Thu, 19 Jun 2014) New Revision: 2067 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2067 Log: reset synthesis filter on logout Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 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-19 09:27:09 UTC (rev 2066) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-06-19 10:37:22 UTC (rev 2067) @@ -81,13 +81,14 @@ public void logout() { messages = null; errorMessages = null; - authenticatedWaoUser= null; - sampleRowToHighlightId= null; - contactToHighlightId= null; - startBoatSelectionForSampleRowId= null; - sampleRowsFilter= null; - boatsFilter= null; - contactsFilter= null; + authenticatedWaoUser = null; + sampleRowToHighlightId = null; + contactToHighlightId = null; + startBoatSelectionForSampleRowId = null; + sampleRowsFilter = null; + boatsFilter = null; + contactsFilter = null; + synthesisFilter = null; } public AuthenticatedWaoUser getAuthenticatedWaoUser() {

1 0

r2066 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 11:27:09 +0200 (Thu, 19 Jun 2014) New Revision: 2066 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2066 Log: refs #4493 add a unit in synthesis Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 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-19 09:18:44 UTC (rev 2065) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-19 09:27:09 UTC (rev 2066) @@ -309,6 +309,7 @@ </td> <td<s:if test="dataInputDateReactivityHigh"> class="lower-than-expected"</s:if>> <s:property value="dataInputDateReactivity"/> + <s:text name="wao.ui.unit.days"/> </td> </tr> </s:iterator>

1 0

r2065 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/resources/i18n wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 11:18:44 +0200 (Thu, 19 Jun 2014) New Revision: 2065 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2065 Log: fixes #5253 add validation rule for mammals info Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.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/obsmer/EditContactAction.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java 2014-06-19 09:18:44 UTC (rev 2065) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.Contact; + +public class MissingContactMammalsInfoException extends WaoContactValidationException { + + public MissingContactMammalsInfoException(Contact contact) { + super(contact); + } +} 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-06-19 09:14:57 UTC (rev 2064) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-06-19 09:18:44 UTC (rev 2065) @@ -424,6 +424,9 @@ String state = WaoUtils.l(l, e.getContact().getContactState()); String message = l(l, "wao.import.contact.failure.missingObservationBeginDate", lineNumber, state); throw new ImportErrorException(message); + } catch (MissingContactMammalsInfoException e) { + String message = l(l, "wao.import.contact.failure.missingContactMammalsInfo", lineNumber); + throw new ImportErrorException(message); } save0(updateContactCommand); @@ -464,6 +467,7 @@ MissingContactStateMotifException, UnwantedContactContactStateMotifException, MissingContactObservedDataControlException, + MissingContactMammalsInfoException, ContactWithObservedDataControlToCorrectionAskedException, MissingContactRestitutionException, MissingContactDataInputDateException, @@ -644,6 +648,10 @@ throw new UnwantedContactContactStateMotifException(contact); } + if (contact.isMammalsCapture() && StringUtils.isBlank(contact.getMammalsInfo())) { + throw new MissingContactMammalsInfoException(contact); + } + if (BooleanUtils.isTrue(contact.getValidationCompany())) { //--- 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-06-19 09:14:57 UTC (rev 2064) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-19 09:18:44 UTC (rev 2065) @@ -45,6 +45,7 @@ wao.import.contact.failure.mismatchCompanyForObserver=L'observateur %s n'est pas membre de la société %s wao.import.contact.failure.missingComment=You must give a comment for state '%s' wao.import.contact.failure.missingCommentAdmin=You must precise in admin comment why data reliability is '%s' +wao.import.contact.failure.missingContactMammalsInfo=You must provide information about capture wao.import.contact.failure.missingContactStateMotif=You must precise a motif for the refusal wao.import.contact.failure.missingDataInputDate=Il faut préciser une date de saisie des données en plus de la date de transmission de la restitution wao.import.contact.failure.missingDataReliability=You must provide data reliability before validating 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-06-19 09:14:57 UTC (rev 2064) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-19 09:18:44 UTC (rev 2065) @@ -42,6 +42,7 @@ wao.import.contact.failure.mismatchCompanyForObserver=Ligne %s \: L'observateur %s n'est pas membre de la société %s wao.import.contact.failure.missingComment=Ligne %s \: Il faut préciser un commentaire pour l'état '%s' wao.import.contact.failure.missingCommentAdmin=Ligne %s \: Il faut préciser dans le commentaire administrateur pourquoi la donnée est '%s' +wao.import.contact.failure.missingContactMammalsInfo=Ligne %s \: Il faut préciser le détail des espèces capturées wao.import.contact.failure.missingContactStateMotif=Ligne %s \: Il faut préciser un motif de refus wao.import.contact.failure.missingDataInputDate=Ligne %s \: Il faut préciser une date de saisie des données en plus de la date de transmission de la restitution wao.import.contact.failure.missingDataReliability=Ligne %s \: Il faut préciser la qualité de la donnée avant de valider 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-19 09:14:57 UTC (rev 2064) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-19 09:18:44 UTC (rev 2065) @@ -49,6 +49,7 @@ import fr.ifremer.wao.services.service.MissingContactDataInputDateException; import fr.ifremer.wao.services.service.MissingContactDataReliabilityException; import fr.ifremer.wao.services.service.MissingContactMainObserverException; +import fr.ifremer.wao.services.service.MissingContactMammalsInfoException; import fr.ifremer.wao.services.service.MissingContactNbObservantsException; import fr.ifremer.wao.services.service.MissingContactObservationBeginDateException; import fr.ifremer.wao.services.service.MissingContactObservationEndDateException; @@ -296,6 +297,9 @@ String state = WaoUtils.l(getLocale(), e.getContact().getContactState()); addFieldError("updateContactCommand.contact.observationBeginDate", t("wao.ui.form.Contact.error.missingObservationBeginDate", state)); + } catch (MissingContactMammalsInfoException e) { + addFieldError("updateContactCommand.contact.mammalsInfo", t("wao.ui.form.Contact.error.missingMammalsInfo")); + } } Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-19 09:14:57 UTC (rev 2064) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-19 09:18:44 UTC (rev 2065) @@ -294,6 +294,7 @@ wao.ui.form.Contact.error.missingDataInputDate=The data input date must be provided wao.ui.form.Contact.error.missingDataReliability=The data reliability must be provided wao.ui.form.Contact.error.missingMainObserver=The main observer must be provided +wao.ui.form.Contact.error.missingMammalsInfo=You must precise information about capture wao.ui.form.Contact.error.missingObservationBeginDate=The observation begin date must be provided wao.ui.form.Contact.error.missingObservationEndDate=The observation end date must be provided wao.ui.form.Contact.error.missingObservedDataControl=The observed data control must be provided Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-19 09:14:57 UTC (rev 2064) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-19 09:18:44 UTC (rev 2065) @@ -294,6 +294,7 @@ wao.ui.form.Contact.error.missingDataInputDate=Il faut préciser une date de saisie des données en plus de la date de transmission de la restitution wao.ui.form.Contact.error.missingDataReliability=Il faut préciser la qualité de la donnée avant de valider wao.ui.form.Contact.error.missingMainObserver=Il faut au moins un observateur référant +wao.ui.form.Contact.error.missingMammalsInfo=Il faut préciser le détail des espèces capturées wao.ui.form.Contact.error.missingObservationBeginDate=La date de début de marée est obligatoire pour l'état '%s' wao.ui.form.Contact.error.missingObservationEndDate=La date de fin d'observation est obligatoire pour l'état '%s' wao.ui.form.Contact.error.missingObservedDataControl=Il faut préciser une valeur pour le contrôle des données observées @@ -468,7 +469,7 @@ wao.ui.page.Administration.title=Administration wao.ui.page.Boats.title=Navires wao.ui.page.Cartography.title=Cartographie -wao.ui.page.ContactForm.mammalsInfo.disclaimer=Attention, toutes les informations saisies seront transmises à des personnels extérieurs, soyez riguoureux dans la description de la capture accidentelle +wao.ui.page.ContactForm.mammalsInfo.disclaimer=Noms scientifiques, nombre d'individus, longueur (mesurée ou estimée), sexe, numéro OP de la marée, rejeté à l'eau mort ou vivant. Attention, toutes les informations saisies seront transmises à des personnels extérieurs, soyez riguoureux dans la description de la capture accidentelle. wao.ui.page.ContactForm.title=Modification d'un contact wao.ui.page.Contacts.title=Contacts wao.ui.page.Index.title=Accueil

1 0

r2064 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 11:14:57 +0200 (Thu, 19 Jun 2014) New Revision: 2064 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2064 Log: fixes #5214 change mammals capture icon tooltip implementation 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-19 08:56:45 UTC (rev 2063) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-19 09:14:57 UTC (rev 2064) @@ -448,10 +448,9 @@ title="<s:text name="wao.ui.field.Contact.mammalsObservation"/>"></i>  </s:if> <s:if test="mammalsCapture"> - <span data-original-title="<s:property value="mammalsInfo" escapeHtml="false"/>" data-toggle="tooltip" data-placement="left"> - <img src="<s:url value="/img/hook-22px.png"/>" - alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> - </span> + <img src="<s:url value="/img/hook-22px.png"/>" + alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>" + title="<s:property value="mammalsInfo" escapeHtml="false"/>"/> </s:if> </td> <s:if test="authenticatedWaoUser.authorizedToViewContactsComments">

1 0