Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors
In directory
james.mmbase.org:/tmp/cvs-serv3328/cmsc/edit-webapp/src/webapp/editors
Modified Files:
dashboard.jsp
Log Message:
CMSC-241 Show top 5 most urgent tasks on dashboard
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors
See also: http://www.mmbase.org/jira/browse/CMSC-241
Index: dashboard.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/dashboard.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- dashboard.jsp 25 Mar 2009 02:18:04 -0000 1.15
+++ dashboard.jsp 25 Mar 2009 02:45:15 -0000 1.16
@@ -17,7 +17,7 @@
status1.equals(NOTIFIED) && status2.equals(NOTIFIED) ||
status1.equals(DONE) && status2.equals(DONE)) {
- return 0;
+ return ((org.mmbase.bridge.Node)
o1).getStringValue("deadline").compareTo(((org.mmbase.bridge.Node)
o2).getStringValue("deadline"));
}
else if (status1.equals(INIT) && status2.equals(NOTIFIED) ||
status1.equals(INIT) && status2.equals(DONE) ||
@@ -132,7 +132,6 @@
<mm:maxnumber value="10" />
<mm:listnodes>
<mm:relatednodescontainer type="task" role="${tmpRole}"
searchdirs="source">
- <mm:maxnumber value="${dashboardTaskSize}" />
<table>
<thead>
<tr>
@@ -147,9 +146,9 @@
</thead>
<tbody class="hover">
<c:set var="taskList" value="" /><c:set var="isSwapClass"
value="true"/>
- <mm:relatednodes comparator="StatusComparator">
+ <mm:relatednodes comparator="StatusComparator"
max="${dashboardTaskSize}">
<c:set var="taskId"><mm:field name="number"/></c:set>
- <c:if test="${not fn:contains(taskList, taskId) and
fn:length(taskList) le dashboardTaskSize}">
+ <c:if test="${not fn:contains(taskList, taskId)}">
<tr <c:if test="${isSwapClass}">class="swap"</c:if>>
<td><mm:field name="creationdate"
id="created"><mm:time time="${created}" format="d/M/yyyy HH:mm"
/></mm:field></td>
<td><mm:field name="deadline" id="deadl"><mm:time
time="${deadl}" format="d/M/yyyy HH:mm"/></mm:field></td>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
