- Vradi-commits - mailman.cloud.codelutin.com

r118 - trunk/vradi-entities/src/main/java/org/chorem/vradi/entities
by sletellier＠users.chorem.org July 11, 2011

July 11, 2011

Author: sletellier Date: 2011-07-11 10:47:49 +0200 (Mon, 11 Jul 2011) New Revision: 118 Url: http://chorem.org/repositories/revision/vradi/118 Log: Add enum to list states of formNotes Added: trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FormNoteState.java Added: trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FormNoteState.java =================================================================== --- trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FormNoteState.java (rev 0) +++ trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FormNoteState.java 2011-07-11 08:47:49 UTC (rev 118) @@ -0,0 +1,22 @@ +package org.chorem.vradi.entities; + +/** + * Enum to list value of {@link FormNote#setState(String)} + * + * @author sletellier + */ +public enum FormNoteState { + + OPEN("Open"), + CLOSE("Close"); + + private String value; + + FormNoteState(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +}

1 0

r117 - trunk/vradi-web/src/main/resources
by sletellier＠users.chorem.org July 8, 2011

July 8, 2011

Author: sletellier Date: 2011-07-08 17:41:56 +0200 (Fri, 08 Jul 2011) New Revision: 117 Url: http://chorem.org/repositories/revision/vradi/117 Log: Optimize grid json result Modified: trunk/vradi-web/src/main/resources/struts.xml Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-07-08 09:02:02 UTC (rev 116) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-07-08 15:41:56 UTC (rev 117) @@ -28,6 +28,8 @@  <result-type name="tableModel-json" class="org.apache.struts2.json.JSONResult"> <param name="ignoreHierarchy">false</param> + <param name="enableGZIP">true</param> + <param name="noCache">true</param> <param name="excludeProperties">formPagedResult,vradiSession,user,proxy,dataService,config,session,text,safeText,actionErrors,actionMessages,errorMessages,errors,fieldErrors,locale,texts,textProvider,container</param> </result-type> <result-type name="wikitty-json" class="org.apache.struts2.json.JSONResult">

1 0

r116 - in trunk/vradi-web: . src/main/java/org/chorem/vradi/actions src/main/resources src/main/webapp/WEB-INF/jsp
by sletellier＠users.chorem.org July 8, 2011

July 8, 2011

