Author: tchemit Date: 2012-03-30 18:43:51 +0200 (Fri, 30 Mar 2012) New Revision: 459 Url: http://forge.codelutin.com/repositories/revision/echobase/459 Log: fixes #1053: Ajouter le filtre de recherche sur le table de journal de la base Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2012-03-29 22:54:10 UTC (rev 458) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2012-03-30 16:43:51 UTC (rev 459) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.ui.actions; +import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.json.JSONException; import org.apache.struts2.json.JSONUtil; @@ -59,6 +60,12 @@ protected String filters; + protected String searchField; + + protected String searchString; + + protected String searchOper; + public void setRows(Integer rows) { pager.setPageSize(rows); } @@ -91,6 +98,18 @@ this.filters = filters; } + public void setSearchField(String searchField) { + this.searchField = searchField; + } + + public void setSearchString(String searchString) { + this.searchString = searchString; + } + + public void setSearchOper(String searchOper) { + this.searchOper = searchOper; + } + protected String getSortColumn() { String result = null; if (useSort()) { @@ -124,6 +143,22 @@ FilterPagerUtil.newFilterPagerBeanBuilder(groupOp). addOperations(rules). flush(pager); + } else { + + // could be a single search + + if (StringUtils.isNotEmpty(searchField)) { + + Map<String, String> rule = Maps.newTreeMap(); + rule.put("op", searchOper); + rule.put("field", searchField); + rule.put("data", searchString); + FilterPagerUtil.newFilterPagerBeanBuilder("AND"). + addRule(rule). + flush(pager); + } } + + } } Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-03-29 22:54:10 UTC (rev 458) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-03-30 16:43:51 UTC (rev 459) @@ -28,7 +28,6 @@ <script type="text/javascript" src="<s:url value='/js/gridHelper.js' />"></script> -<s:url id="reloadUrl" action="dbeditor" namespace="/dbeditor"/> <s:url id="getTableData" action="getTableData" namespace="/dbeditor"/> <s:set name="tableSelected" value="%{entityType != null}"/> @@ -52,8 +51,8 @@ // on table name change, let's reload reload this page $('[name="entityType"]').change(function (event) { - var url = "${reloadUrl}?" + $.param({entityType:this.value}); - window.location = url; + window.location = '<s:url action="dbeditor" namespace="/dbeditor"/>?' + + $.param({entityType:this.value}); }); // on reset let's just reload the selected row @@ -247,7 +246,6 @@ value="%{getText('echobase.common.tableDatas', entityTypes[entityType])}"/> <sjg:grid id="datas" dataType="json" href="%{loadUrl}" gridModel="datas" - caption="%{tableI18nName}" pager="true" pagerButtons="true" pagerInput="true" navigator="true" autowidth="true" rownumbers="false" viewrecords="true" navigatorEdit="false" navigatorSearch="true" @@ -377,3 +375,15 @@ </s:if> +<script type="text/javascript"> + + jQuery(document).ready(function () { + + <s:if test="admin"> + $('#tab_importForm > a').click(); + </s:if> + <s:else> + $('#tab_exportForm > a').click(); + </s:else> + }); +</script> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2012-03-29 22:54:10 UTC (rev 458) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2012-03-30 16:43:51 UTC (rev 459) @@ -26,17 +26,16 @@ <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> <script type="text/javascript" src="<s:url value='/js/gridHelper.js' />"></script> -<s:set var="emptySelection"><s:text name="echobase.message.noEntrySelection"/></s:set> +<s:set var="emptySelection"><s:text + name="echobase.message.noEntrySelection"/></s:set> <script type="text/javascript"> jQuery(document).ready(function () { - $.addRowSelectTopic('datas', function(event){ + $.addRowSelectTopic('datas', function (event) { var text = $("tr[aria-selected=true] td[aria-describedby='datas_modificationText']").text(); - console.info("New selection = "+text); $('#modificationTextContainter').html(text); }); - $.addClearSelectTopic('datas', function(event){ - console.info("Clear selection = "); + $.addClearSelectTopic('datas', function (event) { $('#modificationTextContainter').html("${emptySelection}"); }); $.addEvenAndOddClasses('datas'); @@ -48,14 +47,14 @@ escapeAmp="false"/> <sjg:grid id="datas" dataType="json" href="%{loadUrl}" gridModel="datas" - caption="%{getText('echobase.common.entityModificationLog')}" pager="true" pagerButtons="true" pagerInput="true" navigator="true" autowidth="true" rownumbers="false" viewrecords="true" - navigatorEdit="false" navigatorSearch="false" + navigatorEdit="false" navigatorSearch="true" navigatorDelete="false" navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" onSelectRowTopics='datas-rowSelect' - onCompleteTopics="datas-clearSelect,datas-CompleteTopics"> + onCompleteTopics="datas-clearSelect,datas-CompleteTopics" + navigatorSearchOptions="{multipleGroup:false,multipleSearch:false,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn']}"> <sjg:gridColumn name="entityType" sortable="true" title="%{getText('echobase.common.entityType')}"/>