Author: sletellier Date: 2011-06-08 18:45:16 +0200 (Wed, 08 Jun 2011) New Revision: 86 Url: http://chorem.org/repositories/revision/vradi/86 Log: - Add * after thesaurus filter - Display tree as list on filter - Add nb forms to display selection - Add thesaurus:descrition in search on thesaurus selection Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java 2011-06-07 20:10:36 UTC (rev 85) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java 2011-06-08 16:45:16 UTC (rev 86) @@ -19,7 +19,6 @@ protected static final Log log = LogFactory.getLog(FormPaginatedList.class); - public static final int NB_FORMS_TO_SHOW = 100; public static final String DISPLAY_URL_PAGE = "page"; public static final String DISPLAY_URL_SORT = "sort"; public static final String DISPLAY_URL_DIR = "dir"; @@ -27,10 +26,10 @@ protected FormPagedResult result; protected WikittyProxy proxy; - public FormPaginatedList(WikittyProxy proxy) { + public FormPaginatedList(WikittyProxy proxy, int nbForms) { this.proxy = proxy; result = new FormPagedResult(); - result.setNbFormsToShow(NB_FORMS_TO_SHOW); + result.setNbFormsToShow(nbForms); result.setPageToShow(1); // Sort by default by fate descending 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-07 20:10:36 UTC (rev 85) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-06-08 16:45:16 UTC (rev 86) @@ -26,6 +26,9 @@ private static final long serialVersionUID = -3735250067223062719L; public static final String REQUEST_ATTRIBUTE_FORMS = "forms"; + private static final int DEFAULT_NB_FORMS = 10; + + protected int nbForms = DEFAULT_NB_FORMS; protected String query; protected String queryName; protected HttpServletRequest request; @@ -36,6 +39,14 @@ protected String switchUserQueryActivation; protected String saveRequest; + public int getNbForms() { + return nbForms; + } + + public void setNbForms(int nbForms) { + this.nbForms = nbForms; + } + public String getSaveRequest() { return saveRequest; } @@ -96,7 +107,7 @@ if (doSwithUserQueryActivation) { queryActive = getVradiSession().getDataService().switchUserQueryActivation(user, queryName, query); } - FormPaginatedList paginatedList = new FormPaginatedList(getProxy()); + FormPaginatedList paginatedList = new FormPaginatedList(getProxy(), getNbForms()); // Retrive paginatedList and fill by request params paginatedList.fromRequest(request); Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java 2011-06-07 20:10:36 UTC (rev 85) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ThesaurusAction.java 2011-06-08 16:45:16 UTC (rev 86) @@ -60,10 +60,13 @@ } else { // Build search with thesaurus name restriction - Search search = Search.query().eq(Thesaurus.FQ_FIELD_WIKITTYTREENODE_PARENT, id); + Search search = Search.query(); if (!StringUtils.isEmpty(thesaurusNameRequest)) { - search.like(Thesaurus.FQ_FIELD_WIKITTYTREENODE_NAME, - thesaurusNameRequest, Like.SearchAs.ToLowerCase); + search.eq(Thesaurus.FQ_FIELD_THESAURUS_ROOTTHESAURUS, id) + .like(Thesaurus.FQ_FIELD_WIKITTYTREENODE_NAME, + thesaurusNameRequest + "*", Like.SearchAs.ToLowerCase); + } else { + search.eq(Thesaurus.FQ_FIELD_WIKITTYTREENODE_PARENT, id); } PagedResult<Thesaurus> children = getProxy().findAllByCriteria(Thesaurus.class, search.criteria()); 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-07 20:10:36 UTC (rev 85) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-06-08 16:45:16 UTC (rev 86) @@ -18,7 +18,21 @@ <script type="text/javascript"> $.subscribe('treeClicked', function(event, data) { var item = event.originalEvent.data.rslt.obj; - $('#searchArea')[0].innerHTML += item.text().trim(); + var parent = item.parentsUntil(".jstree", "li"); + var finalName; + var parentName = parent.text(); + if (parentName.length == 0) { + finalName = item.children("a").text() + ":*"; + } else { + var rootName; + while (parentName.length > 0) { + rootName = parent.children("a").text(); + parent = parent.parentsUntil(".jstree", "li"); + parentName = parent.text(); + } + finalName = rootName + ":\"" + item.text().trim() + "\""; + } + $('#searchArea')[0].innerHTML += finalName.trim(); }); function updateThesaurus() { @@ -43,7 +57,7 @@ <body> <div> <div id="thesaurusPanel" class="left"> - <textfield id="thesaurusNameRequestArea"/> + <input type="text" id="thesaurusNameRequestArea"/> <s:set id="thesaurusFilterButtonText"> <s:text name="vradi.search.thesaurusFilterButton"/> </s:set> @@ -85,6 +99,13 @@ </s:else> </br> <s:submit key="vradi.search.submit" name="search"/> + <s:select label="nbForms" + name="nbForms" + headerKey="10" + headerValue="10" + list="#{100:'100',1000:'1000'}" + value="nbForms" + required="true"/> </div> </s:form> </div> @@ -97,14 +118,14 @@ <displaytag:column titleKey="vradi.form.creationDate" property="<%=Infogene.FIELD_INFOGENE_CREATIONDATE%>" sortable="true" - href="<%="formView/" + ((Form)f).getWikittyId() + ".action"%>" + href='<%=f == null ? null : "formView/" + ((Form)f).getWikittyId() + ".action"%>' sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%>" decorator="<%=DateFormatColumnDecorator.class.getName()%>"/> <displaytag:column titleKey="vradi.form.object" property="<%=Infogene.FIELD_INFOGENE_OBJET%>" sortable="true" - href="<%="formView/" + ((Form)f).getWikittyId() + ".action"%>" + href='<%=f == null ? null : "formView/" + ((Form)f).getWikittyId() + ".action"%>' sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_OBJET%>" decorator="<%=EscapeScriptColomnDecorator.class.getName()%>"/>