Author: sletellier Date: 2011-07-08 11:02:02 +0200 (Fri, 08 Jul 2011) New Revision: 116 Url: http://chorem.org/repositories/revision/vradi/116 Log: - Fix search with query - Refator Grid usage - Add form tables in user preference pages Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractGridAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteGridAction.java Modified: trunk/vradi-web/pom.xml trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormGridAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java trunk/vradi-web/src/main/resources/struts.xml trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2011-07-06 14:23:24 UTC (rev 115) +++ trunk/vradi-web/pom.xml 2011-07-08 09:02:02 UTC (rev 116) @@ -120,7 +120,6 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> - <scope>runtime</scope> </dependency> <dependency> 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-07-06 14:23:24 UTC (rev 115) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java 2011-07-08 09:02:02 UTC (rev 116) @@ -37,7 +37,7 @@ /** * - * @param includes comma seperated list of pattern + * @param excludeString comma seperated list of pattern */ public void setExcludes(String excludeString) { // remove all blank and newline @@ -48,7 +48,7 @@ /** * - * @param includes comma seperated list of pattern + * @param includeString comma seperated list of pattern */ public void setIncludes(String includeString) { // remove all blank and newline Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractGridAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractGridAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractGridAction.java 2011-07-08 09:02:02 UTC (rev 116) @@ -0,0 +1,139 @@ +package org.chorem.vradi.actions; + +import org.chorem.vradi.beans.FormPagedResult; +import org.chorem.vradi.entities.Form; +import java.util.List; + +/** + * @author sletellier + */ +public abstract class AbstractGridAction extends VradiBaseAction { + + //Your result List + protected List<Form> gridModel; + //get how many rows we want to have into the grid - rowNum attribute in the grid + protected Integer rows = 0; + //Get the requested page. By default grid sets this to 1. + protected Integer page = 0; + // sorting order - asc or desc + protected String sord; + // get index row - i.e. user click to sort. + protected String sidx; + // Search Field + protected String searchField; + // The Search String + protected String searchString; + // he Search Operation ['eq','ne','lt','le','gt','ge','bw','bn','in','ni','ew','en','cn','nc'] + protected String searchOper; + // Your Total Pages + protected Integer total = 0; + // All Record + protected Integer records = 0; + + public List<Form> getGridModel() { + return gridModel; + } + + public void setGridModel(List<Form> gridModel) { + this.gridModel = gridModel; + } + + public Integer getRows() { + return rows; + } + + public void setRows(Integer rows) { + this.rows = rows; + } + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public String getSord() { + return sord; + } + + public void setSord(String sord) { + this.sord = sord; + } + + public String getSidx() { + return sidx; + } + + public void setSidx(String sidx) { + this.sidx = sidx; + } + + public String getSearchField() { + return searchField; + } + + public void setSearchField(String searchField) { + this.searchField = searchField; + } + + public String getSearchString() { + return searchString; + } + + public void setSearchString(String searchString) { + this.searchString = searchString; + } + + public String getSearchOper() { + return searchOper; + } + + public void setSearchOper(String searchOper) { + this.searchOper = searchOper; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public Integer getRecords() { + return records; + } + + public void setRecords(Integer records) { + this.records = records; + } + + @Override + public String execute() { + FormPagedResult result = new FormPagedResult(); + + // Do search + result.setNbFormsToShow(getRows()); + result.setPageToShow(getPage()); + result.setAscending(getSord().equalsIgnoreCase("asc")); + result.setFieldToSort(getSidx()); + + // Get result for action + result = getFormPagedResult(result); + + setRecords(result.getTotalFoundFormNb()); + + //calculate the total pages for the query + setTotal((int) Math.ceil((double) getRecords() / (double) getRows())); + + // Update result info + List<String> formsIdsToShow = result.getFormsIdsToShow(); + setGridModel(getProxy().restore(Form.class, formsIdsToShow)); + return SUCCESS; + } + + + public abstract FormPagedResult getFormPagedResult(FormPagedResult result); +} Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormGridAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormGridAction.java 2011-07-06 14:23:24 UTC (rev 115) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormGridAction.java 2011-07-08 09:02:02 UTC (rev 116) @@ -1,130 +1,19 @@ package org.chorem.vradi.actions; -import org.apache.struts2.interceptor.ServletRequestAware; import org.chorem.vradi.beans.FormPagedResult; import org.chorem.vradi.beans.QueryParameters; -import org.chorem.vradi.entities.Form; import org.chorem.vradi.services.VradiException; import org.chorem.vradi.services.search.UnsupportedQueryException; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - /** * Action to display struts2-jquery grid * * @author sletellier */ -public class FormGridAction extends VradiBaseAction implements ServletRequestAware { +public class FormGridAction extends AbstractGridAction { - protected HttpServletRequest request; - //Your result List - protected List<Form> gridModel; - //get how many rows we want to have into the grid - rowNum attribute in the grid - protected Integer rows = 0; - //Get the requested page. By default grid sets this to 1. - protected Integer page = 0; - // sorting order - asc or desc - protected String sord; - // get index row - i.e. user click to sort. - protected String sidx; - // Search Field - protected String searchField; - // The Search String - protected String searchString; - // he Search Operation ['eq','ne','lt','le','gt','ge','bw','bn','in','ni','ew','en','cn','nc'] - protected String searchOper; - // Your Total Pages - protected Integer total = 0; - // All Record - protected Integer records = 0; protected String query; - @Override - public void setServletRequest(HttpServletRequest request) { - this.request = request; - } - - public List<Form> getGridModel() { - return gridModel; - } - - public void setGridModel(List<Form> gridModel) { - this.gridModel = gridModel; - } - - public Integer getRows() { - return rows; - } - - public void setRows(Integer rows) { - this.rows = rows; - } - - public Integer getPage() { - return page; - } - - public void setPage(Integer page) { - this.page = page; - } - - public String getSord() { - return sord; - } - - public void setSord(String sord) { - this.sord = sord; - } - - public String getSidx() { - return sidx; - } - - public void setSidx(String sidx) { - this.sidx = sidx; - } - - public String getSearchField() { - return searchField; - } - - public void setSearchField(String searchField) { - this.searchField = searchField; - } - - public String getSearchString() { - return searchString; - } - - public void setSearchString(String searchString) { - this.searchString = searchString; - } - - public String getSearchOper() { - return searchOper; - } - - public void setSearchOper(String searchOper) { - this.searchOper = searchOper; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public Integer getRecords() { - return records; - } - - public void setRecords(Integer records) { - this.records = records; - } - public String getQuery() { return query; } @@ -133,18 +22,11 @@ this.query = query; } - public String getJSON() { - + @Override + public FormPagedResult getFormPagedResult(FormPagedResult result) { // Build search String query = getQuery(); QueryParameters queryParameters = new QueryParameters(query); - - // Do search - FormPagedResult result = new FormPagedResult(); - result.setNbFormsToShow(getRows()); - result.setPageToShow(getPage()); - result.setAscending(getSord().equalsIgnoreCase("asc")); - result.setFieldToSort(getSidx()); try { result = getDataService().findForms(queryParameters, result); @@ -153,15 +35,6 @@ } catch (UnsupportedQueryException eee) { log.error("Unsuported query", eee); } - - List<String> formsIdsToShow = result.getFormsIdsToShow(); - List<Form> forms = getProxy().restore(Form.class, formsIdsToShow); - setGridModel(forms); - setRecords(result.getTotalFoundFormNb()); - - //calculate the total pages for the query - setTotal((int) Math.ceil((double)getRecords() / (double)getRows())); - - return SUCCESS; + return result; } } 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-07-06 14:23:24 UTC (rev 115) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-07-08 09:02:02 UTC (rev 116) @@ -8,6 +8,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.vradi.entities.FormNote; import org.chorem.vradi.entities.FormNoteImpl; +import org.chorem.vradi.entities.FormNoteState; import org.chorem.vradi.entities.VradiUser; import org.nuiton.jrst.JRST; import org.nuiton.wikitty.WikittyProxy; @@ -94,7 +95,7 @@ formNote.setSummary(StringUtils.trimToEmpty(summary)); formNote.setContent(StringUtils.trimToEmpty(content)); formNote.setSeekingPartner(false); - formNote.setState("Open"); + formNote.setState(FormNoteState.OPEN.getValue()); formNote.addHistory(String.format("%tF creation", formNote.getCreationDate())); proxy.store(formNote); Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteGridAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteGridAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteGridAction.java 2011-07-08 09:02:02 UTC (rev 116) @@ -0,0 +1,87 @@ +package org.chorem.vradi.actions; + +import org.chorem.vradi.beans.FormPagedResult; +import org.chorem.vradi.entities.Form; +import org.chorem.vradi.entities.FormNote; +import org.chorem.vradi.entities.FormNoteState; +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; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * @author sletellier + */ +public class FormNoteGridAction extends AbstractGridAction { + + protected boolean opened; + + public boolean isOpened() { + return opened; + } + + public void setOpened(boolean opened) { + this.opened = opened; + } + + @Override + public FormPagedResult getFormPagedResult(FormPagedResult result) { + String userId = getUser().getWikittyId(); + FormNoteState state; + if (opened) { + state = FormNoteState.OPEN; + } else { + state = FormNoteState.CLOSE; + } + Criteria criteriaFormNote = Search.query().eq(FormNote.FQ_FIELD_FORMNOTE_PARTNERS, userId) + .eq(FormNote.FQ_FIELD_FORMNOTE_STATE, state.getValue()).criteria(); + + // Extract forms + PagedResult<FormNote> formNotes = getProxy().findAllByCriteria(FormNote.class, criteriaFormNote); + + Set<String> ids = new HashSet<String>(); + for (FormNote formNote : formNotes) { + ids.add(formNote.getForm()); + } + + if (!ids.isEmpty()) { + + // Remove null ids + ids.remove(null); + + // FIXME sletellier 20110706 : Refactor this with SearchManager + Criteria criteria = Search.query().in(Element.ELT_ID, + ids).criteria(); + + // add index restriction + // last index can be -1 (all value in UI) + int firstIndex = (result.getPageToShow() - 1) * result.getNbFormsToShow(); + int lastIndex = result.getPageToShow() * result.getNbFormsToShow() - 1; + if (firstIndex >= 0 && lastIndex > 0 && lastIndex > firstIndex) { + criteria.setFirstIndex(firstIndex).setEndIndex(lastIndex); + } + + // Add field restriction + if (result.getFieldToSort() != null) { + if (!result.isAscending()) { + criteria.addSortDescending(result.getFieldToSort()); + } else { + criteria.addSortAscending(result.getFieldToSort()); + } + } + + //finds the forms + PagedResult<Form> queryResult = getProxy().findAllByCriteria(Form.class, criteria); + List<Form> all = new ArrayList<Form>(queryResult.getAll()); + result.setFormsToShow(all); + result.setTotalFoundFormNb(queryResult.getNumFound()); + } + + return result; + } +} Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java 2011-07-06 14:23:24 UTC (rev 115) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java 2011-07-08 09:02:02 UTC (rev 116) @@ -4,6 +4,7 @@ import org.apache.struts2.interceptor.ServletRequestAware; import org.chorem.vradi.VradiSession; import org.chorem.vradi.entities.Query; +import org.chorem.vradi.entities.QueryImpl; import org.chorem.vradi.entities.VradiUser; import javax.servlet.http.HttpServletRequest; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-07-06 14:23:24 UTC (rev 115) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-07-08 09:02:02 UTC (rev 116) @@ -79,11 +79,6 @@ this.request = request; } - @Override - public String execute() throws Exception { - return refreshForm(); - } - public String refreshForm() { String selectedQuery = getSelectedQuery(); if (!StringUtils.isEmpty(selectedQuery)) { Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-07-06 14:23:24 UTC (rev 115) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-07-08 09:02:02 UTC (rev 116) @@ -21,6 +21,15 @@ <package name="publicArea" extends="struts-default"> <result-types> <result-type name="json" class="org.apache.struts2.json.JSONResult"/> +  +  +  +  +  + <result-type name="tableModel-json" class="org.apache.struts2.json.JSONResult"> + <param name="ignoreHierarchy">false</param> + <param name="excludeProperties">formPagedResult,vradiSession,user,proxy,dataService,config,session,text,safeText,actionErrors,actionMessages,errorMessages,errors,fieldErrors,locale,texts,textProvider,container</param> + </result-type> <result-type name="wikitty-json" class="org.apache.struts2.json.JSONResult"> <param name="includeProperties">id,extensionNames\[\d+\],fieldValue\..*\..*</param> <param name="root">wikitty</param> @@ -137,12 +146,20 @@ +--> <action name="formGrid" class="org.chorem.vradi.actions.FormGridAction"> <param name="query"/> - <result name="success" type="json"/> + <result name="success" type="tableModel-json"/> </action>  + <action name="formNoteGrid" class="org.chorem.vradi.actions.FormNoteGridAction"> + <param name="opened"/> + <result name="success" type="tableModel-json"/> + </action> + +  <action name="savedQueries" class="org.chorem.vradi.actions.SavedQueriesAction"> <result name="success" type="json"/> </action> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp 2011-07-06 14:23:24 UTC (rev 115) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp 2011-07-08 09:02:02 UTC (rev 116) @@ -31,7 +31,7 @@ href="%{saveQueryUrl}" value="%{saveQueryText}" targets="empty" - onSuccessTopics="updateQueries" + onSuccessTopics="updateQueries,updateGrid" button="true"/> <s:url id="switchQueryUrl" value="/fragment/switchQueryActivation.action"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-07-06 14:23:24 UTC (rev 115) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-07-08 09:02:02 UTC (rev 116) @@ -7,16 +7,15 @@ <%@page import="org.chorem.vradi.actions.RestoreUserAction"%> <%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.VradiUser"%> -<%@ page import="org.nuiton.wikitty.WikittyUtil" %> -<%@ page import="org.nuiton.wikitty.search.Search" %> -<%@ page import="org.nuiton.wikitty.search.operators.Element" %> +<%@ page import="org.chorem.vradi.entities.Infogene" %> +<%@ page import="static org.nuiton.i18n.I18n._" %> <%@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" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> - <% RestoreUserAction action = RestoreUserAction.getAction(); VradiUser user = action.getUser(); @@ -36,7 +35,27 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="vradi.userPreference.title" /></title> <s:head/> + <sj:head compressed="false" + jquerytheme="redmond" + debug="true" + jqueryui="true"/> <%--<sj:head jquerytheme="sunny"/>--%> + <script type="text/javascript"> + + /* + * Format a Column as Link + */ + function formatLink(cellvalue, options, row) { + return "<a href='/formNoteList/" + cellvalue + ".action'><%=_("vradi.form.editAction")%></a>"; + } + <%-- Table --%> + $.subscribe('rowselect', function(event, data) { + var id = event.originalEvent.id; + var wikittyId = id.substring(10, id.length); + window.open("/formView/" + wikittyId + ".action"); + }); + </script> + </head> <body> <h1><s:text name="vradi.userPreference.title" /></h1> @@ -199,7 +218,55 @@ <div> <h2><s:text name="vradi.userPreference.note.open" /></h2> - TODO + <s:url id="resultOpenedUrl" action="formNoteGrid"> + <s:param name="opened" value="true"/> + </s:url> + <s:set id="creationDateText"> + <s:text name="vradi.form.creationDate"/> + </s:set> + <s:set id="objetText"> + <s:text name="vradi.form.object"/> + </s:set> + <s:set id="actionText"> + <s:text name="vradi.form.action"/> + </s:set> + <s:set id="fqCreationDate"> + <%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%> + </s:set> + <s:set id="fqObjet"> + <%=Infogene.FQ_FIELD_INFOGENE_OBJET%> + </s:set> + + <sjg:grid id="formResult" + dataType="json" + href="%{resultOpenedUrl}" + pager="true" + gridModel="gridModel" + rowList="10,100,1000" + rowNum="10" + rownumbers="true" + autowidth="true" + onSelectRowTopics="rowselect"> + + <sjg:gridColumn name="creationDate" + index="%{fqCreationDate}" + title="%{creationDateText}" + formatter="date" + formatoptions="{newformat : 'd/m/Y H:i', srcformat : 'Y-m-d H:i:s'}" + sortable="true" + width="30"/> + + <sjg:gridColumn name="objet" + index="%{fqObjet}" + title="%{objetText}" + sortable="true"/> + + <sjg:gridColumn name="wikittyId" + title="%{actionText}" + formatter="formatLink" + width="10"/> + + </sjg:grid> </div> <!-- @@ -208,7 +275,55 @@ <div> <h2><s:text name="vradi.userPreference.note.close" /></h2> - TODO + <s:url id="resultClosedUrl" action="formNoteGrid"> + <s:param name="opened" value="false"/> + </s:url> + <s:set id="creationDateText"> + <s:text name="vradi.form.creationDate"/> + </s:set> + <s:set id="objetText"> + <s:text name="vradi.form.object"/> + </s:set> + <s:set id="actionText"> + <s:text name="vradi.form.action"/> + </s:set> + <s:set id="fqCreationDate"> + <%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%> + </s:set> + <s:set id="fqObjet"> + <%=Infogene.FQ_FIELD_INFOGENE_OBJET%> + </s:set> + + <sjg:grid id="resultUrl" + dataType="json" + href="%{resultClosedUrl}" + pager="true" + gridModel="gridModel" + rowList="10,100,1000" + rowNum="10" + rownumbers="true" + autowidth="true" + onSelectRowTopics="rowselect"> + + <sjg:gridColumn name="creationDate" + index="%{fqCreationDate}" + title="%{creationDateText}" + formatter="date" + formatoptions="{newformat : 'd/m/Y H:i', srcformat : 'Y-m-d H:i:s'}" + sortable="true" + width="30"/> + + <sjg:gridColumn name="objet" + index="%{fqObjet}" + title="%{objetText}" + sortable="true"/> + + <sjg:gridColumn name="wikittyId" + title="%{actionText}" + formatter="formatLink" + width="10"/> + + </sjg:grid> </div> </body>

1 0

r115 - in trunk: . vradi-web vradi-web/src/main/java/org/chorem/vradi/actions vradi-web/src/main/resources/i18n vradi-web/src/main/webapp/WEB-INF/jsp vradi-web/src/main/webapp/WEB-INF/jsp/decorators
by sletellier＠users.chorem.org July 6, 2011

July 6, 2011

