From 3f307a53e80c654ae4d3f6ab8a3cd8ff91aa7883 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Tue, 15 Aug 2006 15:51:50 +0000
Subject: [PATCH] Added completed work item dashlet and removed temporary one

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/messages/webclient.properties |   4 +
 config/alfresco/web-client-config.xml         |   4 +-
 .../web/bean/workflow/WorkflowBean.java       |  34 ++++++++
 .../dashlets/my-completed-tasks.png           | Bin 15407 -> 0 bytes
 .../dashlets/tasklist-completed.jsp           |  22 -----
 .../workflow/workitems-completed-dashlet.jsp  |  80 ++++++++++++++++++
 .../jsp/workflow/workitems-todo-dashlet.jsp   |   6 +-
 7 files changed, 123 insertions(+), 27 deletions(-)
 delete mode 100644 source/web/jsp/dashboards/dashlets/my-completed-tasks.png
 delete mode 100644 source/web/jsp/dashboards/dashlets/tasklist-completed.jsp
 create mode 100644 source/web/jsp/workflow/workitems-completed-dashlet.jsp

diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 3783dec8dc..8e492a9219 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -931,7 +931,11 @@ id=Id
 status=Status
 my_workitems_todo_title=My Work Items To Do
 my_workitems_todo_desc=List of your workflow items still to complete
+my_workitems_completed_title=My Completed Work Items
+my_workitems_completed_desc=List of your completed workflow items
 due_date=Due Date
+completed_on=Completed on
+outcome=Outcome
 reassign=Reassign
 
 # Admin Console messages
diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index 348988f768..bf6ab9a60a 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -190,14 +190,14 @@
                   jsp="/jsp/dashboards/dashlets/getting-started.jsp" allow-narrow="false" />
             <dashlet id="workitems-todo" label-id="my_workitems_todo_title" description-id="my_workitems_todo_desc"
                   jsp="/jsp/workflow/workitems-todo-dashlet.jsp" allow-narrow="false" />
+            <dashlet id="workitems-completed" label-id="my_workitems_completed_title" description-id="my_workitems_completed_desc"
+                  jsp="/jsp/workflow/workitems-completed-dashlet.jsp" allow-narrow="false" />
             <!-- TEMP! -->
             <dashlet id="process-list" label="Workflows" description="List of workflows you may start"
                   jsp="/jbpm/process_list.jsp" allow-narrow="true" />
             <dashlet id="my-docs-template" label="My Documents"
                   description="My Documents Template Page"
                   jsp="/jsp/dashboards/dashlets/my-docs.jsp" allow-narrow="true" />
-            <dashlet id="task-list-complete" label="My Tasks Completed" description="List of your completed tasks"
-                  jsp="/jsp/dashboards/dashlets/tasklist-completed.jsp" allow-narrow="false" />
             <dashlet id="content-checkedout" label="My Checkedout Content" description="List of the content checked out to you"
                   jsp="/jsp/dashboards/dashlets/content-checkedout.jsp" allow-narrow="false" />
             <dashlet id="calculator" label="Calculator" description="A small calculator applet"
