OSDN > Finden Software > Internet > WWW/HTTP > Site Management > Portal Application Laboratory > SCM > SVN > Commit

Portal Application Laboratory

pal: Commit

added search form.

--- todolist/trunk/src/main/java/jp/sf/pal/todolist/service/TodoService.java (revision 1655)

+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/service/TodoService.java (revision 1656)

		@@ -66,6 +66,17 @@
66	66	cb.setupSelect_Todo().withUserInfo(); // TODO use specify*
67	67	cb.setupSelect_UserInfo(); // TODO use specify*
68	68
	69	+ if (todoPager.getStatus() != null) {
	70	+ if (todoPager.getStatus() == ToDoListConstants.NOT_COMPLETED) {
	71	+ cb.query().setStatus_NotEqual(ToDoListConstants.COMPLETED);
	72	+ } else if (todoPager.getStatus() == ToDoListConstants.COMPLETED_ALL) {
	73	+ cb.query().queryTodo().setStatus_Equal(
	74	+ ToDoListConstants.COMPLETED);
	75	+ } else {
	76	+ cb.query().setStatus_Equal(todoPager.getStatus());
	77	+ }
	78	+ }
	79	+
69	80	cb.query().setDeletedBy_IsNull();
70	81	if (userId != null) {
71	82	cb.query().setUserId_Equal(userId);

--- todolist/trunk/src/main/java/jp/sf/pal/todolist/form/user/TodoForm.java (revision 1655)

+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/form/user/TodoForm.java (revision 1656)

		@@ -119,6 +119,9 @@
119	119	@IntegerType
120	120	public String pageNumber;
121	121
	122	+ @IntegerType
	123	+ public String statusForSearch;
	124	+
122	125	public void initialize() {
123	126	id = null;
124	127	status = "1";

		@@ -145,6 +148,7 @@
145	148	updatedByForTodo = null;
146	149	deletedTimeForTodo = null;
147	150	deletedByForTodo = null;
	151	+ statusForSearch = null;
148	152	}
149	153
150	154	public void setStartDateForTodo(String value) {

--- todolist/trunk/src/main/java/jp/sf/pal/todolist/action/user/TodoAction.java (revision 1655)

+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/action/user/TodoAction.java (revision 1656)

		@@ -63,7 +63,11 @@
63	63	todoMappingItems = todoService.getTodoMappingList(todoPager, userId);
64	64
65	65	// restore from pager
66		- // todoForm.todoname = todoPager.getGroupInfoname();
	66	+ if (todoPager.getStatus() != null) {
	67	+ todoForm.statusForSearch = todoPager.getStatus().toString();
	68	+ } else {
	69	+ todoForm.statusForSearch = null;
	70	+ }
67	71
68	72	return "index.jsp";
69	73	}

		@@ -84,7 +88,11 @@
84	88
85	89	@Execute(validator = false, input = "error.jsp")
86	90	public String search() {
87		- // todoPager.setGroupInfoname(todoForm.todoname);
	91	+ if (!StringUtils.isEmpty(todoForm.statusForSearch)) {
	92	+ todoPager.setStatus(Integer.parseInt(todoForm.statusForSearch));
	93	+ } else {
	94	+ todoPager.setStatus(null);
	95	+ }
88	96
89	97	return displayList();
90	98	}

--- todolist/trunk/src/main/java/jp/sf/pal/todolist/ToDoListConstants.java (revision 1655)

+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/ToDoListConstants.java (revision 1656)

		@@ -8,6 +8,10 @@
8	8
9	9	public static final int COMPLETED = 10;
10	10
	11	+ public static final int COMPLETED_ALL = 100;
	12	+
	13	+ public static final int NOT_COMPLETED = -1;
	14	+
11	15	public static final int DELETE_MAPPING_MODE = 5;
12	16
13	17	public static final String GUEST_NAME = "guest";

		@@ -1,5 +1,6 @@
1	1	package jp.sf.pal.todolist.pager;
2	2
	3	+import jp.sf.pal.todolist.ToDoListConstants;
3	4	import jp.sf.pal.todolist.common.pager.DefaultPager;
4	5
5	6	public class TodoPager extends DefaultPager {

		@@ -29,4 +34,12 @@
29	34	this.categoryId = categoryId;
30	35	}
31	36
	37	+ public Integer getStatus() {
	38	+ return status;
	39	+ }
	40	+
	41	+ public void setStatus(Integer status) {
	42	+ this.status = status;
	43	+ }
	44	+
32	45	}

		@@ -8,13 +9,17 @@
8	9
9	10	private Long categoryId;
10	11
	12	+ private Integer status;
	13	+
11	14	public TodoPager() {
12	15	categoryId = null;
	16	+ status = ToDoListConstants.NOT_COMPLETED;
13	17	}
14	18
15	19	public void clear() {
16	20	super.clear();
17	21	categoryId = null;
	22	+ status = ToDoListConstants.NOT_COMPLETED;
18	23	}
19	24
20	25	protected int getDefaultPageSize() {