Author: sletellier Date: 2011-07-06 16:23:24 +0200 (Wed, 06 Jul 2011) New Revision: 115 Url: http://chorem.org/repositories/revision/vradi/115 Log: - Add wikitty-struts dependency - Remove getAction calls - Fix userInfo display - Fix UserPreference page Modified: trunk/pom.xml trunk/vradi-web/pom.xml trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.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/decorators/main.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/pom.xml 2011-07-06 14:23:24 UTC (rev 115) @@ -114,7 +114,7 @@ <nuitonI18nVersion>2.4</nuitonI18nVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> <generatorPluginVersion>2.3.5</generatorPluginVersion> - <wikittyVersion>3.1.3-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.2-SNAPSHOT</wikittyVersion> <jrstVersion>1.4-SNAPSHOT</jrstVersion> <oooVersion>3.2.1</oooVersion> <javamailVersion>1.4.3</javamailVersion> @@ -282,6 +282,12 @@ </dependency> <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-struts</artifactId> + <version>${wikittyVersion}</version> + </dependency> + + <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> <version>0.9</version> @@ -403,7 +409,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>3.1.0</version> + <version>3.3.0</version> </dependency>  Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/pom.xml 2011-07-06 14:23:24 UTC (rev 115) @@ -75,6 +75,11 @@ </dependency> <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-struts</artifactId> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> </dependency> 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-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-07-06 14:23:24 UTC (rev 115) @@ -2,13 +2,11 @@ import com.opensymphony.xwork2.ActionContext; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; /** * @@ -56,6 +54,7 @@ @Override public String execute() throws Exception { + String result = SUCCESS; WikittyProxy proxy = getProxy(); Wikitty w = proxy.restore(getId()); @@ -81,5 +80,4 @@ } return result; } - } 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-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-07-06 14:23:24 UTC (rev 115) @@ -3,13 +3,22 @@ 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; +import java.util.Set; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.VradiWebHelper; +import org.chorem.vradi.entities.FormNote; import org.chorem.vradi.entities.VradiUser; import org.nuiton.jrst.JRST; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.Search; /** * Permet de charger un user ({@link VradiUser}) grace a son identifiant @@ -72,5 +81,25 @@ return result; } - + public Set<VradiUser> getPartners() { + + // Get my response + String userId = getUser().getWikittyId(); + Criteria formNoteCriteria = Search.query().eq(FormNote.FQ_FIELD_FORMNOTE_PARTNERS, userId).criteria(); + List<FormNote> formNotes = getProxy().findAllByCriteria(FormNote.class, formNoteCriteria).getAll(); + + // Extract partners ids + Set<String> partnersIds = new HashSet<String>(); + for (FormNote formNote : formNotes) { + partnersIds.addAll(formNote.getPartners()); + } + + // Remove own user + partnersIds.remove(userId); + + // Restor partners + Set<VradiUser> partners = getProxy().restore(VradiUser.class, partnersIds); + + return partners; + } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-07-06 14:23:24 UTC (rev 115) @@ -20,10 +20,6 @@ private static final int DEFAULT_NB_FORMS = 10; - static public SearchAction getAction() { - return (SearchAction) ActionContext.getContext().get(CONTEXT_ACTION_KEY); - } - protected int nbForms = DEFAULT_NB_FORMS; protected String query; protected String queryName; 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-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-07-06 14:23:24 UTC (rev 115) @@ -43,7 +43,7 @@ vradi.search.saveQuery=Save request vradi.formView.title=Form view vradi.search.thesaurusFilterButton=Filter -vradi.form.editAction=Edit +vradi.form.editAction=Responses vradi.form.action=Action vradi.action.submit=Submit to administrators vradi.options.comment=Comment @@ -90,4 +90,11 @@ vradi.showInvitation.reject=Reject vradi.showInvitation.noReceived=Do not receved other request from this person vradi.noEmail=No email -vradi.userPreference=User preference +vradi.userPreference=User preferences +vradi.userPreference.form=Form +vradi.userPreference.partners=partners +vradi.userPreference.noreceived=No received +vradi.userPreference.nosend=No send +vradi.userPreference.title=User preferences +vradi.userPreference.note.open=Opened notes +vradi.userPreference.note.close=Closed notes \ 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-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-07-06 14:23:24 UTC (rev 115) @@ -25,7 +25,7 @@ vradi.forgotpwd.title=Vous avez oublié votre mot de passe ? vradi.form.action=Action vradi.form.creationDate=Date de création -vradi.form.editAction=Editer +vradi.form.editAction=Reponses vradi.form.object=Objet vradi.formNote.close=Fermer la réponse vradi.formNote.seekPartners=Recherche de partenaires @@ -99,5 +99,12 @@ vradi.thesaurus.thesaurusRenamed=Nouveau nom du descripteur séléctionné vradi.title=Vradi Web vradi.user.noinfo=Pas d'info -vradi.userPreference=Préférence de l'utilisateur +vradi.userPreference=Préférences de l'utilisateur +vradi.userPreference.form=Formulaire vradi.userPreference.info=Text complémentaire à envoyer en plus de l'abstract lors de la demande +vradi.userPreference.noreceived=Ne pas recevoir +vradi.userPreference.nosend=Ne pas envoyer +vradi.userPreference.note.close=Notes fermées +vradi.userPreference.note.open=Notes ouvertes +vradi.userPreference.partners=Partenaires +vradi.userPreference.title=Préférences de l'utilisateur Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/decorators/main.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/decorators/main.jsp 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/decorators/main.jsp 2011-07-06 14:23:24 UTC (rev 115) @@ -19,7 +19,7 @@ <sj:head jquerytheme="sunny"/> --%> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <s:url var="globalCSS" value="/css/global.css" /> + <s:url var="globalCSS" value="/css/style.css" /> <link href="${globalCSS}" rel="stylesheet" type="text/css" media="all" /> </head> <body id="page-home"> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-07-06 14:23:24 UTC (rev 115) @@ -64,7 +64,7 @@ <s:text name="vradi.show"/> </s:set> <sj:submit id="partnersSubmit" - label="%{showText}" + value="%{showText}" targets="partnersInfo" indicator="indicator-partnersInfo" button="true" buttonIcon="ui-icon-gear"/> </form> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp 2011-07-06 14:23:24 UTC (rev 115) @@ -1,6 +1,4 @@ <%@ page import="org.chorem.vradi.entities.Infogene" %> -<%@ page import="org.chorem.vradi.actions.SearchAction" %> -<%@ page import="com.opensymphony.xwork2.ActionContext" %> <%@ page import="static org.nuiton.i18n.I18n._" %> <%@taglib prefix="s" uri="/struts-tags"%> @@ -15,12 +13,6 @@ } </script> -<% -SearchAction action = SearchAction.getAction(); -String query = action.getQuery(); -ActionContext.getContext().put("query", query); -%> - <s:set id="creationDateText"> <s:text name="vradi.form.creationDate"/> </s:set> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp 2011-07-06 14:23:24 UTC (rev 115) @@ -1,19 +1,7 @@ -<%@ page import="org.chorem.vradi.actions.SearchAction" %> -<%@ page import="com.opensymphony.xwork2.ActionContext" %> <%@page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags" %> -<% -SearchAction action = SearchAction.getAction(); -String query = action.getQuery(); -String queryName = action.getQueryName(); -boolean queryActive = action.isQueryActive(); -ActionContext.getContext().put("query", query); -ActionContext.getContext().put("queryName", queryName); -ActionContext.getContext().put("queryActive", queryActive); -%> - <s:form id="searchForm" action="search"> <div id="empty"> </div> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-07-06 14:23:24 UTC (rev 115) @@ -42,7 +42,7 @@ </s:set> <sj:submit id="partnersShowSubmit" - href="/fragment/partnerInfo.action" + href="/fragment/userInfo.action" targets="partnersShowResult" value="%{showText}" indicator="indicator-partnersShowResult" Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp 2011-07-06 14:23:24 UTC (rev 115) @@ -1,16 +1,8 @@ -<%@page import="com.opensymphony.xwork2.ActionContext"%> -<%@ page import="org.chorem.vradi.actions.ThesaurusAction" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="sjt" uri="/struts-jquery-tree-tags" %> -<% -ThesaurusAction action = ThesaurusAction.getAction(); -String thesaurusNameRequest = action.getThesaurusNameRequest(); -ActionContext.getContext().put("thesaurusNameRequest", thesaurusNameRequest); -%> - <s:url id="thesaurusDataUrl" action="thesaurus"> <s:param name="thesaurusNameRequest"> <s:property value="thesaurusNameRequest"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp 2011-07-06 14:23:24 UTC (rev 115) @@ -14,7 +14,7 @@ <% RestoreUserAction action = RestoreUserAction.getAction(); VradiUser user = action.getUser(); -String email = _("vrado.noEmail"); +String email = _("vradi.noEmail"); String info = action.getInfoHtml(); if (user != null) { email = user.getLogin(); Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-07-04 14:39:32 UTC (rev 114) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-07-06 14:23:24 UTC (rev 115) @@ -7,15 +7,20 @@ <%@page import="org.chorem.vradi.actions.RestoreUserAction"%> <%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.VradiUser"%> +<%@ page import="org.nuiton.wikitty.WikittyUtil" %> +<%@ page import="org.nuiton.wikitty.search.Search" %> +<%@ page import="org.nuiton.wikitty.search.operators.Element" %> <%@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" %> <% RestoreUserAction action = RestoreUserAction.getAction(); VradiUser user = action.getUser(); +//ActionContext.getContext().put("user", WikittyUtil.getWikitty(action.getProxy().getWikittyService(), null, action.getUser())); ActionContext.getContext().put("localUserId", user.getWikittyId()); ActionContext.getContext().put("localUserEmail", user.getLogin()); ActionContext.getContext().put("localUserInfo", user.getInfo()); @@ -31,7 +36,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="vradi.userPreference.title" /></title> <s:head/> - <sj:head jquerytheme="sunny"/> + <%--<sj:head jquerytheme="sunny"/>--%> </head> <body> <h1><s:text name="vradi.userPreference.title" /></h1> @@ -44,29 +49,53 @@ <div> <s:form id="infoForm" action="/ajax/edit/%{localUserId}.action" method="POST"> <sj:textarea name="%{localVradiUserFieldInfo}" - value="%{localUserInfo}" key="vradi.userPreference.info"/> + value="%{localUserInfo}" + key="vradi.userPreference.info"/> + + <s:set id="saveText"> + <s:text name="vradi.save"/> + </s:set> <sj:submit id="infoFormSubmit" - targets="actionResult" indicator="indicator-infoFormSubmit" - value="Save" - button="true" buttonIcon="ui-icon-gear"/> + targets="actionResult" + indicator="indicator-infoFormSubmit" + value="%{saveText}" + button="true" + buttonIcon="ui-icon-gear"/> </s:form> - <img id="indicator-infoFormSubmit" src="/img/indicator.gif" alt="saving..." style="display:none"/> + <img id="indicator-infoFormSubmit" src="/img/indicator.gif" alt="saving..." style="display:none;"/> </div> + <s:set id="showText"> + <s:text name="vradi.show"/> + </s:set> + <s:set id="deleteText"> + <s:text name="vradi.delete"/> + </s:set> +  <div> <h2><s:text name="vradi.userPreference.nosend" /></h2> + <%--<ws:form wikitty="<%=WikittyUtil.getWikitty(action.getProxy().getWikittyService(), null, action.getUser())%>"--%> + <%--proxy="<%=action.getProxy()%>" action="/ajax/edit/%{localUserId}.action">--%> + <%--</ws:form>--%> <s:form id="noSendForm" action="/ajax/edit/%{localUserId}.action" method="POST"> - <s:select size="5" name="userId" list="%{localUserNoSend}" listKey="wikittyId" listValue="login"/> + + <ws:selectAssociation proxy="<%=action.getProxy()%>" + name="userId" + size="5" + businessEntity="<%=action.getUser()%>" + fqFieldName="<%=VradiUser.FQ_FIELD_VRADIUSER_NOSEND%>" + descField="<%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%>"/> + <sj:submit id="noSendFormShowSubmit" - href="/fragment/partnerInfo.action" + href="/fragment/userInfo.action" targets="noSendResult" - value="Show" + value="%{showText}" indicator="indicator-noSendFormSubmit" button="true" /> @@ -74,7 +103,7 @@ id="noSendFormDeleteSubmit" href="%{simpleecho}" targets="noSendResult" - value="Delete" + value="%{deleteText}" indicator="indicator-noSendFormSubmit" button="true" /> @@ -82,7 +111,7 @@ </s:form> <div id="noSendResult"> - <img id="indicator-noSendSubmit" src="/img/indicator.gif" alt="wait..." style="display:none"/> + <img id="indicator-noSendFormSubmit" src="/img/indicator.gif" alt="wait..." style="display:none"/> </div> </div> @@ -92,21 +121,28 @@ <div> <h2><s:text name="vradi.userPreference.noreceived" /></h2> <s:form id="noReceivedForm" action="/ajax/edit/%{localUserId}.action" method="POST"> - <s:select size="5" name="userId" list="%{localUserNoReceived}" listKey="wikittyId" listValue="login"/> + + <ws:selectAssociation proxy="<%=action.getProxy()%>" + name="userId" + size="5" + businessEntity="<%=action.getUser()%>" + fqFieldName="<%=VradiUser.FQ_FIELD_VRADIUSER_NORECEIVED%>" + descField="<%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%>"/> + <sj:submit id="noReceivedFormShowSubmit" - href="/fragment/partnerInfo.action" + href="/fragment/userInfo.action" targets="noReceivedResult" - value="Show" - indicator="indicator-noReceivedFormSubmit" + value="%{showText}" + indicator="indicator-noReceivedSubmit" button="true" /> <sj:submit id="noReceivedFormDeleteSubmit" href="%{simpleecho}" targets="noReceivedResult" - value="Delete" - indicator="indicator-noReceivedFormSubmit" + value="%{deleteText}" + indicator="indicator-noReceivedSubmit" button="true" /> @@ -123,19 +159,29 @@ <div> <h2><s:text name="vradi.userPreference.partners" /></h2> <s:form id="partnersForm" action="/fragment/partners/%{localUserId}.action" method="POST"> - <s:select size="5" name="userId" list="%{localPartners}" listKey="wikittyId" listValue="login"/> + + <ws:select name="userId" + size="5" + entityValues="<%=action.getPartners()%>" + descField="<%=VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN%>"/> + + <%--<s:select size="5" name="userId" list="%{localPartners}" listKey="wikittyId" listValue="login"/>--%> <sj:submit id="partnersFormShowSubmit" - href="/fragment/partnerInfo.action" + href="/fragment/userInfo.action" targets="partnersFormResult" - value="Show" + value="%{showText}" indicator="indicator-partnersForm" button="true" /> + + <s:set id="formText"> + <s:text name="vradi.userPreference.form"/> + </s:set> <sj:submit id="partnersFormShowFormSubmit" targets="partnersFormResult" - value="Form" + value="%{formText}" indicator="indicator-partnersForm" button="true" />

