Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookMonitor.jsp,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_gradebook/web/gradebookMonitor.jsp 21 Apr 2009 07:00:28 -0000 1.1.2.6
+++ lams_gradebook/web/gradebookMonitor.jsp 22 Apr 2009 03:30:58 -0000 1.1.2.7
@@ -19,7 +19,6 @@
var marksReleased = ${marksReleased};
-
function toggleRelease() {
var conf;
@@ -56,7 +55,6 @@
}
}
-
jQuery(document).ready(function(){
displayReleaseOption();
@@ -186,28 +184,22 @@
},
afterSaveCell: function(rowid, cellname,value, iRow, iCol) {
+ var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
if (cellname == "mark") {
if (cellname == "mark") {
- var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") {
var markStr = "" + value + "/" + currRowData['marksAvailable'] + "";
jQuery("#"+subgrid_table_id).setCell(rowid, "mark", markStr, "", "");
}
}
-
- //var ids = jQuery("#"+subgrid_table_id).getDataIDs()
- //var totalMark = 0.0;
- //for (var i=0; i < ids.length; i++) {
- // var rowData = jQuery("#"+subgrid_table_id).getRowData(ids[i]);
- // var userMark = rowData["mark"];
- //
- // if (userMark != "-") {
- // totalMark += parseFloat(userMark);
- // }
- //}
- //jQuery("#userView").setCell(row_id, "mark", totalMark, "", "");
+ // Update the aggregated lesson mark
+ $.get("/gradebook/gradebook.do", {dispatch:"getLessonMarkAggregate", lessonID:"${lessonDetails.lessonID}", userID:row_id}, function(xml) {
+ if (xml!=null) {
+ jQuery("#userView").setCell(row_id, "mark", xml, "", "");
+ }
+ });
}
},
errorCell: function(serverresponse, status) {
@@ -387,6 +379,13 @@
var markStr = "" + value + "/" + currRowData['marksAvailable'] + "";
jQuery("#"+subgrid_table_id).setCell(rowid, "mark", markStr, "", "");
}
+
+ // Update the average activity mark
+ $.get("/gradebook/gradebook.do", {dispatch:"getActivityMarkAverage", activityID:row_id}, function(xml) {
+ if (xml!=null) {
+ jQuery("#activityView").setCell(row_id, "avgMark", xml, "", "");
+ }
+ });
}
},
errorCell: function(serverresponse, status) {