Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -ra9f62e22a4fe8d5adcf84322fbd833c217028fde -r051ab022e4087566f23069b2299f804d791c8e49
--- lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision a9f62e22a4fe8d5adcf84322fbd833c217028fde)
+++ lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 051ab022e4087566f23069b2299f804d791c8e49)
@@ -91,13 +91,13 @@
if (marksReleased) {
marksReleased = false;
} else {
- marksReleased = true;
- }
- displayReleaseOption();
- } else {
-
- $.jgrid.info_dialog("", "", "");
- }
+ marksReleased = true;
+ }
+ displayReleaseOption();
+ } else {
+
+ alert("");
+ }
});
}
}
@@ -185,8 +185,8 @@
{name:'portraitId', index:'portraitId', width:0, hidden: true}
],
loadError: function(xhr,st,err) {
- jQuery("#userView").clearGridData();
- $.jgrid.info_dialog("", "", "");
+ jQuery("#userView").clearGridData();
+ alert("");
},
subGrid: true,
subGridRowExpanded: function(subgrid_id, row_id) {
@@ -230,8 +230,8 @@
{name:'mark', index:'mark', sortable:true, editable: true, editrules:{number:true}, width:50, align:"center" }
],
loadError: function(xhr,st,err) {
- jQuery("#"+subgrid_table_id).clearGridData();
- $.jgrid.info_dialog("", "", "");
+ jQuery("#"+subgrid_table_id).clearGridData();
+ alert("");
},
formatCell: function(rowid, cellname,value, iRow, iCol) {
if (cellname == "mark") {
@@ -271,7 +271,7 @@
var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") {
if (parseFloat(value) > parseFloat(currRowData['marksAvailable'])){
- $.jgrid.info_dialog("", "", "");
+ displayCellErrorMessage(jQuery("#"+subgrid_table_id)[0], iRow, iCol, "", "", "");
jQuery("#"+subgrid_table_id).restoreCell( iRow, iCol);
throw("Mark must be lower than maximum mark");
}
@@ -299,7 +299,7 @@
}
},
errorCell: function(serverresponse, status) {
- $.jgrid.info_dialog("", "", "");
+ alert("");
},
gridComplete: function(){
toolTip($(".jqgrow"), "jqgridTooltip");
@@ -351,9 +351,9 @@
{name:'avgMark',index:'avgMark', sortable:true, editable:false, width:50, align:"center"}
],
loadError: function(xhr,st,err) {
- jQuery("#activityView").clearGridData();
- $.jgrid.info_dialog("", "", "");
- },
+ jQuery("#activityView").clearGridData();
+ alert("");
+ },
subGrid: true,
subGridRowExpanded: function(subgrid_id, row_id) {
var subgrid_table_id;
@@ -404,9 +404,9 @@
{name:'activityURL', index:'activityURL', width:0, hidden: true}
],
loadError: function(xhr,st,err) {
- jQuery("#"+subgrid_table_id).clearGridData();
- $.jgrid.info_dialog("", "", "");
- },
+ jQuery("#"+subgrid_table_id).clearGridData();
+ alert("");
+ },
formatCell: function(rowid, cellname,value, iRow, iCol) {
if (cellname == "mark") {
@@ -444,7 +444,7 @@
var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") {
if (parseFloat(value) > parseFloat(currRowData['marksAvailable'])){
- $.jgrid.info_dialog("", "", "");
+ displayCellErrorMessage(jQuery("#"+subgrid_table_id)[0], iRow, iCol, "", "", "");
jQuery("#"+subgrid_table_id).restoreCell( iRow, iCol);
throw("Mark must be lower than maximum mark");
}
@@ -468,7 +468,7 @@
}
},
errorCell: function(serverresponse, status) {
- $.jgrid.info_dialog("", "", "");
+ alert("");
},
gridComplete: function(){
toolTip($(".jqgrow"), "jqgridTooltip"); // applying tooltips for this grid