svnno****@sourc*****
svnno****@sourc*****
2008年 11月 20日 (木) 22:27:01 JST
Revision: 1387
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1387
Author: shinsuke
Date: 2008-11-20 22:27:01 +0900 (Thu, 20 Nov 2008)
Log Message:
-----------
added a search form.
Modified Paths:
--------------
scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/admin/facility/FacilityAction.java
scheduler/trunk/src/main/java/jp/sf/pal/scheduler/common/dxo/PagerDxo.java
scheduler/trunk/src/main/java/jp/sf/pal/scheduler/pager/FacilityGroupPager.java
scheduler/trunk/src/main/java/jp/sf/pal/scheduler/pager/FacilityPager.java
scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityService.java
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp
-------------- next part --------------
Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/admin/facility/FacilityAction.java
===================================================================
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/admin/facility/FacilityAction.java 2008-11-20 13:26:19 UTC (rev 1386)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/admin/facility/FacilityAction.java 2008-11-20 13:27:01 UTC (rev 1387)
@@ -55,8 +55,7 @@
facilityItems = facilityService.getFacilityList(facilityPager);
// restore from pager
- // facilityForm.facilityname =
- // facilityPager.getFacilityname();
+ pagerDxo.convertFromPagerToForm(facilityPager, facilityForm);
return "index.jsp";
}
@@ -77,9 +76,7 @@
@Execute(validator = false, input = "error.jsp")
public String search() {
- // facilityPager.setFacilityname(facilityForm.
- // facilityname);
-
+ pagerDxo.convertFromFormToPager(facilityForm, facilityPager);
return displayList();
}
Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/common/dxo/PagerDxo.java
===================================================================
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/common/dxo/PagerDxo.java 2008-11-20 13:26:19 UTC (rev 1386)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/common/dxo/PagerDxo.java 2008-11-20 13:27:01 UTC (rev 1387)
@@ -5,6 +5,8 @@
import jp.sf.pal.scheduler.common.form.PagingResultForm;
import jp.sf.pal.scheduler.common.pager.DefaultPager;
import jp.sf.pal.scheduler.common.util.PagingResultBeanWrapper;
+import jp.sf.pal.scheduler.form.admin.facility.FacilityForm;
+import jp.sf.pal.scheduler.pager.FacilityPager;
import org.seasar.extension.dxo.annotation.ConversionRule;
import org.seasar.extension.dxo.annotation.ExcludeNull;
@@ -21,4 +23,12 @@
@ConversionRule(// "pageSize : pageSize, " +
"currentPageNumber : pageNumber")
public void convert(PagingResultForm page, DefaultPager pager);
+
+ @ConversionRule(//
+ "groupId : groupId")
+ public void convertFromFormToPager(FacilityForm form, FacilityPager pager);
+
+ @ConversionRule(//
+ "groupId : groupId")
+ public void convertFromPagerToForm(FacilityPager pager, FacilityForm form);
}
Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/pager/FacilityGroupPager.java
===================================================================
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/pager/FacilityGroupPager.java 2008-11-20 13:26:19 UTC (rev 1386)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/pager/FacilityGroupPager.java 2008-11-20 13:27:01 UTC (rev 1387)
@@ -15,7 +15,7 @@
}
protected int getDefaultPageSize() {
- return 3;
+ return 20;
}
}
Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/pager/FacilityPager.java
===================================================================
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/pager/FacilityPager.java 2008-11-20 13:26:19 UTC (rev 1386)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/pager/FacilityPager.java 2008-11-20 13:27:01 UTC (rev 1387)
@@ -6,16 +6,27 @@
private static final long serialVersionUID = -8738042204895427884L;
+ private Integer groupId;
+
public FacilityPager() {
-
+ groupId = null;
}
public void clear() {
super.clear();
+ groupId = null;
}
protected int getDefaultPageSize() {
- return 50;
+ return 20;
}
+ public Integer getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(Integer groupId) {
+ this.groupId = groupId;
+ }
+
}
Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityService.java
===================================================================
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityService.java 2008-11-20 13:26:19 UTC (rev 1386)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/FacilityService.java 2008-11-20 13:27:01 UTC (rev 1387)
@@ -39,6 +39,9 @@
// setup
cb.query().setDeletedBy_IsNull();
+ if (facilityPager.getGroupId() != null) {
+ cb.query().setGroupId_Equal(facilityPager.getGroupId());
+ }
cb.query().addOrderBy_SortOrder_Asc();
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp 2008-11-20 13:26:19 UTC (rev 1386)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp 2008-11-20 13:27:01 UTC (rev 1387)
@@ -20,6 +20,29 @@
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
+<div class="form-table" style="margin-top:3px;">
+<s:form>
+<table>
+ <tbody>
+ <tr>
+ <th>Group</th>
+ <td>
+<html:select property="groupId">
+<option value="">----</option>
+ <c:forEach var="fg" varStatus="s" items="${facilityGroupItems}">
+ <html:option value="${f:u(fg.id)}">${f:h(fg.name)}</html:option>
+ </c:forEach>
+</html:select>
+ </td>
+ <td>
+<input type="submit" name="search" value="Search"/>
+<input type="submit" name="reset" value="Reset"/>
+ </td>
+ </tr>
+ </tbody>
+</table>
+</s:form>
+</div>
<div class="list-table" style="margin-top:3px;">
<div>
<s:link href="createpage">Create New</s:link>