Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookMonitor.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_gradebook/web/gradebookMonitor.jsp	15 Apr 2009 07:40:21 -0000	1.1.2.2
+++ lams_gradebook/web/gradebookMonitor.jsp	16 Apr 2009 06:46:25 -0000	1.1.2.3
@@ -37,7 +37,7 @@
 			    	'<fmt:message key="gradebook.columntitle.name"/>', 
 			    	'<fmt:message key="gradebook.columntitle.progress"/>', 
 			    	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
-			    	'<fmt:message key="gradebook.columntitle.lessonFeedBack"/>', 
+			    	'<fmt:message key="gradebook.columntitle.lessonFeedback"/>', 
 			    	'<fmt:message key="gradebook.columntitle.mark"/>'
 			    ],
 			    colModel:[
@@ -168,13 +168,15 @@
 				    sortname: "activityId", 
 				    colNames:[
 				    	'', 
+				    	'',
 				    	'<fmt:message key="gradebook.columntitle.name"/>', 
 				    	'<fmt:message key="gradebook.columntitle.averageTimeTaken"/>', 
 				    	'<fmt:message key="gradebook.columntitle.competences"/>', 
 				    	'<fmt:message key="gradebook.columntitle.averageMark"/>'
 				    ],
 				    colModel:[
 				      {name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
+				      {name:'groupId', index:'groupId', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 					  {name:'rowName', index:'rowName', sortable:true, editable: false},
 					  {name:'avgTimeTaken', index:'avgTimeTaken', sortable:true, editable: false, width:80, align:"center"},
 					  {name:'competences', index:'competences', sortable:false, editable: false, hidden:true},
@@ -189,11 +191,13 @@
 					subGridRowExpanded: function(subgrid_id, row_id) {
 					   var subgrid_table_id;
 					   var activityID = jQuery("#activityView").getRowData(row_id)["id"];
+					   var groupID = jQuery("#activityView").getRowData(row_id)["groupId"];
 					   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=getUserGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}&activityID=" + activityID,
+						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}&activityID=" + activityID + "&groupId=" + groupID,
 						     height: "100%",
 						     width: 600,
 						     cellEdit:true,