Update of
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
In directory
james.mmbase.org:/tmp/cvs-serv16728/tasks/src/webapp/editors/taskmanagement
Modified Files:
tasklist.jsp tasklist_table.jspf
Log Message:
CMSC-1041 In the task list screen an user should be able to filter which tasks
are shown
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
See also: http://www.mmbase.org/jira/browse/CMSC-1041
Index: tasklist.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tasklist.jsp 30 Mar 2009 08:25:00 -0000 1.10
+++ tasklist.jsp 31 Mar 2009 05:01:51 -0000 1.11
@@ -6,16 +6,19 @@
<cmscedit:head title="tasks.title" />
<body>
<c:choose>
- <c:when test="${requestScope.taskShowType eq
'task.showtype.assignedtome'}">
+ <c:when test="${param.taskShowType eq 'task.showtype.assignedtome'}">
<c:set var="tmpRole">assignedrel</c:set>
</c:when>
- <c:when test="${requestScope.taskShowType eq
'task.showtype.createdbyme'}">
+ <c:when test="${param.taskShowType eq 'task.showtype.createdbyme'}">
<c:set var="tmpRole">creatorrel</c:set>
</c:when>
<c:otherwise>
<c:set var="tmpRole"></c:set>
</c:otherwise>
</c:choose>
+ <c:if test="${param.showFinishedTask eq 'yes'}">
+ <c:set var="status">task.status.done</c:set>
+ </c:if>
<mm:cloud jspvar="cloud" loginpage="../login.jsp">
<mm:cloudinfo type="user" id="cloudusername" write="false" />
Index: tasklist_table.jspf
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist_table.jspf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tasklist_table.jspf 30 Mar 2009 08:22:44 -0000 1.2
+++ tasklist_table.jspf 31 Mar 2009 05:01:51 -0000 1.3
@@ -1,9 +1,19 @@
<mm:listnodescontainer type="user">
- <mm:constraint field="user.username" operator="EQUAL"
referid="cloudusername" />
+ <mm:constraint field="user.username" operator="EQUAL"
+ referid="cloudusername" />
<mm:maxnumber value="10" />
<mm:listnodes>
- <mm:relatednodescontainer type="task" role="${tmpRole}"
searchdirs="source">
- <mm:relatednodes
comparator="com.finalist.cmsc.tasks.TaskUrgencyComparator"
max="${dashboardTaskSize}" id="resultList" />
+ <mm:relatednodescontainer type="task" role="${tmpRole}"
+ searchdirs="source">
+ <mm:present referid="status">
+ <mm:constraint field="status" value="${status}"
operator="EQUAL" />
+ </mm:present>
+ <mm:notpresent referid="status">
+ <mm:constraint field="status"
value="task.status.done" operator="EQUAL" inverse="true"/>
+ </mm:notpresent>
+ <mm:relatednodes
+
comparator="com.finalist.cmsc.tasks.TaskUrgencyComparator"
+ max="${dashboardTaskSize}" id="resultList" />
</mm:relatednodescontainer>
</mm:listnodes>
</mm:listnodescontainer>
@@ -105,11 +115,12 @@
<c:if test="${empty dashboardTaskSize}">
<html:form action="/editors/taskmanagement/showTaskAction">
- <html:select property="taskShowType"
value="${requestScope.taskShowType}">
+ <html:select property="taskShowType" >
<html:option value="task.showtype.alltasks" bundle="TASKS"
key="task.showtype.alltasks"/>
<html:option value="task.showtype.assignedtome" bundle="TASKS"
key="task.showtype.assignedtome"/>
<html:option value="task.showtype.createdbyme" bundle="TASKS"
key="task.showtype.createdbyme"/>
- </html:select>
+ </html:select>
+ <html:checkbox property="showFinishedTask"
value="yes"/><fmt:message key="task.show.finished"/>
<html:submit><bean:message bundle="TASKS"
key="task.showtype.submit"/></html:submit>
</html:form>
</c:if>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
