Index: lams_tool_larsrc/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/build.xml,v
diff -u -r1.25 -r1.25.6.1
--- lams_tool_larsrc/build.xml	6 Apr 2009 17:07:39 -0000	1.25
+++ lams_tool_larsrc/build.xml	10 Aug 2011 12:04:20 -0000	1.25.6.1
@@ -503,12 +503,6 @@
         		<include name="**/*.*"/>
         	</fileset>
         </copy>
-        <copy verbose="yes" todir="${jboss.deploy}/${product}.war/WEB-INF/classes">
-	    	<fileset dir="${build.classes.java}">
-	    		<include name="**/*.properties"/>
-	    		<include name="**/*.xml"/>
-	    	</fileset>
-        </copy>
     </target>
 
 	<!-- end tasks **************************************************************************************************-->
Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql,v
diff -u -r1.20.10.1 -r1.20.10.2
--- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	9 Aug 2011 16:30:16 -0000	1.20.10.1
+++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	10 Aug 2011 12:04:20 -0000	1.20.10.2
@@ -72,6 +72,7 @@
 create table tl_larsrc11_item_log (
    uid bigint not null auto_increment,
    access_date datetime,
+   complete_date datetime,
    resource_item_uid bigint,
    user_uid bigint,
    complete tinyint,
Index: lams_tool_larsrc/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/table-schema.sql,v
diff -u -r1.14.10.1 -r1.14.10.2
--- lams_tool_larsrc/db/sql/table-schema.sql	9 Aug 2011 16:30:16 -0000	1.14.10.1
+++ lams_tool_larsrc/db/sql/table-schema.sql	10 Aug 2011 12:04:20 -0000	1.14.10.2
@@ -18,7 +18,7 @@
 drop table if exists tl_larsrc11_user;
 create table tl_larsrc11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, resource_uid bigint, primary key (uid));
 create table tl_larsrc11_item_instruction (uid bigint not null auto_increment, description varchar(255), sequence_id integer, item_uid bigint, primary key (uid));
-create table tl_larsrc11_item_log (uid bigint not null auto_increment, access_date datetime, resource_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid));
+create table tl_larsrc11_item_log (uid bigint not null auto_increment, access_date datetime, complete_date datetime, resource_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid));
 create table tl_larsrc11_resource (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_add_files bit, allow_add_urls bit, mini_view_resource_number integer, allow_auto_run bit, reflect_instructions varchar(255), reflect_on_activity bit,assigment_submit_notify tinyint DEFAULT 0, primary key (uid));
 create table tl_larsrc11_resource_item (uid bigint not null auto_increment, file_uuid bigint, file_version_id bigint, description varchar(255), sequence_id integer, ims_schema varchar(255), init_item varchar(255), organization_xml text, title varchar(255), url text, create_by bigint, create_date datetime, create_by_author bit, is_hide bit, item_type smallint, file_type varchar(255), file_name varchar(255), open_url_new_window bit, resource_uid bigint, session_uid bigint, primary key (uid));
 create table tl_larsrc11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, resource_uid bigint, session_id bigint, session_name varchar(250), primary key (uid));
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20110809_updateTo236.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/Attic/patch20110809_updateTo236.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20110809_updateTo236.sql	9 Aug 2011 16:30:16 -0000	1.1.2.1
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20110809_updateTo236.sql	10 Aug 2011 12:04:20 -0000	1.1.2.2
@@ -5,11 +5,15 @@
 
 ----------------------Put all sql statements below here-------------------------
 
--- LDEV-2706 Reorder resources in Author
+-- LDEV-2690 Reorder resources in Author
 alter table tl_larsrc11_resource_item add column sequence_id integer;
 update tl_larsrc11_resource_item set sequence_id=uid where sequence_id IS NULL;
 
 