1 0

r114 - trunk/vradi-services/src/main/java/org/chorem/vradi
by echatellier＠users.chorem.org July 4, 2011

July 4, 2011

Author: echatellier Date: 2011-07-04 16:39:32 +0200 (Mon, 04 Jul 2011) New Revision: 114 Url: http://chorem.org/repositories/revision/vradi/114 Log: Deprecate an enum using ordinal value in db storage Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java 2011-07-01 08:11:30 UTC (rev 113) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiConstants.java 2011-07-04 14:39:32 UTC (rev 114) @@ -189,6 +189,10 @@ return description; } + /** + * @deprecated since 0.7.0, never ever use ordinal !!! + */ + @Deprecated public static SessionStatus getStatus(int i) { SessionStatus result = null; for (SessionStatus status : values()) { @@ -199,6 +203,10 @@ return result; } + /** + * @deprecated since 0.7.0, never ever use ordinal !!! + */ + @Deprecated public int getValue() { return ordinal(); }

1 0

r113 - in trunk: . vradi-services/src/main/java/org/chorem/vradi/services vradi-web/src/main/java/org/chorem/vradi vradi-web/src/main/java/org/chorem/vradi/actions vradi-web/src/main/webapp/WEB-INF/jsp
by sletellier＠users.chorem.org July 1, 2011

July 1, 2011

