Author: sletellier Date: 2011-10-12 18:20:34 +0200 (Wed, 12 Oct 2011) New Revision: 139 Url: http://chorem.org/repositories/revision/vradi/139 Log: - Refoactor extractId method to WikittyUtils class - Fix some bugs on parteners - Add return links on pages - Add tiltes on pages - Use wikitty field tags Removed: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceHelper.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormManager.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AssignXmlStreamTasks.java trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiHelper.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientUsersNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsAndUsersNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupUsersNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupsNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/StreamNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/AdminListSelectorHandler.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/GroupListSelectorHandler.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/UserListSelectorHandler.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/EmailDataHelper.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailFormNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupUsersNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailUsersNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/models/EmailEntityModel.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusSelectionManager.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeHelper.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeTableHelper.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusTreeTableNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusTreeTableNodeLoadors.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/tree/loadors/AbstractVradiNodeLoadors.java trunk/vradi-web/src/main/java/org/chorem/vradi/InvitationResult.java trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java 2011-10-12 16:20:34 UTC (rev 139) @@ -129,6 +129,10 @@ return ordinal() - 1; } + public String getValueAsString() { + return String.valueOf(getValue()); + } + public static SendingStatus getStatus(int i) { for (SendingStatus status : values()) { if (status.getValue() == i) { Deleted: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceHelper.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,44 +0,0 @@ -/* - * #%L - * Vradi :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 Codelutin - * %% - * 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% - */ -package org.chorem.vradi; - -import org.nuiton.wikitty.entities.BusinessEntity; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -/** - * @author sletellier - */ -public class VradiServiceHelper { - - public static List<String> extractIds(Collection<? extends BusinessEntity> beans) { - List<String> ids = new ArrayList<String>(); - for (BusinessEntity bean : beans) { - ids.add(bean.getWikittyId()); - } - return ids; - } -} Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java 2011-10-12 16:20:34 UTC (rev 139) @@ -24,6 +24,7 @@ package org.chorem.vradi.beans; import org.chorem.vradi.entities.Form; +import org.nuiton.wikitty.WikittyUtil; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -86,28 +87,16 @@ public FormPagedResult(List<Form> formsToShow, int totalFoundFormNb, int pageToShow, int nbFormsToShow) { this(); - formsIdsToShow = extractIds(formsToShow); + formsIdsToShow = WikittyUtil.getIds(formsToShow); this.totalFoundFormNb = totalFoundFormNb; this.pageToShow = pageToShow; this.nbFormsToShow = nbFormsToShow; } public void setFormsToShow(List<Form> formsToShow) { - setFormsIdsToShow(extractIds(formsToShow)); + setFormsIdsToShow(WikittyUtil.getIds(formsToShow)); } - protected List<String> extractIds(List<Form> formsToShow) { - List<String> formsIds = new ArrayList<String>(); - if (formsToShow != null) { - for (Form form : formsToShow) { - if (form != null) { - formsIds.add(form.getWikittyId()); - } - } - } - return formsIds; - } - public List<String> getFormsIdsToShow() { return formsIdsToShow; } Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormManager.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormManager.java 2011-10-12 16:20:34 UTC (rev 139) @@ -58,7 +58,6 @@ import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.operators.Element; -import java.io.IOException; import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; @@ -1117,7 +1116,7 @@ for (Sending sending : sendings) { if (sending != null) { String userId = user.getWikittyId(); - if (sending != null && userId.equals(sending.getUser())) { + if (userId.equals(sending.getUser())) { if (log.isDebugEnabled()) { log.debug("Sending is existing for queryMaker : " + user.getName()); Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AssignXmlStreamTasks.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AssignXmlStreamTasks.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AssignXmlStreamTasks.java 2011-10-12 16:20:34 UTC (rev 139) @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.vradi.VradiServiceHelper; import org.chorem.vradi.entities.Form; import org.chorem.vradi.entities.Thesaurus; import org.chorem.vradi.services.VradiException; @@ -87,7 +86,7 @@ List<Thesaurus> thesaurusProposed = thesaurusManager.proposeThesaurus(formId); if (!thesaurusProposed.isEmpty()) { Form form = wikittyProxy.restore(Form.class, formId); - form = formManager.updateForm(form, VradiServiceHelper.extractIds(thesaurusProposed)); + form = formManager.updateForm(form, WikittyUtil.getIds(thesaurusProposed)); // Set form as selected form.setStatus(formManager.getSelectionneStatus().getWikittyId()); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -65,7 +65,7 @@ import static org.nuiton.i18n.I18n._; /** @author letellier */ -public class VradiHelper extends VradiServiceHelper { +public class VradiHelper { private static final Log log = LogFactory.getLog(VradiHelper.class); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientUsersNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientUsersNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientUsersNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -29,6 +29,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -57,7 +58,7 @@ // Return users of clients Collections.sort(users, VradiComparators.USER_COMPARATOR); - return extractIds(users); + return WikittyUtil.getIds(users); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsAndUsersNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsAndUsersNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsAndUsersNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,6 +31,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; +import org.nuiton.wikitty.WikittyUtil; import java.util.Collections; import java.util.List; @@ -54,7 +55,7 @@ List<Client> clients = dataService.findAllClients(); Collections.sort(clients, VradiComparators.CLIENT_COMPARATOR); - return extractIds(clients); + return WikittyUtil.getIds(clients); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/ClientsNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -29,6 +29,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; +import org.nuiton.wikitty.WikittyUtil; import java.util.Collections; import java.util.List; @@ -51,7 +52,7 @@ VradiDataService dataService = getDataService(dataProvider); List<Client> clients = dataService.findAllClients(); Collections.sort(clients, VradiComparators.CLIENT_COMPARATOR); - return extractIds(clients); + return WikittyUtil.getIds(clients); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupUsersNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupUsersNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupUsersNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,6 +31,7 @@ import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -67,7 +68,7 @@ } // Return users of group - return extractIds(users); + return WikittyUtil.getIds(users); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupsNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupsNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/GroupsNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,6 +31,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; +import org.nuiton.wikitty.WikittyUtil; import java.util.Collections; import java.util.List; @@ -54,7 +55,7 @@ List<Group> groups = dataService.findAllGroups(); Collections.sort(groups, VradiComparators.GROUP_COMPARATOR); - return extractIds(groups); + return WikittyUtil.getIds(groups); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/StreamNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/StreamNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/loadors/StreamNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -29,6 +29,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.chorem.vradi.ui.tree.loadors.AbstractVradiNodeLoadors; +import org.nuiton.wikitty.WikittyUtil; import java.util.Collections; import java.util.List; @@ -52,7 +53,7 @@ List<XmlStream> streamList = dataService.findAllXmlStreams(); Collections.sort(streamList, VradiComparators.XML_STREAM_COMPARATOR); - return extractIds(streamList); + return WikittyUtil.getIds(streamList); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/AdminListSelectorHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/AdminListSelectorHandler.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/AdminListSelectorHandler.java 2011-10-12 16:20:34 UTC (rev 139) @@ -28,6 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.VradiEntitiesListener; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.BusinessEntity; import java.util.ArrayList; @@ -55,23 +56,12 @@ @Override public void init(List<B> toCombo, List<B> toList) { - idsInCombo = extractId(toCombo); - idsInList = extractId(toList); + idsInCombo = WikittyUtil.getIds(toCombo); + idsInList = WikittyUtil.getIds(toList); super.init(toCombo, toList); } - protected List<String> extractId(List<B> beans) { - - List<String> ids = new ArrayList<String>(); - if (beans != null) { - for (BusinessEntity bean : beans) { - ids.add(bean.getWikittyId()); - } - } - return ids; - } - protected boolean isLoadedId(String wikittyId) { return idsInCombo.contains(wikittyId) || idsInList.contains(wikittyId); } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/GroupListSelectorHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/GroupListSelectorHandler.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/GroupListSelectorHandler.java 2011-10-12 16:20:34 UTC (rev 139) @@ -32,6 +32,7 @@ import org.chorem.vradi.services.VradiDataService; import org.chorem.vradi.services.VradiService; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import java.util.List; import java.util.Set; @@ -85,7 +86,7 @@ setListDatas(groups); idsInList.clear(); - idsInList.addAll(VradiHelper.extractIds(groups)); + idsInList.addAll(WikittyUtil.getIds(groups)); } protected void updateCombo(String wikittyId) { @@ -98,7 +99,7 @@ setComboDatas(allGroups); idsInCombo.clear(); - idsInCombo.addAll(VradiHelper.extractIds(allGroups)); + idsInCombo.addAll(WikittyUtil.getIds(allGroups)); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/UserListSelectorHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/UserListSelectorHandler.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/widget/UserListSelectorHandler.java 2011-10-12 16:20:34 UTC (rev 139) @@ -34,6 +34,7 @@ import org.chorem.vradi.services.VradiDataService; import org.chorem.vradi.services.VradiService; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -103,7 +104,7 @@ setListDatas(users); idsInList.clear(); - idsInList.addAll(VradiHelper.extractIds(users)); + idsInList.addAll(WikittyUtil.getIds(users)); return users; } return Collections.EMPTY_LIST; @@ -118,7 +119,7 @@ setComboDatas(allUsers); idsInCombo.clear(); - idsInCombo.addAll(VradiHelper.extractIds(allUsers)); + idsInCombo.addAll(WikittyUtil.getIds(allUsers)); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/EmailDataHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/EmailDataHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/EmailDataHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -338,16 +338,4 @@ // return result; // } - public static List<String> extractIds(Collection<? extends BusinessEntity> entities) { - List<String> ids = new ArrayList<String>(); - if (entities == null) { - return ids; - } - for (BusinessEntity e : entities) { - if (e != null) { - ids.add(e.getWikittyId()); - } - } - return ids; - } } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailFormNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailFormNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailFormNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,6 +31,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -72,7 +73,7 @@ Collections.sort(formSorted, VradiComparators.FORM_COMPARATOR); // Return forms - return extractIds(formSorted); + return WikittyUtil.getIds(formSorted); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -33,6 +33,7 @@ import org.chorem.vradi.ui.email.helpers.EmailDataHelper; import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -68,7 +69,7 @@ Collections.sort(groupSorted, VradiComparators.GROUP_COMPARATOR); // Return groups - return extractIds(groupSorted); + return WikittyUtil.getIds(groupSorted); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupUsersNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupUsersNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailGroupUsersNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -32,6 +32,7 @@ import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -88,7 +89,7 @@ } // Return users of group - return extractIds(users); + return WikittyUtil.getIds(users); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailUsersNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailUsersNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/loadors/EmailUsersNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -29,6 +29,7 @@ import org.chorem.vradi.services.VradiService; import org.chorem.vradi.ui.helpers.VradiComparators; import org.chorem.vradi.ui.tree.VradiTreeNode; +import org.nuiton.wikitty.WikittyUtil; import java.util.ArrayList; import java.util.Collections; @@ -61,7 +62,7 @@ Collections.sort(userSorted, VradiComparators.USER_COMPARATOR); // Return clients - return extractIds(userSorted); + return WikittyUtil.getIds(userSorted); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/models/EmailEntityModel.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/models/EmailEntityModel.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/models/EmailEntityModel.java 2011-10-12 16:20:34 UTC (rev 139) @@ -33,6 +33,7 @@ import org.chorem.vradi.entities.Session; import org.chorem.vradi.services.VradiService; import org.chorem.vradi.ui.email.renderers.EmailFormsListCellRenderer; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.BusinessEntity; import javax.swing.DefaultListModel; @@ -106,7 +107,7 @@ @Override public void entitiesAdded(Set<Sending> added) { - refreshIfNeeded(VradiHelper.extractIds(added)); + refreshIfNeeded(WikittyUtil.getIds(added)); } @Override Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java 2011-10-12 16:20:34 UTC (rev 139) @@ -52,6 +52,7 @@ import org.chorem.vradi.ui.offer.models.OfferListTableModel; import org.chorem.vradi.ui.thesaurus.helpers.ThesaurusDataHelper; import org.chorem.vradi.ui.thesaurus.helpers.ThesaurusTreeTableHelper; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.WikittyExtension; @@ -572,13 +573,13 @@ // status List<Status> statuses = criterias.getStatusSelection().getSelectedValues(); - List<String> statusIds = VradiHelper.extractIds(statuses); + List<String> statusIds = WikittyUtil.getIds(statuses); queryParameters.setStatusIds(statusIds); // xml streams id List<XmlStream> xmlStreams = criterias.getXmlStreamSelection() .getSelectedValues(); - List<String> streamIds = VradiHelper.extractIds(xmlStreams); + List<String> streamIds = WikittyUtil.getIds(xmlStreams); queryParameters.setStreamIds(streamIds); } @@ -633,12 +634,12 @@ // status (traité/non traité) List<Status> statuses = criterias.getStatusSelection().getSelectedValues(); - List<String> statusIds = VradiHelper.extractIds(statuses); + List<String> statusIds = WikittyUtil.getIds(statuses); queryParameters.setStatusIds(statusIds); // xml stream id List<XmlStream> xmlStreams = criterias.getXmlStreamSelection().getSelectedValues(); - List<String> streamIds = VradiHelper.extractIds(xmlStreams); + List<String> streamIds = WikittyUtil.getIds(xmlStreams); queryParameters.setStreamIds(streamIds); } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusSelectionManager.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusSelectionManager.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusSelectionManager.java 2011-10-12 16:20:34 UTC (rev 139) @@ -198,12 +198,12 @@ protected void selectThesaurus(ThesaurusTreeHelper helper) { desactiveListener(helper); List<VradiTreeNode> nodes = rootHelper.getSelectedNodes(); - List<String> thesaurusIds = extractIds(nodes); + List<String> thesaurusIds = extractNodeIds(nodes); helper.tryToSelect(thesaurusIds); activeListener(helper); } - protected List<String> extractIds(List<VradiTreeNode> nodes) { + protected List<String> extractNodeIds(List<VradiTreeNode> nodes) { List<String> ids = new ArrayList<String>(); for (VradiTreeNode node : nodes) { ids.add(node.getId()); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -381,18 +381,6 @@ return parents; } - protected List<String> extractIds(List<Thesaurus> beans) { - List<String> ids = new ArrayList<String>(); - if (beans != null) { - for (Thesaurus bean : beans) { - if (bean != null) { - ids.add(bean.getWikittyId()); - } - } - } - return ids; - } - public static RootThesaurus getRootThesaurus(VradiTreeNode node) { if (!node.getInternalClass().equals(RootThesaurus.class)) { return null; Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeTableHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeTableHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusTreeTableHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -379,16 +379,6 @@ return parents; } - protected List<String> extractIds(List<Thesaurus> beans) { - List<String> ids = new ArrayList<String>(); - if (beans != null) { - for (Thesaurus bean : beans) { - ids.add(bean.getWikittyId()); - } - } - return ids; - } - @Override public ThesaurusDataProvider getDataProvider() { return (ThesaurusDataProvider) dataProvider; Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -33,8 +33,8 @@ import org.chorem.vradi.services.VradiException; import org.chorem.vradi.services.VradiService; import org.chorem.vradi.ui.tree.VradiTreeNode; +import org.nuiton.wikitty.WikittyUtil; -import java.util.ArrayList; import java.util.List; /** @author letellier */ @@ -63,7 +63,7 @@ } // Return children - return extractIds(rootThesaurusList); + return WikittyUtil.getIds(rootThesaurusList); } @Override @@ -79,12 +79,4 @@ null, NavHelper.getChildLoador(ThesaurusNodeLoadors.class)); } - - protected List<String> extractIds(List<RootThesaurus> entities) { - List<String> ids = new ArrayList<String>(); - for (RootThesaurus e : entities) { - ids.add(e.getWikittyId()); - } - return ids; - } } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusTreeTableNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusTreeTableNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/RootThesaurusTreeTableNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -33,8 +33,8 @@ import org.chorem.vradi.services.VradiException; import org.chorem.vradi.services.VradiService; import org.chorem.vradi.ui.tree.VradiTreeTableNode; +import org.nuiton.wikitty.WikittyUtil; -import java.util.ArrayList; import java.util.List; /** @author letellier */ @@ -71,7 +71,7 @@ } // Return children - return extractIds(rootThesaurusList); + return WikittyUtil.getIds(rootThesaurusList); } @Override @@ -84,12 +84,4 @@ NavHelper.getChildLoador(ThesaurusTreeTableNodeLoadors.class) ); } - - protected List<String> extractIds(List<RootThesaurus> entities) { - List<String> ids = new ArrayList<String>(); - for (RootThesaurus e : entities) { - ids.add(e.getWikittyId()); - } - return ids; - } } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,8 +31,8 @@ import org.chorem.vradi.entities.Thesaurus; import org.chorem.vradi.services.VradiService; import org.chorem.vradi.ui.tree.VradiTreeNode; +import org.nuiton.wikitty.WikittyUtil; -import java.util.ArrayList; import java.util.List; /** @author letellier */ @@ -53,7 +53,7 @@ public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { List<Thesaurus> thesauruses = VradiService.getVradiDataService().getChildrenThesaurus(parentId); - return extractIds(thesauruses); + return WikittyUtil.getIds(thesauruses); } @@ -71,12 +71,4 @@ NavHelper.getChildLoador(ThesaurusNodeLoadors.class) ); } - - protected List<String> extractIds(List<Thesaurus> entities) { - List<String> ids = new ArrayList<String>(); - for (Thesaurus e : entities) { - ids.add(e.getWikittyId()); - } - return ids; - } } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusTreeTableNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusTreeTableNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/loadors/ThesaurusTreeTableNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -33,9 +33,7 @@ import org.chorem.vradi.ui.thesaurus.ThesaurusDataProvider; import org.chorem.vradi.ui.thesaurus.helpers.ThesaurusDataHelper; import org.chorem.vradi.ui.tree.VradiTreeTableNode; -import org.nuiton.wikitty.entities.BusinessEntity; - -import java.util.ArrayList; +import org.nuiton.wikitty.WikittyUtil; import java.util.Collection; import java.util.List; @@ -73,7 +71,7 @@ } } - return extractIds(thesauruses); + return WikittyUtil.getIds(thesauruses); } @Override @@ -86,12 +84,4 @@ NavHelper.getChildLoador(ThesaurusTreeTableNodeLoadors.class) ); } - - protected List<String> extractIds(Collection<? extends BusinessEntity> entities) { - List<String> ids = new ArrayList<String>(); - for (BusinessEntity e : entities) { - ids.add(e.getWikittyId()); - } - return ids; - } } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/tree/loadors/AbstractVradiNodeLoadors.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/tree/loadors/AbstractVradiNodeLoadors.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/tree/loadors/AbstractVradiNodeLoadors.java 2011-10-12 16:20:34 UTC (rev 139) @@ -31,10 +31,6 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.BusinessEntity; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** @author sletellier <letellier@codelutin.com> */ public abstract class AbstractVradiNodeLoadors<B extends BusinessEntity> extends NavTreeNodeChildLoador<String, B, VradiTreeNode> { @@ -67,17 +63,4 @@ null, childLoador); } - - protected List<String> extractIds(Collection<B> entities) { - List<String> ids = new ArrayList<String>(); - if (entities == null) { - return ids; - } - for (BusinessEntity e : entities) { - if (e != null) { - ids.add(e.getWikittyId()); - } - } - return ids; - } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/InvitationResult.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/InvitationResult.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/InvitationResult.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,6 +1,8 @@ package org.chorem.vradi; +import org.chorem.vradi.entities.FormNote; import org.chorem.vradi.entities.VradiUser; +import org.nuiton.wikitty.WikittyProxy; import java.util.Collection; @@ -20,6 +22,13 @@ // Do nothing return user; } + + @Override + public void updateParteners(WikittyProxy proxy, String formNoteId, VradiUser partener) { + FormNote formNote = proxy.restore(FormNote.class, formNoteId); + formNote.addPartners(partener.getWikittyId()); + proxy.store(formNote); + } }, // Same mails are send for both @@ -36,6 +45,11 @@ // Do nothing return user; } + + @Override + public void updateParteners(WikittyProxy proxy, String formNoteId, VradiUser partener) { + // Do nothing + } }, NO_MORE("NoMoreReceived", "vradi.invitation.nomore", EmailType.INVITATION_REJECT, EmailType.INVITATION_CONFIRMATION_REJECT) { @@ -50,6 +64,11 @@ user.addNoSend(to.getWikittyId()); return user; } + + @Override + public void updateParteners(WikittyProxy proxy, String formNoteId, VradiUser partener) { + // Do nothing + } }; public static final String BUTTON_PREFIX = ".button"; @@ -113,4 +132,6 @@ public abstract VradiUser updateReceivedUserPreference(VradiUser user, VradiUser from); public abstract VradiUser updateSendUserPreference(VradiUser user, VradiUser to); + + public abstract void updateParteners(WikittyProxy proxy, String formNoteId, VradiUser partener); } \ No newline at end of file Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java 2011-10-12 16:20:34 UTC (rev 139) @@ -5,12 +5,17 @@ import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.vradi.entities.Sending; import org.nuiton.jrst.JRST; import org.nuiton.util.GZUtil; +import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.search.PagedResult; /** * Utilities class Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -90,9 +90,11 @@ } } } - log.debug(String.format( - "Accept field '%s' is %s with excludes: %s and includes: %s", - fqfield, result, excludes, includes)); + if (log.isDebugEnabled()) { + log.debug(String.format( + "Accept field '%s' is %s with excludes: %s and includes: %s", + fqfield, result, excludes, includes)); + } return result; } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -58,10 +58,16 @@ try { for (Object key : request.getParameterMap().keySet()) { String k = String.valueOf(key); - log.debug(String.format("Look for field(%s)", k)); + + if (log.isDebugEnabled()) { + log.debug(String.format("Look for field(%s)", k)); + } if (w.hasField(k) && isAcceptable(k)) { Object v = request.getParameter(k); - log.debug(String.format("Put value(%s) in field(%s)", v, k)); + + if (log.isDebugEnabled()) { + log.debug(String.format("Put value(%s) in field(%s)", v, k)); + } w.setFqField(k, v); } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,6 +1,5 @@ package org.chorem.vradi.actions; -import com.opensymphony.xwork2.ActionContext; import java.util.Date; import java.util.Set; import org.apache.commons.lang.StringUtils; @@ -87,7 +86,7 @@ formNote = new FormNoteImpl(); formNote.setCreationDate(new Date()); formNote.setForm(getFormId()); - formNote.addPartners(proxy.getUser().getWikittyId()); + formNote.addPartners(getUser().getWikittyId()); formNote.setSummary(StringUtils.trimToEmpty(summary)); formNote.setContent(StringUtils.trimToEmpty(content)); formNote.setSeekingPartner(false); @@ -97,6 +96,10 @@ proxy.store(formNote); } + if (log.isDebugEnabled()) { + log.debug("seeking parteners : " + formNote.getSeekingPartner()); + } + partners = proxy.restore(VradiUser.class, formNote.getPartners()); // Render JRST in HTML Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,6 +1,5 @@ package org.chorem.vradi.actions; -import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.entities.FormNote; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -65,7 +65,9 @@ if (redirectTo == null) { redirectTo = "/"; } - log.debug(String.format("Login ok, we go to '%s'", redirectTo)); + if (log.isDebugEnabled()) { + log.debug(String.format("Login ok, we go to '%s'", redirectTo)); + } result = SUCCESS; } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -117,7 +117,11 @@ VradiUserImpl newUser = new VradiUserImpl(); String md5 = StringUtil.encodeMD5(password); newUser.setPassword(md5); + + // Login and email are the same in vradi web newUser.setLogin(email); + newUser.setEmail(email); + newUser.setNoSend(Collections.EMPTY_SET); newUser.setNoReceived(Collections.EMPTY_SET); VradiUser login = proxy.store(newUser); //Stores the new user Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,10 +1,5 @@ package org.chorem.vradi.actions; -import static org.nuiton.i18n.I18n._; - -import com.opensymphony.xwork2.ActionContext; - -import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -56,8 +51,11 @@ String result = SUCCESS; WikittyProxy proxy = getProxy(); user = proxy.restore(VradiUser.class, userId); - log.debug(String.format("User '%s' is %s: ", userId, user)); + if (log.isDebugEnabled()) { + log.debug(String.format("User '%s' is %s: ", userId, user)); + } + if (user != null) { // if collection is not initialized put empty collection if (user.getNoSend() == null) { Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,7 +1,7 @@ package org.chorem.vradi.actions; -import com.opensymphony.xwork2.ActionContext; import java.util.Arrays; +import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -9,14 +9,19 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.EmailType; -import org.chorem.vradi.VradiWebConfig; +import org.chorem.vradi.VradiConstants; import org.chorem.vradi.VradiWebHelper; +import org.chorem.vradi.entities.Form; import org.chorem.vradi.entities.FormNote; +import org.chorem.vradi.entities.GroupForms; +import org.chorem.vradi.entities.Sending; import org.chorem.vradi.entities.VradiUser; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.search.operators.Element; /** * @@ -30,6 +35,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(SendInvitationAction.class); + public static final String SHOW_INVITATION_ACTION = "showInvitation"; protected String noteId; @@ -47,6 +53,10 @@ this.noteId = noteId; } + public String getNoteId() { + return noteId; + } + public void setFormReceiver(boolean formReceiver) { this.formReceiver = formReceiver; } @@ -95,7 +105,7 @@ * l'action de recherche de partenaire et non pas a la liste complete * des partenaires deja present sur la note. * - * @return + * @return action result * @throws Exception */ @Override @@ -104,26 +114,47 @@ WikittyProxy proxy = getProxy(); VradiUser sender = getVradiSession().getUser(); FormNote note = proxy.restore(FormNote.class, noteId); + Form form = proxy.restore(Form.class, note.getForm()); Set<String> recipient = new HashSet<String>(); + // User that received form if (formReceiver) { - Criteria c = Search.query() - // FIXME ajouter le critere de recherche des personnes ayant recu ce formulaire + + // Get all group form for this form + Criteria groupFormCriteria = Search.query() + .eq(GroupForms.FQ_FIELD_GROUPFORMS_FORM, note.getForm()) .criteria(); - PagedResult<VradiUser> users = proxy.findAllByCriteria(VradiUser.class, c); - for (VradiUser user : users) { - if (acceptReceiver(sender, user)) { - String email = user.getEmail(); - recipient.add(email); - } - } + List<String> groupFormsId = proxy.findAllIdByCriteria(groupFormCriteria).getAll(); + + // Get all sendings for all groupForms + Criteria snedingCriteria = Search.query() + .contains(Sending.FQ_FIELD_SENDING_GROUPFORMS, groupFormsId) + .or() + .eq(Sending.FIELD_SENDING_STATUS, VradiConstants.SendingStatus.RECEIVED.getValueAsString()) + .eq(Sending.FIELD_SENDING_STATUS, VradiConstants.SendingStatus.SENT.getValueAsString()) + .criteria(); + + PagedResult<Sending> sendings = proxy.findAllByCriteria(Sending.class, snedingCriteria); + List<String> userIds = WikittyUtil.getFieldValuesFromFQFieldName(Sending.FQ_FIELD_SENDING_USER, sendings); + + // Get all users who received form + List<VradiUser> users = proxy.restore(VradiUser.class, userIds); + + // Extract all emails + List<String> emails = extractEmail(users); + recipient.addAll(emails); } + // Other seekers if (seeker) { + + // Get all form notes created for form Criteria c = Search.query() - // FIXME ajouter le critere de recherche des personnes ayant une note sur ce formulaire avec la case seekingPartners a true + .neq(Element.ELT_ID, noteId) + .eq(FormNote.FQ_FIELD_FORMNOTE_FORM, note.getForm()) + .eq(FormNote.FQ_FIELD_FORMNOTE_SEEKINGPARTNER, Boolean.TRUE.toString()) .criteria(); PagedResult<FormNote> notes = proxy.findAllByCriteria(FormNote.class, c); @@ -132,24 +163,22 @@ userIds.addAll(n.getPartners()); } Set<VradiUser> users = proxy.restore(VradiUser.class, userIds); - for (VradiUser user : users) { - if (acceptReceiver(sender, user)) { - String email = user.getEmail(); - recipient.add(email); - } - } + + // Extract all emails + List<String> emails = extractEmail(users); + recipient.addAll(emails); } + // For partners if (partners) { List<VradiUser> users = proxy.restore(VradiUser.class, Arrays.asList(userId)); - for (VradiUser user : users) { - if (acceptReceiver(sender, user)) { - String email = user.getEmail(); - recipient.add(email); - } - } + + // Extract all emails + List<String> emails = extractEmail(users); + recipient.addAll(emails); } + // For invite if (invite) { String[] inviteEmails = inviteEmail.split(","); for (String email : inviteEmails) { @@ -160,8 +189,13 @@ } } + // Remove connected user email + recipient.remove(getUser().getEmail()); + + // Get mail url String url = VradiWebHelper.encodeAndGetUrl(SHOW_INVITATION_ACTION, noteId, sender.getWikittyId(), StringUtils.join(note.getPartners(), ","), message); + // Sending email if (EmailType.OPTION_REQUEST.sendEmail(recipient, sender, message, url, sender.getInfo())) { sendCount = recipient.size(); return SUCCESS; @@ -170,5 +204,8 @@ return ERROR; } - + protected List<String> extractEmail(Collection<VradiUser> users) { + List<String> emails = WikittyUtil.getFieldValuesFromFQFieldName(VradiUser.FQ_FIELD_VRADIUSER_EMAIL, users); + return emails; + } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ShowInvitationResultAction.java 2011-10-12 16:20:34 UTC (rev 139) @@ -1,6 +1,5 @@ package org.chorem.vradi.actions; -import com.opensymphony.xwork2.ActionContext; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; @@ -173,8 +172,12 @@ public String sendInvitationResultConfirm() throws Exception { - // Update preference + // Update preference and parteners VradiUser user = invitationResult.updateSendUserPreference(getUser(), getSender()); + + // Update parteners + invitationResult.updateParteners(getProxy(), noteId, getSender()); + setUser(getProxy().store(user)); if (this.invitationResult.sendConfirmEmail(Collections.singleton(getSender().getLogin()), Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-10-12 16:20:34 UTC (rev 139) @@ -62,8 +62,11 @@ redirect = url.toString(); } session.put(LoginAction.REDIRECT_AFTER_LOGIN, redirect); - log.debug(String.format("User not loggued redirect to '%s' and '%s'", + + if (log.isDebugEnabled()) { + log.debug(String.format("User not loggued redirect to '%s' and '%s'", loginRedirect, redirect)); + } // ServletActionContext.getResponse().sendRedirect(loginRedirect); return loginRedirect; } else { Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-10-12 16:20:34 UTC (rev 139) @@ -55,9 +55,9 @@ vradi.template.thesaurus.renamed.title=[Vradi web] Ask to rename thesuaurus vradi.template.webHarvest=User %1$s ask to add webHarvest script '%3$s' with comment \: %2$s vradi.template.webHarvest.title=[Vradi web] Ask to add webHarvest script -vradi.formNoteList.title=Form answers +vradi.formNoteList.title=Answers for form vradi.new.formNote=New answer -vradi.formNote.title=Answer edition +vradi.formNote.title=Answer edition for form vradi.formNote.close=Close this answer vradi.delete=Delete vradi.show=Show @@ -101,4 +101,5 @@ vradi.userPreference.note.close=Closed notes vradi.attachment.update=Update vradi.attachment.history=History -vradi.attachment.delete=Delete \ No newline at end of file +vradi.attachment.delete=Delete +vradi.action.return=Return \ No newline at end of file Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-10-12 16:20:34 UTC (rev 139) @@ -1,5 +1,6 @@ vradi.action.locale.english=Anglais vradi.action.locale.french=Français +vradi.action.return=Retour vradi.action.submit=Soumettre aux administrateurs vradi.add=Ajouter vradi.addfiles.content=Fichier à ajouter @@ -33,8 +34,8 @@ vradi.formNote.close=Fermer la réponse vradi.formNote.seekPartners=Recherche de partenaires vradi.formNote.seekingPartner=Partenaires recherchés -vradi.formNote.title=Edition de la réponse -vradi.formNoteList.title=Réponses du formulaire +vradi.formNote.title=Edition de la réponse pour le formulaire +vradi.formNoteList.title=Réponses pour le formulaire vradi.formView.title=Visualisation d'un formulaire vradi.invitation.accept=L'utilisateur %1$s accèpte de travailler avec vous sur %3$s parce que \: %2$s\n\nPour répondre à cette demande veuillez aller sur la page\:'%4$s'\n"\n\nCordialement. vradi.invitation.accept.button=Accepter @@ -98,7 +99,7 @@ vradi.seekingPartners.inviteEmail=Emails des invités (séparées par des ',') vradi.seekingPartners.partners=Des partenaires d'une autre réponse vradi.seekingPartners.seeker=Ceux qui recherche des partenaires pour cette appel d'offre -vradi.seekingPartners.title=Recherche de partenaires +vradi.seekingPartners.title=Recherche de partenaires pour le formulaire vradi.send=Envoyer vradi.sendInvitation.count=Nombre d'invitations envoyés vradi.sendInvitation.title=Envoi d'invitation Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-10-12 16:20:34 UTC (rev 139) @@ -1,4 +1,4 @@ -<%-- +<%-- Document : formNote Created on : 21 mai 2011, 11:53:26 Author : poussin @@ -6,15 +6,20 @@ <%@page import="org.chorem.vradi.entities.FormNote"%> <%@ page import="org.chorem.vradi.entities.FormNoteState" %> +<%@ page import="org.chorem.vradi.entities.Form" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> +<%@taglib prefix="ws" uri="/wikitty-struts"%> <!DOCTYPE html> <html> + <s:set name="proxy" value="%{getProxy()}"/> <s:set name="localNoteId" value="formNote.wikittyId"/> + <s:set name="localFormId" value="formNote.form"/> + <s:set name="seekingPartner" value="formNote.seekingPartner"/> <s:set name="localFieldSummary"><%=FormNote.FQ_FIELD_FORMNOTE_SUMMARY%></s:set> <s:set name="localFieldContent"><%=FormNote.FQ_FIELD_FORMNOTE_CONTENT%></s:set> <head> @@ -24,7 +29,7 @@ <sj:head jquerytheme="sunny"/> <script type="text/javascript"> function seekingPartnersChange(checkbox) { - var url="<s:url action='edit/#localNoteId' namespace='/ajax'/>"; + var url="<s:url action='edit/%{localNoteId}' namespace='/ajax'/>"; url = url + "?<%=FormNote.FQ_FIELD_FORMNOTE_SEEKINGPARTNER%>=" + checkbox.checked; var xhr=new XMLHttpRequest(); xhr.open('GET', url, true); @@ -33,13 +38,16 @@ </script> </head> <body> - <h1><s:text name="vradi.formNote.title" /></h1> + <s:url id="formNoteListUrl" action="formNoteList/%{localFormId}" namespace="/"/> + <s:a href="%{formNoteListUrl}"><s:text name="vradi.action.return"/></s:a> + <h1><s:text name="vradi.formNote.title" /> :</h1> + <h2><ws:field wikittyId="${localFormId}" proxy="${proxy}" fqFieldName="<%=Form.FQ_FIELD_INFOGENE_OBJET%>"/></h2> <div id="result" hidden="true"> <img id="indicator-result" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </div> <div> <s:url id="closeButtonUrl" - action="edit/#localNoteId" + action="edit/%{localNoteId}" namespace="/ajax"> <s:param name="state"> <%=FormNoteState.CLOSE.getValue()%> @@ -51,7 +59,7 @@ <s:text name="vradi.formNote.close"/> </sj:a> - <s:url id="deleteUrl" action="delete/#localNoteId" namespace="/ajax"/> + <s:url id="deleteUrl" action="delete/%{localNoteId}" namespace="/ajax"/> <sj:a href="%{deleteUrl}" targets="result" indicator="indicator-result" button="true" buttonIcon="ui-icon-gear"><s:text name="vradi.delete"/></sj:a> @@ -86,8 +94,10 @@ <s:set id="seekingPartnerText"> <s:text name="vradi.formNote.seekingPartner"/> </s:set> + <s:checkbox label="%{seekingPartnerText}" - name="formNote.seekingPartners" value="formNote.seekingPartner" + name="formNote.seekingPartners" + value="seekingPartner" onchange="seekingPartnersChange(this);"/> </div> @@ -104,8 +114,10 @@ </s:set> <div> - <sj:tabbedpanel id="tabContainerSummary" animate="true" - collapsible="true" useSelectedTabCookie="true"> + <sj:tabbedpanel id="tabContainerSummary" + animate="true" + collapsible="true"> + <sj:tab id="tabHtmlSummary" target="htmlSummary" label="%{summaryText}"/> <sj:tab id="tabHtmlSummaryEdit" target="htmlSummaryEdit" label="%{editText}"/> @@ -134,8 +146,10 @@ </div> <div> - <sj:tabbedpanel id="tabContainerContent" animate="true" - collapsible="true" useSelectedTabCookie="true"> + <sj:tabbedpanel id="tabContainerContent" + animate="true" + collapsible="true"> + <sj:tab id="tabHtmlContent" target="htmlContent" label="%{summaryText}"/> <sj:tab id="tabHtmlContentEdit" target="htmlContentEdit" label="%{editText}"/> @@ -164,8 +178,10 @@ </div> <div> - <sj:tabbedpanel id="tabContainerFiles" animate="true" - collapsible="true" useSelectedTabCookie="true"> + <sj:tabbedpanel id="tabContainerFiles" + animate="true" + collapsible="true"> + <s:set id="filesText"> <s:text name="vradi.files"/> </s:set> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-10-12 16:20:34 UTC (rev 139) @@ -1,4 +1,5 @@ -<%-- +<%@ page import="org.chorem.vradi.entities.Form" %> +<%-- Document : formNoteList Created on : 21 mai 2011, 11:39:21 Author : poussin @@ -6,6 +7,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> +<%@taglib prefix="ws" uri="/wikitty-struts"%> <!DOCTYPE html> <html> @@ -14,17 +16,24 @@ <title><s:text name="vradi.formNoteList.title" /></title> </head> <body> - <h1><s:text name="vradi.formNoteList.title" /></h1> + <s:set name="proxy" value="%{getProxy()}"/> + <h1><s:text name="vradi.formNoteList.title" /> :</h1> + <h2><ws:field wikittyId="${formId}" proxy="${proxy}" fqFieldName="<%=Form.FQ_FIELD_INFOGENE_OBJET%>"/></h2> <ul> <s:iterator value="formNotes" var="note"> - <s:set name="formatedDate" value="%{formatDate(#note.creationDate)}"/> - <li><s:a action="formNote/%{note.wikittyId}" namespace="/"> - <s:property value="formatedDate"/><s:property value="summary"/> + <li> + <s:a action="formNote/%{wikittyId}" namespace="/"> + <s:set name="formatedDate" value="%{formatDate(creationDate)}"/> + <s:property value="formatedDate"/> : <s:property value="summary"/> </s:a> </li> </s:iterator> - <li><s:a action="formNote/new?formId=%{formId}" namespace="/"><s:text name="vradi.new.formNote"/></s:a></li> + <li> + <s:a action="formNote/new?formId=%{formId}" namespace="/"> + <s:text name="vradi.new.formNote"/> + </s:a> + </li> </ul> </body> </html> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-10-12 16:20:34 UTC (rev 139) @@ -1,4 +1,5 @@ -<%-- +<%@ page import="org.chorem.vradi.entities.Form" %> +<%-- Document : seekPartners Created on : 31 mai 2011, 19:33:28 Author : poussin @@ -8,6 +9,7 @@ <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> +<%@taglib prefix="ws" uri="/wikitty-struts"%> <!DOCTYPE html> <html> @@ -18,7 +20,12 @@ <sj:head jquerytheme="sunny"/> </head> <body> - <h1><s:text name="vradi.seekingPartners.title" /></h1> + <s:url id="formNoteUrl" action="formNote/%{noteId}" namespace="/"/> + <s:a href="%{formNoteUrl}"><s:text name="vradi.action.return"/></s:a> + <h1><s:text name="vradi.seekingPartners.title" /> : </h1> + <s:set name="proxy" value="%{getProxy()}"/> + <s:set name="formId" value="%{note.form}"/> + <h2><ws:field wikittyId="${formId}" proxy="${proxy}" fqFieldName="<%=Form.FQ_FIELD_INFOGENE_OBJET%>"/></h2> <s:form id="seekingPartnersForm" action="sendInvitation" namespace="/" method="POST"> <s:hidden name="noteId"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp 2011-10-11 15:25:11 UTC (rev 138) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/sendInvitation.jsp 2011-10-12 16:20:34 UTC (rev 139) @@ -18,7 +18,9 @@ <sj:head jquerytheme="sunny"/> </head> <body> + <s:url id="formNoteUrl" action="formNote/%{noteId}" namespace="/"/> + <s:a href="%{formNoteUrl}"><s:text name="vradi.action.return"/></s:a> <h1><s:text name="vradi.sendInvitation.title" /></h1> - <s:text name="vradi.sendInvitation.count" />: <s:property value="sendCount"/> + <s:text name="vradi.sendInvitation.count" /> : <s:property value="sendCount"/> </body> </html>