+-- LDEV-2705 Improve reporting for Share Resources
+ALTER TABLE tl_larsrc11_item_log ADD COLUMN complete_date datetime DEFAULT NULL;
+
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java,v
diff -u -r1.8 -r1.8.12.1
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	24 Oct 2006 00:05:36 -0000	1.8
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	10 Aug 2011 12:04:20 -0000	1.8.12.1
@@ -38,6 +38,7 @@
 	private ResourceUser user;
 	private ResourceItem resourceItem;
 	private boolean complete;
+	private Date completeDate;
 	private Date accessDate;
 	private Long sessionId;
 	
@@ -52,6 +53,16 @@
 		this.accessDate = accessDate;
 	}
 	/**
+	 * @hibernate.property column="complete_date"
+	 * @return
+	 */
+	public Date getCompleteDate() {
+		return completeDate;
+	}
+	public void setCompleteDate(Date completeDate) {
+		this.completeDate = completeDate;
+	}
+	/**
 	 * @hibernate.many-to-one  column="resource_item_uid"
  	 * cascade="none"
 	 * @return
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java,v
diff -u -r1.9 -r1.9.12.1
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java	24 Oct 2006 00:05:36 -0000	1.9
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java	10 Aug 2011 12:04:20 -0000	1.9.12.1
@@ -53,6 +53,10 @@
 	//=============== NON Persisit value: for display use ===========
 	//the user access some reousrce item date time. Use in monitoring summary page
 	private Date accessDate;
+	//resource item complete date. Use in monitoring summary page
+	private Date completeDate;
+	//difference between completeDate and accessDate
+	private Date timeTaken;
 	
 	public ResourceUser(){
 	}
@@ -215,6 +219,17 @@
 	public void setAccessDate(Date accessDate) {
 		this.accessDate = accessDate;
 	}
+	public Date getCompleteDate() {
+		return completeDate;
+	}
+	public void setCompleteDate(Date completeDate) {
+		this.completeDate = completeDate;
+	}
+	public Date getTimeTaken() {
+		return timeTaken;
+	}
+	public void setTimeTaken(Date timeTaken) {
+		this.timeTaken = timeTaken;
+	}
 
-
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v
diff -u -r1.60 -r1.60.10.1
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	10 Oct 2008 00:37:15 -0000	1.60
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	10 Aug 2011 12:04:20 -0000	1.60.10.1
@@ -458,6 +458,7 @@
 	    log.setAccessDate(new Timestamp(new Date().getTime()));
 	}
 	log.setComplete(true);
+	log.setCompleteDate(new Timestamp(new Date().getTime()));
 	resourceItemVisitDao.saveObject(log);
     }
 
@@ -597,6 +598,10 @@
 	for (ResourceItemVisitLog visit : logList) {
 	    ResourceUser user = visit.getUser();
 	    user.setAccessDate(visit.getAccessDate());
+	    user.setCompleteDate(visit.getCompleteDate());
+	    Date timeTaken = (visit.getCompleteDate() != null && visit.getAccessDate() != null) ? 
+		    new Date(visit.getCompleteDate().getTime() - visit.getAccessDate().getTime()) : null;
+	    user.setTimeTaken(timeTaken);
 	    userList.add(user);
 	}
 	return userList;
Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/userlist.jsp,v
diff -u -r1.9 -r1.9.10.1
--- lams_tool_larsrc/web/pages/monitoring/userlist.jsp	8 Jun 2007 01:39:05 -0000	1.9
+++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp	10 Aug 2011 12:04:20 -0000	1.9.10.1
@@ -1,54 +1,119 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
-
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 <lams:head>
-	    <%@ include file="/common/header.jsp" %>
+	<c:set var="lams"><lams:LAMSURL/></c:set>
+	<c:set var="tool"><lams:WebAppURL/></c:set>
+	<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+
+ 	<!-- ********************  CSS ********************** -->
+	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
+	<lams:css/>
+
+
+ 	<!-- ********************  javascript ********************** -->
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-1.1.4.pack.js"></script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+	    
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pack.js"></script>
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pager.js"></script>
+	<script language="JavaScript" type="text/javascript">
+		<!--
+		jQuery(document).ready(function() {
+			jQuery("table.tablesorter-admin").tablesorter({widthFixed:true})
+				.tablesorterPager({container: jQuery("#pager")});
+		});
+		//-->
+	</script>
 </lams:head>
 <body class="stripes">
 
-
-		<div id="content">
+<div id="content">
 		
-		<h1>
-			<fmt:message key="label.monitoring.heading.access"/>
-		</h1>
+	<h1>
+		<fmt:message key="label.monitoring.heading.access"/>
+	</h1>
+	
+	<br/>
 		
-	<table border="0" cellspacing="3" width="98%">
-		<tr>
-			<th>
-				<fmt:message key="monitoring.label.user.loginname" />
-			</th>
-			<th>
-				<fmt:message key="monitoring.label.access.time" />
-			</th>
-			<th>
-				<fmt:message key="monitoring.label.user.name" />
-			</th>
-		</tr>
-		<c:forEach var="user" items="${userList}">
+	<table border="0" cellspacing="3" width="98%" class="tablesorter-admin">
+		<thead>
 			<tr>
-				<td>
-					${user.loginName}
-				</td>
-				<td>
-					<lams:Date value="${user.accessDate}"/>
-				</td>
-				<td>
-					${user.firstName},${user.lastName}
-				</td>
+				<th>
+					<fmt:message key="monitoring.label.user.name" />
+				</th>		
+				<th>
+					<fmt:message key="monitoring.label.user.loginname" />
+				</th>
+				<th>
+					<fmt:message key="monitoring.label.access.time" />
+				</th>
+				<th>
+					<fmt:message key="monitoring.label.complete.time" />
+				</th>
+				<th>
+					<fmt:message key="monitoring.label.time.taken" />
+				</th>
 			</tr>
-		</c:forEach>
-		<tr>
-			<td colspan="3" class="align-right">
-				<a href="javaqscript:;" onclick="window.close()" class="button">Close</a>
-			</td>
-		</tr>
+		</thead>
+		<tbody>
+			<script language="JavaScript" type="text/javascript">
+				<!--
+				if (jQuery.browser.msie) {
+					document.write('<tr><td/><td/><td/><td/><td/></tr>');
+				}
+				//-->
+			</script>
+			<c:forEach var="user" items="${userList}">
+				<tr>
+					<td>
+						${user.firstName},${user.lastName}
+					</td>			
+					<td>
+						${user.loginName}
+					</td>
+					<td>
+						<lams:Date value="${user.accessDate}"/>
+					</td>
+					<td>
+						<lams:Date value="${user.completeDate}"/>
+					</td>
+					<td>
+						<fmt:formatDate value="${user.timeTaken}" pattern="HH:mm:ss" timeZone="GMT" />
+					</td>
+				</tr>
+			</c:forEach>
+		</tbody>
 	</table>
+	
+	<br/>
+
+	<div id="pager" class="pager">
+		<form onsubmit="return false;">
+			<img src="<lams:LAMSURL/>/images/first.png" class="first"/>
+			<img src="<lams:LAMSURL/>/images/prev.png" class="prev">
+			<input type="text" class="pagedisplay"/>
+			<img src="<lams:LAMSURL/>/images/next.png" class="next">
+			<img src="<lams:LAMSURL/>/images/last.png" class="last">
+			<select class="pagesize">
+				<option selected="selected"  value="10">10&nbsp;&nbsp;</option>
+				<option value="20">20</option>
+				<option value="30">30</option>
+				<option value="40">40</option>
+				<option value="50">50</option>
+				<option value="100">100</option>
+			</select>
+		</form>
+	</div>
+	
+	<div class="align-right small-space-top">
+		<a href="javaqscript:;" onclick="window.close()" class="button">Close</a>
+	</div>
 </div>
-		<div id="footer"></div>
-		</div>
+
+<div id="footer"></div>
 </body>
 </lams:html>
\ No newline at end of file