Update of
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
In directory
james.mmbase.org:/tmp/cvs-serv8011/tasks/src/webapp/editors/taskmanagement
Modified Files:
tasklist.jsp tasklist_table.jspf
Log Message:
CMSC-241 Show top 5 most urgent tasks on dashboard
If a user does not have any tasks, the title and table should be gone on
dashboard.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
See also: http://www.mmbase.org/jira/browse/CMSC-241
Index: tasklist.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tasklist.jsp 26 Mar 2009 07:17:44 -0000 1.8
+++ tasklist.jsp 30 Mar 2009 08:22:44 -0000 1.9
@@ -18,34 +18,9 @@
</c:choose>
<mm:cloud jspvar="cloud" loginpage="../login.jsp">
- <cmscedit:contentblock title="tasks.title"
titleClass="content_block_pink" bodyClass="body_table">
-
<mm:cloudinfo type="user" id="cloudusername" write="false" />
- <mm:listnodescontainer type="user">
- <mm:constraint field="user.username" operator="EQUAL"
referid="cloudusername" />
- <mm:maxnumber value="10" />
- <p style="font-size:12px; padding-left:10px;">
- <html:messages id="createSuccess" message="true" bundle="TASKS">
- <bean:write name="createSuccess"/>
- </html:messages>
- </p>
- <mm:listnodes>
- <mm:relatednodescontainer type="task" role="${tmpRole}"
searchdirs="source">
+ <c:set var="dashboardTaskTitle">tasks.title</c:set>
<%@ include file="tasklist_table.jspf"%>
- </mm:relatednodescontainer>
- </mm:listnodes>
- </mm:listnodescontainer>
-
- <html:form action="/editors/taskmanagement/showTaskAction">
- <html:select property="taskShowType"
value="${requestScope.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:submit><bean:message bundle="TASKS"
key="task.showtype.submit"/></html:submit>
- </html:form>
-
- </cmscedit:contentblock>
</mm:cloud>
</body>
</html:html>
Index: tasklist_table.jspf
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist_table.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tasklist_table.jspf 26 Mar 2009 07:17:44 -0000 1.1
+++ tasklist_table.jspf 30 Mar 2009 08:22:44 -0000 1.2
@@ -1,4 +1,25 @@
-<table>
+<mm:listnodescontainer type="user">
+ <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>
+ </mm:listnodes>
+</mm:listnodescontainer>
+
+<c:if test="${(empty dashboardTaskSize) or (not empty resultList)}">
+<cmscedit:contentblock title="${dashboardTaskTitle}" titleMode="plain"
titleClass="content_block_pink" bodyClass="body_table">
+
+ <c:if test="${empty dashboardTaskSize}">
+ <p style="font-size:12px; padding-left:10px;">
+ <html:messages id="createSuccess" message="true"
bundle="TASKS">
+ <bean:write name="createSuccess"/>
+ </html:messages>
+ </p>
+ </c:if>
+
+ <table>
<thead>
<tr>
<th><fmt:message key="task.created" /></th>
@@ -11,8 +32,9 @@
</tr>
</thead>
<tbody class="hover">
- <c:set var="taskList" value="" /><c:set var="isSwapClass" value="true"/>
- <mm:relatednodes
comparator="com.finalist.cmsc.tasks.TaskUrgencyComparator"
max="${dashboardTaskSize}">
+ <c:set var="taskList" value="" />
+ <c:set var="isSwapClass" value="true"/>
+ <mm:listnodes referid="resultList">
<c:set var="taskId"><mm:field name="number"/></c:set>
<c:if test="${not fn:contains(taskList, taskId)}">
<tr <c:if test="${isSwapClass}">class="swap"</c:if>>
@@ -77,6 +99,20 @@
<c:when test="${isSwapClass eq 'true'}"><c:set var="isSwapClass"
value="false"/></c:when>
</c:choose>
</c:if>
- </mm:relatednodes>
+ </mm:listnodes>
</tbody>
-</table>
\ No newline at end of file
+ </table>
+
+ <c:if test="${empty dashboardTaskSize}">
+ <html:form action="/editors/taskmanagement/showTaskAction">
+ <html:select property="taskShowType"
value="${requestScope.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:submit><bean:message bundle="TASKS"
key="task.showtype.submit"/></html:submit>
+ </html:form>
+ </c:if>
+
+</cmscedit:contentblock>
+</c:if>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