diff --git a/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java b/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java
index cafb7e1e79..e64714c787 100644
--- a/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java
+++ b/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java
@@ -34,12 +34,19 @@ public class WorkflowBean
 {
    protected WorkflowService workflowService;
    protected List<Node> workItems;
+   protected List<Node> completedWorkItems;
    
    private static final Log logger = LogFactory.getLog(WorkflowBean.class);
    
    // ------------------------------------------------------------------------------
    // Bean Getters and Setters
    
+   /**
+    * Returns a list of nodes representing the to do work items the 
+    * current user has.
+    * 
+    * @return List of to do work items
+    */
    public List<Node> getWorkItemsToDo()
    {
       // get the current username
@@ -61,6 +68,33 @@ public class WorkflowBean
       return this.workItems;
    }
    
+   /**
+    * Returns a list of nodes representing the completed work items the 
+    * current user has.
+    * 
+    * @return List of completed work items
+    */
+   public List<Node> getWorkItemsCompleted()
+   {
+      // get the current username
+      FacesContext fc = FacesContext.getCurrentInstance();
+      User user = Application.getCurrentUser(fc);
+      String userName = ISO9075.encode(user.getUserName());
+      
+      // get the current in progress tasks for the current user
+      List<WorkflowTask> tasks = this.workflowService.getAssignedTasks(
+            userName, WorkflowTaskState.COMPLETED);
+      
+      // create a list of transient nodes to represent
+      this.completedWorkItems = new ArrayList<Node>(tasks.size());
+      for (WorkflowTask task : tasks)
+      {
+         createWorkItem(task);
+      }
+      
+      return this.completedWorkItems;
+   }
+   
    /**
     * Sets the workflow service to use
     * 
diff --git a/source/web/jsp/dashboards/dashlets/my-completed-tasks.png b/source/web/jsp/dashboards/dashlets/my-completed-tasks.png
deleted file mode 100644
index f53c1bbd046a68aa0979ee7f1daf520e102e4ca0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15407
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
UT27a$fZsrpqH-dYLI%G75AA<d&j0`b

diff --git a/source/web/jsp/dashboards/dashlets/tasklist-completed.jsp b/source/web/jsp/dashboards/dashlets/tasklist-completed.jsp
deleted file mode 100644
index 8ce35a5ae2..0000000000
--- a/source/web/jsp/dashboards/dashlets/tasklist-completed.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%--
-  Copyright (C) 2006 Alfresco, Inc.
- 
-  Licensed under the Mozilla Public License version 1.1 
-  with a permitted attribution clause. You may obtain a
-  copy of the License at
- 
-    http://www.alfresco.org/legal/license.txt
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the License for the specific
-  language governing permissions and limitations under the
-  License.
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-<h:graphicImage value="/jsp/dashboards/dashlets/my-completed-tasks.png" />
diff --git a/source/web/jsp/workflow/workitems-completed-dashlet.jsp b/source/web/jsp/workflow/workitems-completed-dashlet.jsp
new file mode 100644
index 0000000000..a8603f4d6b
--- /dev/null
+++ b/source/web/jsp/workflow/workitems-completed-dashlet.jsp
@@ -0,0 +1,80 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<a:richList id="completed-work-items-list" viewMode="details" value="#{WorkflowBean.workItemsCompleted}" var="r"
+            styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
+            altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
+            initialSortColumn="name" initialSortDescending="true">
+
+   <%-- Primary column for details view mode --%>
+   <a:column primary="true" width="200" style="padding:2px;text-align:left">
+      <f:facet name="header">
+         <a:sortLink label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/>
+      </f:facet>
+      <f:facet name="small-icon">
+         <h:graphicImage url="/images/icons/View_details.gif" />
+      </f:facet>
+      <h:outputText value="#{r.name}" />
+   </a:column>
+   
+   <%-- Task id column --%>
+   <a:column style="text-align:left">
+      <f:facet name="header">
+         <a:sortLink label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
+      </f:facet>
+      <h:outputText value="#{r['bpm:taskId']}" />
+   </a:column>
+   
+   <%-- Type column --%>
+   <a:column style="text-align:left">
+      <f:facet name="header">
+         <a:sortLink label="#{msg.type}" value="type" styleClass="header"/>
+      </f:facet>
+      <h:outputText value="#{r.type}" />
+   </a:column>
+   
+   <%-- Completed date column --%>
+   <a:column style="text-align:left">
+      <f:facet name="header">
+         <a:sortLink label="#{msg.completed_on}" value="bpm:completionDate" styleClass="header"/>
+      </f:facet>
+      <h:outputText value="#{r['bpm:completionDate']}">
+         <a:convertXMLDate type="both" pattern="#{msg.date_pattern}" />
+      </h:outputText>
+   </a:column>
+   
+   <%-- Outcome column --%>
+   <a:column style="text-align:left">
+      <f:facet name="header">
+         <a:sortLink label="#{msg.outcome}" value="bpm:status" styleClass="header"/>
+      </f:facet>
+      <h:outputText value="#{r['bpm:status']}" />
+   </a:column>
+   
+   <%-- Actions column --%>
+   <%--
+   <a:column actions="true" style="text-align:left">
+      <f:facet name="header">
+         <h:outputText value="#{msg.actions}"/>
+      </f:facet>
+      <a:booleanEvaluator value="#{r.local}">
+         <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" 
+                       styleClass="inlineAction"
+                       actionListener="#{RulesBean.setupRuleAction}" action="deleteRule">
+            <f:param name="id" value="#{r.id}" />
+         </a:actionLink>
+         <a:actionLink value="#{msg.change_details}" image="/images/icons/change_rule.gif" 
+                       showLink="false" styleClass="inlineAction"
+                       actionListener="#{RulesBean.setupRuleAction}" action="wizard:editRule">
+            <f:param name="id" value="#{r.id}" />
+         </a:actionLink>
+      </a:booleanEvaluator>
+   </a:column>
+   --%>
+   
+   <a:dataPager styleClass="pager" />
+</a:richList>
+
+<h:message for="completed-work-items-list" styleClass="statusMessage" />
\ No newline at end of file
diff --git a/source/web/jsp/workflow/workitems-todo-dashlet.jsp b/source/web/jsp/workflow/workitems-todo-dashlet.jsp
index 59ec036ddb..20c6d87b07 100644
--- a/source/web/jsp/workflow/workitems-todo-dashlet.jsp
+++ b/source/web/jsp/workflow/workitems-todo-dashlet.jsp
@@ -3,7 +3,7 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<a:richList id="workt-items-list" viewMode="details" value="#{WorkflowBean.workItemsToDo}" var="r"
+<a:richList id="work-items-list" viewMode="details" value="#{WorkflowBean.workItemsToDo}" var="r"
             styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
             altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
             initialSortColumn="name" initialSortDescending="true">
@@ -27,7 +27,7 @@
       </a:actionLink>
    </a:column>
    
-   <%-- Description column --%>
+   <%-- Task id column --%>
    <a:column style="text-align:left">
       <f:facet name="header">
          <a:sortLink label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
@@ -85,4 +85,4 @@
    <a:dataPager styleClass="pager" />
 </a:richList>
 
-<h:message for="workt-items-list" styleClass="statusMessage" />
\ No newline at end of file
+<h:message for="work-items-list" styleClass="statusMessage" />
\ No newline at end of file