Update of
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
In directory
james.mmbase.org:/tmp/cvs-serv3637/tasks/src/webapp/editors/taskmanagement
Modified Files:
tasklist.jsp
Added Files:
tasklist_table.jspf
Log Message:
CMSC-241 Show top 5 most urgent tasks 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
tasklist_table.jspf is new
Index: tasklist.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tasklist.jsp 25 Mar 2009 09:40:48 -0000 1.7
+++ tasklist.jsp 26 Mar 2009 07:17:44 -0000 1.8
@@ -16,8 +16,10 @@
<c:set var="tmpRole"></c:set>
</c:otherwise>
</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" />
@@ -29,81 +31,11 @@
</p>
<mm:listnodes>
<mm:relatednodescontainer type="task" role="${tmpRole}"
searchdirs="source">
- <table>
- <thead>
- <tr>
- <th><fmt:message key="task.created" /></th>
- <th><fmt:message key="task.deadline" /></th>
- <th><fmt:message key="task.title" /></th>
- <th><fmt:message key="task.status" /></th>
- <th><fmt:message key="task.contenttitle" /></th>
- <th><fmt:message key="task.nodetype" /></th>
- <th><fmt:message key="task.description" /></th>
- </tr>
- </thead>
- <tbody class="hover">
- <c:set var="taskList" value="" /><c:set
var="isSwapClass" value="true"/>
- <mm:relatednodes
comparator="com.finalist.cmsc.tasks.TaskUrgencyComparator">
- <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>>
- <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>
- <td><mm:field name="title"/></td>
- <c:set var="elementtitel"><mm:field
name="title"/></c:set>
- <c:set var="elementnumber"/>
- <c:set var="elementtype"/>
- <mm:relatednodescontainer type="contentelement"
role="taskrel" searchdirs="destination">
- <mm:maxnumber value="1" />
- <mm:relatednodes>
- <c:set var="elementtitel"><mm:field
name="title"/></c:set>
- <c:set var="elementnumber"><mm:field
name="number"/></c:set>
- <c:set var="elementtype"><mm:field
name="number"><mm:isnotempty><mm:nodeinfo
type="guitype"/></mm:isnotempty></mm:field></c:set>
- </mm:relatednodes>
- </mm:relatednodescontainer>
- <c:set var="status"><mm:field name="status"
/></c:set>
- <td><fmt:message key="${status}" /></td>
- <td>
- <c:choose>
- <c:when test="${empty elementnumber}">
- <fmt:message key="task.noelement"/>
- </c:when>
- <c:otherwise>
- <mm:hasrank minvalue="basic user">
- <mm:url
page="/editors/taskmanagement/tasklist.jsp" id="returnTasklist" write="false" />
- <a href="<mm:url
page="../WizardInitAction.do">
- <mm:param name="objectnumber"
value="${elementnumber}"/>
- <mm:param name="returnurl"
value="${returnTasklist}"/>
- </mm:url>"
target="rightpane"><img src="../gfx/icons/edit.png" align="top"
alt="<fmt:message key="task.editelement"/>" title="<fmt:message
key="task.editelement"/>"/></a> ${elementtitel}
- </mm:hasrank>
- </c:otherwise>
- </c:choose>
- </td>
- <td>${elementtype}</td>
- <td>
- <mm:hasrank minvalue="basic user">
- <mm:field name="number" jspvar="number"
write="false"/>
- <mm:url
page="/editors/taskmanagement/tasklist.jsp" id="returnTaskedit" write="false" />
- <a href="<mm:url
page="/editors/WizardInitAction.do">
- <mm:param name="objectnumber"
value="${number}"/>
- <mm:param name="contenttype"
value="task"/>
- <mm:param name="returnurl"
value="${returnTaskedit}"/>
- </mm:url>" target="rightpane"><img
src="../gfx/icons/edit2.png" align="top" alt="<fmt:message key="task.edit"/>"
title="<fmt:message key="task.edit"/>"/></a> <mm:field name="description" />
- </mm:hasrank>
- </td>
- </tr>
- <c:set var="taskList">${taskList},${taskId}</c:set>
- <c:choose>
- <c:when test="${isSwapClass eq 'false'}"><c:set
var="isSwapClass" value="true"/></c:when>
- <c:when test="${isSwapClass eq 'true'}"><c:set
var="isSwapClass" value="false"/></c:when>
- </c:choose>
- </c:if>
- </mm:relatednodes>
- </tbody>
- </table>
+ <%@ 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"/>
@@ -112,6 +44,7 @@
</html:select>
<html:submit><bean:message bundle="TASKS"
key="task.showtype.submit"/></html:submit>
</html:form>
+
</cmscedit:contentblock>
</mm:cloud>
</body>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