Author: sletellier Date: 2011-07-01 10:11:30 +0200 (Fri, 01 Jul 2011) New Revision: 113 Url: http://chorem.org/repositories/revision/vradi/113 Log: - Do search after query selection - Keep selected query in session - Prefere use onSuccessTopic than onCompleteTopic Modified: trunk/pom.xml trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataService.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormGridAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/pom.xml 2011-07-01 08:11:30 UTC (rev 113) @@ -115,12 +115,12 @@ <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> <generatorPluginVersion>2.3.5</generatorPluginVersion> <wikittyVersion>3.1.3-SNAPSHOT</wikittyVersion> - <jrstVersion>1.3.1-SNAPSHOT</jrstVersion> + <jrstVersion>1.4-SNAPSHOT</jrstVersion> <oooVersion>3.2.1</oooVersion> <javamailVersion>1.4.3</javamailVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.2.3</struts2Version> - <struts2jqueryVersion>3.0.2</struts2jqueryVersion> + <struts2jqueryVersion>3.1.0</struts2jqueryVersion> <servletApiVersion>2.5</servletApiVersion> <jspApiVersion>2.0</jspApiVersion> @@ -284,7 +284,7 @@ <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> - <version>0.8</version> + <version>0.9</version> </dependency> <dependency> Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataService.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataService.java 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataService.java 2011-07-01 08:11:30 UTC (rev 113) @@ -558,30 +558,30 @@ /** * Used to check if user have activate this query or not * - * @param user of query + * @param userId of query * @param queryName to check * @return true if request is active */ - boolean checkRequestIsActive(VradiUser user, String queryName); + boolean checkRequestIsActive(String userId, String queryName); /** * Activate or not query for user, if it's the first one, user and client will * be created to add request. It will be automaticly added to email binding. * - * @param user concerned + * @param userId concerned * @param queryName to switch * @param queryContent to switch * @return if is active */ - boolean switchUserQueryActivation(VradiUser user, String queryName, String queryContent); + boolean switchUserQueryActivation(String userId, String queryName, String queryContent); /** * Save query on vradi user * - * @param user concerned + * @param userId concerned * @param queryName name of query to save * @param query content - * @return user updated + * @return query saved */ - VradiUser saveQuery(VradiUser user, String queryName, String query); + Query saveQuery(String userId, String queryName, String query); } Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java 2011-07-01 08:11:30 UTC (rev 113) @@ -757,20 +757,25 @@ return formTypeManager.getFormTypeTemplateName(extension); } + protected VradiUser getVradiUser(String userId) { + return wikittyProxy.restore(VradiUser.class, userId); + } + @Override - public boolean checkRequestIsActive(VradiUser user, String queryName) { - return clientManager.checkRequestIsActive(user, queryName); + public boolean checkRequestIsActive(String userId, String queryName) { + return clientManager.checkRequestIsActive(getVradiUser(userId), queryName); } @Override - public boolean switchUserQueryActivation(VradiUser user, String queryName, String queryContent) { - return clientManager.switchUserQueryActivation(user, queryName, queryContent); + public boolean switchUserQueryActivation(String userId, String queryName, String queryContent) { + return clientManager.switchUserQueryActivation(getVradiUser(userId), queryName, queryContent); } @Override - public VradiUser saveQuery(VradiUser user, String queryName, String content) { + public Query saveQuery(String userId, String queryName, String content) { - Set<String> queries = user.getQueries(); + VradiUser vradiUser = getVradiUser(userId); + Set<String> queries = vradiUser.getQueries(); Query query = null; @@ -788,10 +793,11 @@ } query.setContent(content); - user.addQueries(query.getWikittyId()); - wikittyProxy.store(query); + vradiUser.addQueries(query.getWikittyId()); + wikittyProxy.store(vradiUser); + query = wikittyProxy.store(query); - return wikittyProxy.store(user); + return query; } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-07-01 08:11:30 UTC (rev 113) @@ -29,6 +29,7 @@ protected String securityToken = null; protected VradiUser user = null; + protected String selectedRequestId = null; transient protected VradiProxy proxy = null; transient protected VradiDataService dataService; @@ -69,6 +70,7 @@ choremSession.getProxy().logout(); session.remove(VRADI_SESSION_KEY); user = null; + selectedRequestId = null; } static public VradiSession getVradiSession(HttpServletRequest request) { @@ -127,4 +129,12 @@ public void setUser(VradiUser user) { this.user = user; } + + public String getSelectedRequest() { + return selectedRequestId; + } + + public void setSelectedRequest(String selectedRequestId) { + this.selectedRequestId = selectedRequestId; + } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormGridAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormGridAction.java 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormGridAction.java 2011-07-01 08:11:30 UTC (rev 113) @@ -134,14 +134,7 @@ } public String getJSON() { - return execute(); - } - /** - * Initializes everything before displaying the home page - */ - public String execute() { - // Build search String query = getQuery(); QueryParameters queryParameters = new QueryParameters(query); Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SavedQueriesAction.java 2011-07-01 08:11:30 UTC (rev 113) @@ -2,7 +2,9 @@ import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.interceptor.ServletRequestAware; +import org.chorem.vradi.VradiSession; import org.chorem.vradi.entities.Query; +import org.chorem.vradi.entities.VradiUser; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; @@ -30,6 +32,12 @@ this.request = request; } + public String getSelectedQuery() { + String selectedQuery = VradiSession.getVradiSession(request).getSelectedRequest(); + + return selectedQuery; + } + public List<Query> getLastQueries() { if (lastQueries == null || lastQueries.isEmpty()) { lastQueries = Collections.EMPTY_LIST; @@ -50,8 +58,12 @@ */ public String execute() { + // Update user to prevent wikitty obselete + VradiUser user = getProxy().restore(VradiUser.class, getUser().getWikittyId()); + setUser(user); + // Retrieve last requests - Set<String> queriesId = getUser().getQueries(); + Set<String> queriesId = user.getQueries(); if (queriesId != null) { this.lastQueries = getProxy().restore(Query.class, new ArrayList<String>(queriesId)); } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-07-01 08:11:30 UTC (rev 113) @@ -3,6 +3,7 @@ import com.opensymphony.xwork2.ActionContext; import org.apache.commons.lang.StringUtils; import org.apache.struts2.interceptor.ServletRequestAware; +import org.chorem.vradi.VradiSession; import org.chorem.vradi.entities.Query; import org.chorem.vradi.entities.VradiUser; @@ -40,10 +41,12 @@ } public String getSelectedQuery() { + selectedQuery = VradiSession.getVradiSession(request).getSelectedRequest(); return selectedQuery; } public void setSelectedQuery(String selectedQuery) { + VradiSession.getVradiSession(request).setSelectedRequest(selectedQuery); this.selectedQuery = selectedQuery; } @@ -80,7 +83,13 @@ this.request = request; } + @Override + public String execute() throws Exception { + return refreshForm(); + } + public String refreshForm() { + String selectedQuery = getSelectedQuery(); if (!StringUtils.isEmpty(selectedQuery)) { Query query = getProxy().restore(Query.class, selectedQuery); @@ -90,7 +99,7 @@ VradiUser user = getUser(); // Check if request is active / inactive - this.queryActive = getVradiSession().getDataService().checkRequestIsActive(user, queryName); + this.queryActive = getVradiSession().getDataService().checkRequestIsActive(user.getWikittyId(), queryName); } else { setQuery(StringUtils.EMPTY); setQueryName(StringUtils.EMPTY); @@ -104,9 +113,8 @@ if (!StringUtils.isEmpty(queryName) && !StringUtils.isEmpty(query)) { VradiUser user = getUser(); - user = getVradiSession().getDataService().saveQuery(user, queryName, query); - - setUser(user); + Query queryUpdated = getVradiSession().getDataService().saveQuery(user.getWikittyId(), queryName, query); + setSelectedQuery(queryUpdated.getWikittyId()); } return SUCCESS; } @@ -119,7 +127,7 @@ // Activate or not query for user, if it's the first one, user and client will // be created to add request. It will be automaticly added to email binding. VradiUser user = getUser(); - queryActive = getVradiSession().getDataService().switchUserQueryActivation(user, queryName, query); + queryActive = getVradiSession().getDataService().switchUserQueryActivation(user.getWikittyId(), queryName, query); return SUCCESS; } 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-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-07-01 08:11:30 UTC (rev 113) @@ -1,7 +1,6 @@ package org.chorem.vradi.actions; import com.opensymphony.xwork2.ActionContext; -import freemarker.template.utility.Collections12; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -14,7 +13,6 @@ import org.chorem.vradi.VradiWebHelper; import org.chorem.vradi.entities.FormNote; import org.chorem.vradi.entities.VradiUser; -import org.nuiton.util.CollectionUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; @@ -182,7 +180,9 @@ log.error(String.format("Url forged for invitation is to long for some navigator '%s'", url)); } - EmailType.REQUEST.sendEmail(recipient, sender, message, url, sender.getInfo()); + if (EmailType.REQUEST.sendEmail(recipient, sender, message, url, sender.getInfo())) { + sendCount = recipient.size(); + } return result; } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-07-01 08:11:30 UTC (rev 113) @@ -39,6 +39,8 @@ * </pre> */ protected static final String CONTEXT_ACTION_KEY = "action"; + + protected static final String CONTEXT_SELECTED_QUERY_KEY = "selectedQuery"; public static final String UNTRANSLATED_MARKER = "???"; protected Map<String, Object> session; Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-07-01 08:11:30 UTC (rev 113) @@ -112,7 +112,7 @@ <sj:submit id="htmlSummaryEditSubmit" value="%{saveText}" targets="result" - onCompleteTopics="updateHtmlSummary" + onSuccessTopics="updateHtmlSummary" indicator="indicator-htmlSummary" button="true" buttonIcon="ui-icon-gear"/> </form> @@ -171,7 +171,7 @@ <s:file name="content" key="vradi.addfiles.content" required="true"/> <sj:submit id="addFilesSubmit" formIds="addFilesForm" value="%{saveText}" - targets="files" onCompleteTopics="" + targets="files" onSuccessTopics="" indicator="indicator-addFiles" button="true" buttonIcon="ui-icon-gear"/> </s:form> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp 2011-07-01 08:11:30 UTC (rev 113) @@ -27,6 +27,7 @@ <sj:submit id="doUpdateFormSubmit" cssClass="hidden" listenTopics="doUpdateForm" + onSuccessTopics="updateGrid" targets="searchPanel" button="true"/> </form> \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-07-01 08:11:30 UTC (rev 113) @@ -41,7 +41,6 @@ } $('#searchArea')[0].value += finalName.trim(); }); - </script> </head> <body> @@ -82,10 +81,13 @@ <sj:div id="searchPanel" href="/fragment/searchPanel.action" listenTopics="updateForm" + onSuccessTopics="updateGrid" indicator="indicator-searchPanel"> <img id="indicator-searchPanel" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> - <sj:div id="resultPanel" href="/fragment/search.action" indicator="indicator-grid"> + <sj:div id="resultPanel" + href="/fragment/search.action" + indicator="indicator-grid"> <img id="indicator-grid" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> </div> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp 2011-06-30 14:22:30 UTC (rev 112) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp 2011-07-01 08:11:30 UTC (rev 113) @@ -43,7 +43,7 @@ href="%{saveQueryUrl}" value="%{saveQueryText}" targets="empty" - onCompleteTopics="updateQueries" + onSuccessTopics="updateQueries" button="true"/> <s:url id="switchQueryUrl" value="/fragment/switchQueryActivation.action"/> @@ -61,7 +61,7 @@ href="%{switchQueryUrl}" value="%{queryActiveText}" targets="empty" - onCompleteTopics="doUpdateForm" + onSuccessTopics="doUpdateForm" button="true"/> <s:set id="searchText"> @@ -72,6 +72,7 @@ value="%{searchText}" indicator="indicator-grid" targets="resultPanel" + listenTopics="updateGrid" button="true"/> </div>

1 0

r112 - in trunk/vradi-web/src/main: java/org/chorem/vradi java/org/chorem/vradi/actions resources/i18n webapp/WEB-INF/jsp webapp/WEB-INF/jsp/inc
by sletellier＠users.chorem.org June 30, 2011

June 30, 2011

