Index: lams_central/web/gradebook/gradeBookCourseLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/gradebook/Attic/gradeBookCourseLearner.jsp,v
diff -u -r1.1 -r1.2
--- lams_central/web/gradebook/gradeBookCourseLearner.jsp	7 Apr 2009 00:09:15 -0000	1.1
+++ lams_central/web/gradebook/gradeBookCourseLearner.jsp	7 Apr 2009 02:35:53 -0000	1.2
@@ -31,14 +31,18 @@
 			    pager: 'organisationGridPager',
 			    rowList:[5,10,20,30],
 			    rowNum:10,
-			    colNames:["", 'Lesson Name', 'Sub-Group', 'Start Date', 'Time Taken', 'Description', 'Mark'],
+			    colNames:["", 'Lesson Name', 'Sub-Group', 'Progress', 'FeedBack', 'Start Date', 'Finish Date', 'Average Duration', 'Duration', 'Average Mark', 'Mark'],
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 			      {name:'rowName',index:'rowName', sortable:true, editable:false},
 			      {name:'subGroup',index:'subGroup', sortable:false, editable:false, search:false},
-			      {name:'startDate',index:'startDate', sortable:false, editable:false, search:false},
-			      {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, search:false},
-			      {name:'description',index:'description', sortable:false, editable:false, search:false},
+			      {name:'status',index:'status', sortable:false, editable:false, search:false},
+			      {name:'feedback',index:'feedback', sortable:false, editable:false, search:false},
+			      {name:'startDate',index:'startDate', sortable:false, editable:false, hidden:true, search:false},
+			      {name:'finishDate',index:'finishDate', sortable:false, editable:false, hidden:true, search:false},
+			      {name:'averageTimeTaken',index:'averageTimeTaken', sortable:true, hidden:true, editable:false, search:false},
+			      {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, hidden:true, search:false},
+			      {name:'averageMark',index:'averageMark', sortable:true, editable:false, search:false},
 			      {name:'mark',index:'mark', sortable:true, editable:false, search:false}
 			    ],
 			    loadError: function(xhr,st,err) {
@@ -48,26 +52,28 @@
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
 				   var subgrid_table_id;
-				   var userID = jQuery("#organisationGrid").getRowData(row_id)["id"];
+				   var lessonID = jQuery("#organisationGrid").getRowData(row_id)["id"];
 				   subgrid_table_id = subgrid_id+"_t";
 					 jQuery("#"+subgrid_id).html("<table id='"+subgrid_table_id+"' class='scroll'></table><div id='"+subgrid_table_id+"_pager' class='scroll' ></div>");
 					   	jQuery("#"+subgrid_table_id).jqGrid({
 						     datatype: "xml",
-						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityGridData&lessonID=${lessonDetails.lessonID}&view=monUserView&userID=" + userID,
+						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityGridData&view=lrnActivity&lessonID=" + lessonID,
 						     height: "100%",
 						     width: 920,
 						     sortname: "id",
 						     imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images',
 						     pager: subgrid_table_id + "_pager",
 							 rowList:[5,10,20,30],
 							 rowNum:10,
-						     colNames: ['Id','Activity','Progress', 'Time Taken', 'Activity FeedBack', 'Mark'],
+						     colNames: ['Id','Activity','Progress', 'Feedback', 'Average Duration', 'Duration', 'Average Mark', 'Mark'],
 						     colModel: [
 						       	{name:'id', width:10, index:'id', sortable:false, hidden:true, hidedlg:true},
 								{name:'rowName', width:60, index:'rowName', sortable:false, editable: false},
 								{name:'status', align:'center', width:30, index:'status', sortable:false, editable:false},
-								{name:'timeTaken', width:50, index:'timeTaken', sortable:true, editable: false},
 								{name:'feedback', width:250, index:'feedback', sortable:false, editable: false},
+								{name:'averageTimeTaken',index:'averageTimeTaken', sortable:true, hidden:true, editable:false, search:false},
+			      				{name:'timeTaken',index:'timeTaken', sortable:true, editable:false, hidden:true, search:false},
+			      				{name:'averageMark',index:'averageMark', sortable:true, editable:false, search:false},
 								{name:'mark', width:100, index:'mark', sortable:true, editable: false}
 						     ],
 						     loadError: function(xhr,st,err) {