Author: sletellier Date: 2011-06-30 16:22:30 +0200 (Thu, 30 Jun 2011) New Revision: 112 Url: http://chorem.org/repositories/revision/vradi/112 Log: - Send request email - Add link to user preference Added: trunk/vradi-web/src/main/java/org/chorem/vradi/EmailType.java Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.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/inc/header.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp Added: trunk/vradi-web/src/main/java/org/chorem/vradi/EmailType.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/EmailType.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/EmailType.java 2011-06-30 14:22:30 UTC (rev 112) @@ -0,0 +1,71 @@ +package org.chorem.vradi; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.vradi.entities.VradiUser; +import org.chorem.vradi.services.managers.MailingManager; +import org.nuiton.i18n.I18n; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import static org.nuiton.i18n.I18n.n_; + +public enum EmailType { + + THESAURUS_NEW_CHILD(n_("vradi.template.thesaurus.new.child")), + THESAURUS_RENAMED(n_("vradi.template.thesaurus.renamed")), + WEBHARVEST(n_("vradi.template.webHarvest")), + RSS(n_("vradi.template.rss")), + REQUEST(n_("vradi.template.request")); + + protected static final Log log = LogFactory.getLog(EmailType.class); + public static final String TITLE_PREFIX = ".title"; + private String key; + + EmailType(String key) { + this.key = key; + } + + public boolean sendEmailToAdmins(VradiUser user, String comment, String... args) { + List<String> adminEmail = VradiWebConfig.getAdminEmail(); + return sendEmail(adminEmail, user, comment, args); + } + + /** + * We consider that i18n is created for key with login and more in args + * + * @param user ask to send msg + * @param comment commentaire à ajouter + * @param args to add in message + * @return true if send + */ + public boolean sendEmail(Collection<String> recipients, VradiUser user, String comment, String... args) { + String title = I18n._(key + TITLE_PREFIX); + + List<String> argsList = new ArrayList<String>(); + argsList.add(user.getLogin()); + argsList.add(comment); + argsList.addAll(Arrays.asList(args)); + + String msg = I18n._(key, argsList.toArray(new String[argsList.size()])); + for (String recipient : recipients) { + try { + MailingManager.postMail(VradiWebConfig.getConfig(), recipient, title, false, msg); + if (log.isDebugEnabled()) { + log.debug("Mail is sent from '" + user.getLogin() + + "' to '" + recipient + "' with title '" + + title + "' and body : " + msg); + } + } catch (Exception eee) { + log.error("Failed to send email from '" + user.getLogin() + + "' to '" + recipient + "' with title '" + + title + "' and body : " + msg, eee); + return false; + } + } + return true; + } +} \ 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-06-30 13:14:25 UTC (rev 111) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java 2011-06-30 14:22:30 UTC (rev 112) @@ -69,22 +69,6 @@ } /** - * Envoi un mail a chaque recipient avec comme contenu du mail mailContent. - * Le senders est une adresse on les reponses ne sont pas possible - * (vradi-noresponse(a)vradi.chorem.org) - * - * @param recipient - * @param mailContent - */ - public static void sendEmail(Set<String> recipient, String mailContent) { - String sender = "vradi-noresponse(a)vradi.chorem.org"; - String subject = "Vradi invitation"; - for (String email : recipient) { - // FIXME poussin 20110601 implanter l'envoi d'email - } - } - - /** * Converti le rst dans le format demande * @param resultType * @param rst Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java 2011-06-30 13:14:25 UTC (rev 111) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java 2011-06-30 14:22:30 UTC (rev 112) @@ -1,17 +1,10 @@ package org.chorem.vradi.actions; import org.apache.commons.lang.StringUtils; -import org.chorem.vradi.VradiWebConfig; -import org.chorem.vradi.entities.VradiUser; -import org.chorem.vradi.services.managers.MailingManager; +import org.chorem.vradi.EmailType; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import static org.nuiton.i18n.I18n._; - /** * Action used for vradi web options page * @@ -90,22 +83,22 @@ boolean sent = true; if (!StringUtils.isEmpty(thesaurusNewChildName)) { // User propose new thesaurus child - sent &= EmailType.THESAURUS_NEW_CHILD.sendEmail(getUser(), comment, thesaurusPath, thesaurusNewChildName); + sent &= EmailType.THESAURUS_NEW_CHILD.sendEmailToAdmins(getUser(), comment, thesaurusPath, thesaurusNewChildName); } if (!StringUtils.isEmpty(thesaurusRenamed)) { // User propose to rename thesaurus - sent &= EmailType.THESAURUS_RENAMED.sendEmail(getUser(), comment, thesaurusPath, thesaurusName, thesaurusRenamed); + sent &= EmailType.THESAURUS_RENAMED.sendEmailToAdmins(getUser(), comment, thesaurusPath, thesaurusName, thesaurusRenamed); } if (webHarvestScript != null) { // Upload file String uri = getVradiSession().getFileService().uploadWebHarvestScript(webHarvestScript); // User propose to add a webharvest script - sent &= EmailType.WEBHARVEST.sendEmail(getUser(), comment, uri); + sent &= EmailType.WEBHARVEST.sendEmailToAdmins(getUser(), comment, uri); } if (!StringUtils.isEmpty(rssUrl)) { // User propose to add an rss - sent &= EmailType.RSS.sendEmail(getUser(), comment, rssUrl); + sent &= EmailType.RSS.sendEmailToAdmins(getUser(), comment, rssUrl); } if (sent) { @@ -115,54 +108,4 @@ } } - public enum EmailType { - THESAURUS_NEW_CHILD("vradi.template.thesaurus.new.child"), - THESAURUS_RENAMED("vradi.template.thesaurus.renamed"), - WEBHARVEST("vradi.template.webHarvest"), - RSS("vradi.template.rss"); - - public static final String TITLE_PREFIX = ".title"; - private String key; - - EmailType(String key) { - this.key = key; - } - - /** - * We consider that i18n is created for key with login and more in args - * - * @param user ask to send msg - * @param comment commentaire à ajouter - * @param args to add in message - * @return true if send - */ - public boolean sendEmail(VradiUser user, String comment, String... args) { - String title = _(key + TITLE_PREFIX); - - List<String> argsList = new ArrayList<String>(); - argsList.add(user.getLogin()); - argsList.add(comment); - argsList.addAll(Arrays.asList(args)); - - String msg = _(key, argsList.toArray(new String[argsList.size()])); - - List<String> adminEmail = VradiWebConfig.getAdminEmail(); - for (String recipient : adminEmail) { - try { - MailingManager.postMail(VradiWebConfig.getConfig(), recipient, title, false, msg); - if (log.isDebugEnabled()) { - log.debug("Mail is sent from '" + user.getLogin() + - "' to '" + recipient + "' with title '" + - title + "' and body : " + msg); - } - } catch (Exception eee) { - log.error("Failed to send email from '" + user.getLogin() + - "' to '" + recipient + "' with title '" + - title + "' and body : " + msg, eee); - return false; - } - } - return true; - } - } } 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-06-30 13:14:25 UTC (rev 111) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-06-30 14:22:30 UTC (rev 112) @@ -9,6 +9,7 @@ import org.apache.commons.lang.StringUtils; 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.VradiWebHelper; import org.chorem.vradi.entities.FormNote; @@ -181,25 +182,8 @@ log.error(String.format("Url forged for invitation is to long for some navigator '%s'", url)); } - StringBuilder mailContent = new StringBuilder(); - mailContent.append("Bonjour,\n"); - mailContent.append("\n"); - mailContent.append("Ceci est une invitation pour participer à la creation\n"); - mailContent.append("commune d'information sur un formulaire Vradi.\n"); - mailContent.append("\n"); - mailContent.append("Cette invitation provient de:\n"); - mailContent.append(sender.getInfo()); - mailContent.append("\n\n"); - mailContent.append("Avec le message:\n"); - mailContent.append(message); - mailContent.append("\n\n"); - mailContent.append("Pour répondre à cette demande veuillez aller sur la page:\n"); - mailContent.append(url); - mailContent.append("\n\n"); - mailContent.append("Cordialement,"); + EmailType.REQUEST.sendEmail(recipient, sender, message, url, sender.getInfo()); - VradiWebHelper.sendEmail(recipient, mailContent.toString()); - return result; } 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-06-30 13:14:25 UTC (rev 111) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-06-30 14:22:30 UTC (rev 112) @@ -89,3 +89,5 @@ vradi.showInvitation.accept=Accept vradi.showInvitation.reject=Reject vradi.showInvitation.noReceived=Do not receved other request from this person +vradi.noEmail=No email +vradi.userPreference=User preference 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-06-30 13:14:25 UTC (rev 111) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-06-30 14:22:30 UTC (rev 112) @@ -40,6 +40,7 @@ vradi.login.title=Connection vradi.logout.submit=Déconnection vradi.new.formNote=Nouvelle réponse +vradi.noEmail=Pas d'email vradi.options=Options vradi.options.comment=Commentaires vradi.options.rssUrl=Ajout d'un flux RSS @@ -73,7 +74,7 @@ vradi.seekingPartners.title=Recherche de partenaires vradi.send=Envoyer vradi.sendInvitation.count=Nombre d'invitations envoyés -vradi.sendInvitation.title=Envoie d'invitation +vradi.sendInvitation.title=Envoi d'invitation vradi.show=Afficher vradi.showInvitation.accept=Accepter vradi.showInvitation.from=L'invitation provient de \: @@ -83,17 +84,20 @@ vradi.showInvitation.requestMsg=Le message de l'invitation est \: vradi.showInvitation.title=Visualisation de l'invitation vradi.summary=Résumé -vradi.template.rss=L'utilisateur %1$s à fait la demande d'ajout du flux RSS '%3$s' avec le commentaire suivant \: %2$s +vradi.template.request=Bonjour,\n\nCeci est une invitation pour participer à la creation commune d'information sur un formulaire Vradi.\n\nCette invitation provient de\:\n%4$s\n\nAvec le message\:\n%2$s\n\nPour répondre à cette demande veuillez aller sur la page\:'%3$s'\n"\n\nCordialement. +vradi.template.request.title=[Vradi web] Vradi invitation +vradi.template.rss=L'utilisateur %1$s à fait la demande d'ajout du flux RSS '%3$s' avec le commentaire suivant \: \n%2$s vradi.template.rss.title=[Vradi web] Demande d'ajout d'un flux RSS -vradi.template.thesaurus.new.child=L'utilisateur %1$s à fait la demande d'ajout d'un thesaurus pour le chemin '%3$s' qui aura pour nom '%4$s' avec le commentaire suivant \: %2$s +vradi.template.thesaurus.new.child=L'utilisateur %1$s à fait la demande d'ajout d'un thesaurus pour le chemin '%3$s' qui aura pour nom '%4$s' avec le commentaire suivant \: \n%2$s vradi.template.thesaurus.new.child.title=[Vradi web] Demande d'ajout d'un thesaurus -vradi.template.thesaurus.renamed=L'utilisateur %1$s à fait la demande de renomage d'un thesaurus pour le chemin '%3$s' qui avais le nom '%4$s' avec pour nouveau nom '%5$s' avec le commentaire suivant \: %2$s +vradi.template.thesaurus.renamed=L'utilisateur %1$s à fait la demande de renomage d'un thesaurus pour le chemin '%3$s' qui avais le nom '%4$s' avec pour nouveau nom '%5$s' avec le commentaire suivant \: \n%2$s vradi.template.thesaurus.renamed.title=[Vradi web] Demande de renomage d'un thesaurus -vradi.template.webHarvest=L'utilisateur %1$s à fait la demande d'ajout du script webHarvest disponible à l'adresse '%3$s' avec le commentaire suivant \: %2$s +vradi.template.webHarvest=L'utilisateur %1$s à fait la demande d'ajout du script webHarvest disponible à l'adresse '%3$s' avec le commentaire suivant \: \n%2$s vradi.template.webHarvest.title=[Vradi web] Demande d'ajout d'un script webHarvest vradi.thesaurus.path=Chemin du descripteur \: vradi.thesaurus.thesaurusNewChildName=Nom du nouveau fils pour le descripteur séléctionné vradi.thesaurus.thesaurusRenamed=Nouveau nom du descripteur séléctionné vradi.title=Vradi Web -vradi.user.noinfo= +vradi.user.noinfo=Pas d'info +vradi.userPreference=Préférence de l'utilisateur vradi.userPreference.info=Text complémentaire à envoyer en plus de l'abstract lors de la demande Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp 2011-06-30 13:14:25 UTC (rev 111) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp 2011-06-30 14:22:30 UTC (rev 112) @@ -10,6 +10,9 @@ VradiSession vradiSession = VradiSession.getVradiSession(session); VradiUser user = vradiSession.getUser(); ActionContext.getContext().put("logged", user != null); + if (user != null) { + ActionContext.getContext().put("userId", user.getWikittyId()); + } String requestURI = request.getRequestURI(); boolean isSearchView = requestURI.contains("searchView"); @@ -17,6 +20,9 @@ boolean isOption = requestURI.contains("option"); ActionContext.getContext().put("isNotOptionPage", !isOption); + + boolean isNotUserPreferencePage = requestURI.contains("userPreference"); + ActionContext.getContext().put("isNotUserPreferencePage", !isNotUserPreferencePage); %> <div id="titlePanel"> <h1><s:text name="vradi.title" /></h1> @@ -29,6 +35,12 @@ <s:text name="vradi.options"/> </s:a> </s:if> + <s:if test="isNotUserPreferencePage"> + <s:a id="options" + href="/userPreference/%{userId}.action"> + <s:text name="vradi.userPreference"/> + </s:a> + </s:if> <s:if test="isNotSearchViewPage"> <s:a id="searchLink" action="searchView"> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp 2011-06-30 13:14:25 UTC (rev 111) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp 2011-06-30 14:22:30 UTC (rev 112) @@ -40,8 +40,11 @@ <form id="partnersForm" action="/fragment/userInfo.action"> <s:select size="5" name="userId" list="partners" listKey="wikittyId" listValue="login"/> + <s:set id="showText"> + <s:text name="vradi.show"/> + </s:set> <sj:submit id="partnersSubmit" - value="Show" + value="%{showText}" targets="partnersInfo" indicator="indicator-partnersInfo" button="true" buttonIcon="ui-icon-gear"/> </form> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp 2011-06-30 13:14:25 UTC (rev 111) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp 2011-06-30 14:22:30 UTC (rev 112) @@ -5,8 +5,8 @@ --%> <%@page import="org.chorem.vradi.actions.RestoreUserAction"%> -<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.VradiUser"%> +<%@ page import="static org.nuiton.i18n.I18n._" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> @@ -14,7 +14,7 @@ <% RestoreUserAction action = RestoreUserAction.getAction(); VradiUser user = action.getUser(); -String email = "no email"; +String email = _("vrado.noEmail"); String info = action.getInfoHtml(); if (user != null) { email = user.getLogin();

1 0

r111 - in trunk/vradi-web/src: main/java/org/chorem/vradi main/java/org/chorem/vradi/actions main/resources/i18n main/webapp/WEB-INF/jsp test/java/org/chorem/vradi
by sletellier＠users.chorem.org June 30, 2011

June 30, 2011

Author: sletellier Date: 2011-06-30 15:14:25 +0200 (Thu, 30 Jun 2011) New Revision: 111 Url: http://chorem.org/repositories/revision/vradi/111 Log: - Fix show invitation traduction - Debug decode method : url was alrady decode by navigator - Fix npe in escapeSciptBalises method Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.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/showInvitation.jsp trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java 2011-06-30 10:27:24 UTC (rev 110) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java 2011-06-30 13:14:25 UTC (rev 111) @@ -2,15 +2,15 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import java.net.URLEncoder; import java.util.Set; + +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.nuiton.jrst.JRST; import org.nuiton.util.GZUtil; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; /** * Utilities class @@ -25,6 +25,9 @@ public static String escapeSciptBalises(String txt) { // (?s) activ dotall (http://download.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html#D…) + if (StringUtils.isEmpty(txt)){ + return StringUtils.EMPTY; + } return txt.replaceAll("(?s)<script.*?>.*</script>", ""); } @@ -34,10 +37,11 @@ */ public static String encode(String s) throws IOException { String encType = "UTF-8"; - BASE64Encoder b64enc = new BASE64Encoder(); +// BASE64Encoder b64enc = new BASE64Encoder(); byte[] gz = GZUtil.stringToBytes(s); - String gzs = b64enc.encode(gz); + byte[] encoded = Base64.encodeBase64(gz); + String gzs = new String(encoded, encType); String result = URLEncoder.encode(gzs, encType); return result; @@ -53,10 +57,12 @@ */ public static String decode(String enc) throws UnsupportedEncodingException, IOException { String encType = "UTF-8"; - BASE64Decoder b64dec = new BASE64Decoder(); +// BASE64Decoder b64dec = new BASE64Decoder(); - String gzs2 = URLDecoder.decode(enc, encType); - byte[] gz2 = b64dec.decodeBuffer(gzs2); + // Le navigateur decode deja l'url +// String gzs2 = URLDecoder.decode(enc, encType); + byte[] bytes = enc.getBytes(encType); + byte[] gz2 = Base64.decodeBase64(bytes); String result = GZUtil.bytesToString(gz2); return result; 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-06-30 10:27:24 UTC (rev 110) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-06-30 13:14:25 UTC (rev 111) @@ -175,7 +175,7 @@ info.append(message); String param = VradiWebHelper.encode(info.toString()); - String url = String.format("http://%s/showInvitation.action?p=%s", + String url = String.format("%s/showInvitation.action?p=%s", VradiWebConfig.getVradiWebServerUrl(), param); if (url.length() > 2000) { log.error(String.format("Url forged for invitation is to long for some navigator '%s'", url)); 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-06-30 10:27:24 UTC (rev 110) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-06-30 13:14:25 UTC (rev 111) @@ -82,3 +82,10 @@ vradi.userPreference.info=Additional text to be sent in addition to the summary when applying vradi.sendInvitation.title=Send request vradi.sendInvitation.count=Number of sended requests +vradi.showInvitation.title=View request +vradi.showInvitation.from=Request from \: +vradi.showInvitation.otherPartners=Other partners are \: +vradi.showInvitation.requestMsg=Request message \: +vradi.showInvitation.accept=Accept +vradi.showInvitation.reject=Reject +vradi.showInvitation.noReceived=Do not receved other request from this person 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-06-30 10:27:24 UTC (rev 110) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-06-30 13:14:25 UTC (rev 111) @@ -72,7 +72,16 @@ vradi.seekingPartners.seeker=Ceux qui recherche des partenaires pour cette appel d'offre vradi.seekingPartners.title=Recherche de partenaires vradi.send=Envoyer +vradi.sendInvitation.count=Nombre d'invitations envoyés +vradi.sendInvitation.title=Envoie d'invitation vradi.show=Afficher +vradi.showInvitation.accept=Accepter +vradi.showInvitation.from=L'invitation provient de \: +vradi.showInvitation.noReceived=Ne plus recevoir d'invitation de cette personne +vradi.showInvitation.otherPartners=Les autres partenaires sur le projet sont \: +vradi.showInvitation.reject=Rejeter +vradi.showInvitation.requestMsg=Le message de l'invitation est \: +vradi.showInvitation.title=Visualisation de l'invitation vradi.summary=Résumé vradi.template.rss=L'utilisateur %1$s à fait la demande d'ajout du flux RSS '%3$s' avec le commentaire suivant \: %2$s vradi.template.rss.title=[Vradi web] Demande d'ajout d'un flux RSS @@ -88,5 +97,3 @@ vradi.title=Vradi Web vradi.user.noinfo= vradi.userPreference.info=Text complémentaire à envoyer en plus de l'abstract lors de la demande -vradi.sendInvitation.title=Envoie d'invitation -vradi.sendInvitation.count=Nombre d'invitations envoyés Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp 2011-06-30 10:27:24 UTC (rev 110) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp 2011-06-30 13:14:25 UTC (rev 111) @@ -28,15 +28,16 @@ <body> <h1><s:text name="vradi.showInvitation.title" /></h1> - <div>L'invitation provient de: <%=action.getSender()%> + <div> + <s:text name="vradi.showInvitation.from"/><%=action.getSender().getLogin()%> <p> <%=action.getSenderInfo()%> </p> </div> <div> - Les autres partenaires sur le projet sont: - + <s:text name="vradi.showInvitation.otherPartners"/> + <form id="partnersForm" action="/fragment/userInfo.action"> <s:select size="5" name="userId" list="partners" listKey="wikittyId" listValue="login"/> <sj:submit id="partnersSubmit" @@ -50,7 +51,9 @@ </div> - <div>Le message de l'invitation est: + <div> + <s:text name="vradi.showInvitation.requestMsg"/> + <p><%=action.getMessage()%></p> </div> @@ -62,12 +65,12 @@ <sj:a id="rejectButton" href="/rejectInvitation/%{localNoteId}.action" button="true" buttonIcon="ui-icon-gear"> - <s:text name="vradi.showInvitation.accept"/> + <s:text name="vradi.showInvitation.reject"/> </sj:a> <sj:a id="noReceivedButton" href="/noReceivedInvitation/%{localSenderId}.action" button="true" buttonIcon="ui-icon-gear"> - <s:text name="vradi.showInvitation.accept"/> + <s:text name="vradi.showInvitation.noReceived"/> </sj:a> </div> Modified: trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java =================================================================== --- trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java 2011-06-30 10:27:24 UTC (rev 110) +++ trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java 2011-06-30 13:14:25 UTC (rev 111) @@ -3,6 +3,8 @@ import junit.framework.Assert; import org.junit.Test; +import java.io.IOException; + /** * @author sletellier */

1 0

r110 - in trunk/vradi-web/src/main: java/org/chorem/vradi/actions resources/i18n
by sletellier＠users.chorem.org June 30, 2011

June 30, 2011

Author: sletellier Date: 2011-06-30 12:27:24 +0200 (Thu, 30 Jun 2011) New Revision: 110 Url: http://chorem.org/repositories/revision/vradi/110 Log: - Fix send request translations - Fix npe Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.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 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-06-30 10:15:09 UTC (rev 109) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SendInvitationAction.java 2011-06-30 10:27:24 UTC (rev 110) @@ -84,14 +84,17 @@ } protected boolean acceptReceiver(VradiUser sender, VradiUser recipient) { - boolean result = !sender.getNoSend().contains(recipient.getWikittyId()); - result = result && !recipient.getNoReceived().contains(sender.getWikittyId()); + boolean result = sender.getNoSend() == null || + !sender.getNoSend().contains(recipient.getWikittyId()); + result = result && (recipient.getNoReceived() == null || + !recipient.getNoReceived().contains(sender.getWikittyId())); return result; } + /** * En recherche toutes les personnes a qui envoyer la demande de parteneriat * Si cette personne souhaite plus recevoir de demande de votre part - * On que vous ne souhaiter plus lui en envoyer, elle ne sera pas + * Ou que vous ne souhaiter plus lui en envoyer, elle ne sera pas * selectionnee. Ce critere ne s'applique que sur la personne faisant * l'action de recherche de partenaire et non pas a la liste complete * des partenaires deja present sur la note. 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-06-30 10:15:09 UTC (rev 109) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-06-30 10:27:24 UTC (rev 110) @@ -80,3 +80,5 @@ vradi.seekingPartners.invite=Guests vradi.seekingPartners.inviteEmail=Guest Email (separated by \',\') vradi.userPreference.info=Additional text to be sent in addition to the summary when applying +vradi.sendInvitation.title=Send request +vradi.sendInvitation.count=Number of sended requests 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-06-30 10:15:09 UTC (rev 109) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-06-30 10:27:24 UTC (rev 110) @@ -67,7 +67,7 @@ vradi.seekingPartners.desc=Envoyer la demande à \: vradi.seekingPartners.formReceiver=Ceux qui ont recu l'appel d'offre vradi.seekingPartners.invite=Invités -vradi.seekingPartners.inviteEmail=Emails des invités (séparées par une ',') +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 @@ -88,3 +88,5 @@ vradi.title=Vradi Web vradi.user.noinfo= vradi.userPreference.info=Text complémentaire à envoyer en plus de l'abstract lors de la demande +vradi.sendInvitation.title=Envoie d'invitation +vradi.sendInvitation.count=Nombre d'invitations envoyés

1 0

r109 - in trunk/vradi-web/src/main: java/org/chorem/vradi/actions resources/i18n webapp/WEB-INF/jsp
by sletellier＠users.chorem.org June 30, 2011

June 30, 2011

Author: sletellier Date: 2011-06-30 12:15:09 +0200 (Thu, 30 Jun 2011) New Revision: 109 Url: http://chorem.org/repositories/revision/vradi/109 Log: Translate formNotes pages Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.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/seekPartners.jsp Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java 2011-06-30 09:54:09 UTC (rev 108) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java 2011-06-30 10:15:09 UTC (rev 109) @@ -132,6 +132,7 @@ * We consider that i18n is created for key with login and more in args * * @param user ask to send msg + * @param comment commentaire à ajouter * @param args to add in message * @return true if send */ 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-06-30 09:54:09 UTC (rev 108) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-06-30 10:15:09 UTC (rev 109) @@ -54,4 +54,29 @@ vradi.template.thesaurus.renamed=User %1$s ask to rename thesaurus for path '%3$s' was name '%4$s' to name '%5$s' with comment \: %2$s 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 \ No newline at end of file +vradi.template.webHarvest.title=[Vradi web] Ask to add webHarvest script +vradi.formNoteList.title=Form answers +vradi.new.formNote=New answer +vradi.formNote.title=Answer edition +vradi.formNote.close=Close this answer +vradi.delete=Delete +vradi.show=Show +vradi.formNote.seekingParetner=Seeking partners +vradi.formNote.seekPartners=Seek partners +vradi.summary=Summary +vradi.edit=Edit +vradi.save=Save +vradi.files=Files +vradi.add=Add +vradi.send=Send +vradi.addfiles.name=File name +vradi.addfiles.description=File descrition +vradi.addfiles.content=File to add +vradi.seekingPartners.title=Partner search +vradi.seekingPartners.desc=Send the request to : +vradi.seekingPartners.formReceiver=Those who received the tender +vradi.seekingPartners.seeker=Who is looking for partners for this tender +vradi.seekingPartners.partners=Partners from another answer +vradi.seekingPartners.invite=Guests +vradi.seekingPartners.inviteEmail=Guest Email (separated by \',\') +vradi.userPreference.info=Additional text to be sent in addition to the summary when applying 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-06-30 09:54:09 UTC (rev 108) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-06-30 10:15:09 UTC (rev 109) @@ -1,6 +1,10 @@ vradi.action.locale.english=Anglais vradi.action.locale.french=Français vradi.action.submit=Soumettre aux administrateurs +vradi.add=Ajouter +vradi.addfiles.content=Fichier à ajouter +vradi.addfiles.description=Descrition du fichier +vradi.addfiles.name=Nom du fichier vradi.authentification.error=Erreur lors de l'authentification vradi.config.configFileName.description=Fichier de configuration de Vradi web vradi.config.database.version.description=Version de la base de donnée @@ -8,7 +12,11 @@ vradi.config.remote.endpoint.description=Url de l'addresse de Vradi service vradi.config.ui.locale=Locale de l'instance de Vradi web vradi.config.version.description=Version de Vradi web +vradi.config.web.server.address.description=Adresse du server Vradi +vradi.delete=Suppression +vradi.edit=Edition vradi.error.internal=Une erreur interne est survenue, merci de contacter un administrateur si cette erreur persiste +vradi.files=Fichiers vradi.footer.bugreport=Rapport de bug vradi.footer.license=Licence AGPL vradi.footer.userSupport=Support utilisateur @@ -19,6 +27,11 @@ vradi.form.creationDate=Date de création vradi.form.editAction=Editer vradi.form.object=Objet +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.formView.title=Visualisation d'un formulaire vradi.login.email=Email vradi.login.password=Mot de passe @@ -26,6 +39,7 @@ vradi.login.submit=Connection vradi.login.title=Connection vradi.logout.submit=Déconnection +vradi.new.formNote=Nouvelle réponse vradi.options=Options vradi.options.comment=Commentaires vradi.options.rssUrl=Ajout d'un flux RSS @@ -40,6 +54,7 @@ vradi.register.pwdDontMatch=Les mots de passe sont différents vradi.register.submit=S'enregistrer vradi.register.title=S'enregistrer +vradi.save=Sauvegarder vradi.search.activateQuery=Activer vradi.search.formNoteEdit=Edition des notes vradi.search.link=Retour à la page de recherche @@ -49,6 +64,16 @@ vradi.search.thesaurusFilterButton=Filtrer vradi.search.title=Recherche vradi.search.unActivateQuery=Desactiver +vradi.seekingPartners.desc=Envoyer la demande à \: +vradi.seekingPartners.formReceiver=Ceux qui ont recu l'appel d'offre +vradi.seekingPartners.invite=Invités +vradi.seekingPartners.inviteEmail=Emails des invités (séparées par une ',') +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.send=Envoyer +vradi.show=Afficher +vradi.summary=Résumé vradi.template.rss=L'utilisateur %1$s à fait la demande d'ajout du flux RSS '%3$s' avec le commentaire suivant \: %2$s vradi.template.rss.title=[Vradi web] Demande d'ajout d'un flux RSS vradi.template.thesaurus.new.child=L'utilisateur %1$s à fait la demande d'ajout d'un thesaurus pour le chemin '%3$s' qui aura pour nom '%4$s' avec le commentaire suivant \: %2$s @@ -62,3 +87,4 @@ vradi.thesaurus.thesaurusRenamed=Nouveau nom du descripteur séléctionné vradi.title=Vradi Web vradi.user.noinfo= +vradi.userPreference.info=Text complémentaire à envoyer en plus de l'abstract lors de la demande Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-06-30 09:54:09 UTC (rev 108) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-06-30 10:15:09 UTC (rev 109) @@ -60,8 +60,11 @@ <div> <form id="partnersForm" action="/fragment/userInfo.action"> <s:select size="5" name="userId" list="partners" listKey="wikittyId" listValue="login"/> + <s:set id="showText"> + <s:text name="vradi.show"/> + </s:set> <sj:submit id="partnersSubmit" - value="Show" + label="%{showText}" targets="partnersInfo" indicator="indicator-partnersInfo" button="true" buttonIcon="ui-icon-gear"/> </form> @@ -70,15 +73,32 @@ </div> <s:a action="seekPartners/%{localNoteId}"><s:text name="vradi.formNote.seekPartners" /></s:a> - <s:checkbox label="seeking partners" name="formNote.seekingPartners" value="%{localSeekingPartner}" + + <s:set id="seekingPartnerText"> + <s:text name="vradi.formNote.seekingPartner"/> + </s:set> + <s:checkbox label="%{seekingPartnerText}" + name="formNote.seekingPartners" value="%{localSeekingPartner}" onchange="var url='/ajax/edit/%{localNoteId}.action?%{localFieldSeekingPartner}='+this.checked; var xhr=new XMLHttpRequest(); xhr.open('GET', url, true);xhr.send(null);"/> </div> + <s:set id="saveText"> + <s:text name="vradi.save"/> + </s:set> + + <s:set id="summaryText"> + <s:text name="vradi.summary"/> + </s:set> + + <s:set id="editText"> + <s:text name="vradi.edit"/> + </s:set> + <div> <sj:tabbedpanel id="tabContainerSummary" animate="true" collapsible="true" useSelectedTabCookie="true"> - <sj:tab id="tabHtmlSummary" target="htmlSummary" label="Summary"/> - <sj:tab id="tabHtmlSummaryEdit" target="htmlSummaryEdit" label="Edit"/> + <sj:tab id="tabHtmlSummary" target="htmlSummary" label="%{summaryText}"/> + <sj:tab id="tabHtmlSummaryEdit" target="htmlSummaryEdit" label="%{editText}"/> <sj:div id="htmlSummary" href="/ajax/rst.action?id=%{localNoteId}&field=%{localFieldSummary}" listenTopics="updateHtmlSummary"> @@ -90,7 +110,7 @@ <s:hidden name="field" value="%{localFieldSummary}"/> <s:textarea name="rst" value="%{localSummary}"/> <sj:submit id="htmlSummaryEditSubmit" - value="Save" + value="%{saveText}" targets="result" onCompleteTopics="updateHtmlSummary" indicator="indicator-htmlSummary" @@ -103,9 +123,9 @@ <div> <sj:tabbedpanel id="tabContainerContent" animate="true" collapsible="true" useSelectedTabCookie="true"> - <sj:tab id="tabHtmlContent" target="htmlContent" label="Summary"/> - <sj:tab id="tabHtmlContentEdit" target="htmlContentEdit" label="Edit"/> - <div id="htmlContent" > + <sj:tab id="tabHtmlContent" target="htmlContent" label="%{summaryText}"/> + <sj:tab id="tabHtmlContentEdit" target="htmlContentEdit" label="%{editText}"/> + <div id="htmlContent"> <img id="indicator-htmlContent" src="/img/indicator.gif" alt="Loading..." style="display:none"/> <%=action.getContent()%> </div> @@ -115,8 +135,9 @@ <s:hidden name="field" value="%{localFieldSummary}"/> <s:textarea name="content" value="%{localContent}"/> <sj:submit id="htmlContentEditSubmit" formIds="htmlContentEditForm" - value="Save" - targets="htmlContent" indicator="indicator-htmlContent" + value="%{saveText}" + targets="htmlContent" + indicator="indicator-htmlContent" button="true" buttonIcon="ui-icon-gear"/> </form> </div> @@ -126,8 +147,16 @@ <div> <sj:tabbedpanel id="tabContainerFiles" animate="true" collapsible="true" useSelectedTabCookie="true"> - <sj:tab id="tabFiles" target="files" label="Files"/> - <sj:tab id="tabAddFiles" target="addFiles" label="Add"/> + <s:set id="filesText"> + <s:text name="vradi.files"/> + </s:set> + + <s:set id="addText"> + <s:text name="vradi.add"/> + </s:set> + + <sj:tab id="tabFiles" target="files" label="%{filesText}"/> + <sj:tab id="tabAddFiles" target="addFiles" label="%{addText}"/> <div id="files"> <sj:div href="/fragment/attachmentList/%{localNoteId}.action" indicator="indicator-files"> @@ -141,7 +170,7 @@ <s:textarea name="description" key="vradi.addfiles.description"/> <s:file name="content" key="vradi.addfiles.content" required="true"/> <sj:submit id="addFilesSubmit" formIds="addFilesForm" - value="Save" + value="%{saveText}" targets="files" onCompleteTopics="" indicator="indicator-addFiles" button="true" buttonIcon="ui-icon-gear"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-06-30 09:54:09 UTC (rev 108) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-06-30 10:15:09 UTC (rev 109) @@ -36,11 +36,15 @@ <s:checkbox name="seeker" key="vradi.seekingPartners.seeker"/> <s:checkbox name="partners" key="vradi.seekingPartners.partners"/> <s:select size="5" multiple="true" name="userId" list="%{localPartners}" listKey="wikittyId" listValue="login"/> + + <s:set id="showText"> + <s:text name="vradi.show"/> + </s:set> <sj:submit id="partnersShowSubmit" href="/fragment/partnerInfo.action" targets="partnersShowResult" - value="Show" + value="%{showText}" indicator="indicator-partnersShowResult" button="true" /> @@ -53,6 +57,10 @@ <s:textarea name="message" value="%{localNoteSummary}" key="vradi.userPreference.info"/> + <s:set id="sendText"> + <s:text name="vradi.send"/> + </s:set> + <s:submit value="%{sendText}"/> </s:form> </body> </html>

1 0