Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -ra9f62e22a4fe8d5adcf84322fbd833c217028fde -r051ab022e4087566f23069b2299f804d791c8e49
--- lams_gradebook/web/gradebookCourseMonitor.jsp (.../gradebookCourseMonitor.jsp) (revision a9f62e22a4fe8d5adcf84322fbd833c217028fde)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp (.../gradebookCourseMonitor.jsp) (revision 051ab022e4087566f23069b2299f804d791c8e49)
@@ -89,7 +89,7 @@
],
loadError: function(xhr,st,err) {
jQuery("#organisationGrid").clearGridData();
- $.jgrid.info_dialog("", "", "");
+ alert("");
},
subGrid: true,
subGridRowExpanded: function(subgrid_id, row_id) {
@@ -136,7 +136,7 @@
],
loadError: function(xhr,st,err) {
jQuery("#"+subgrid_table_id).clearGridData();
- $.jgrid.info_dialog("", "", "");
+ alert("");
},
formatCell: function(rowid, cellname,value, iRow, iCol) {
if (cellname == "mark") {
@@ -213,7 +213,7 @@
],
loadError: function(xhr,st,err) {
jQuery("#userView").clearGridData();
- $.jgrid.info_dialog("", "", "");
+ alert("");
},
subGrid: true,
subGridRowExpanded: function(subgrid_id, row_id) {
@@ -262,7 +262,7 @@
],
loadError: function(xhr,st,err) {
jQuery("#"+subgrid_table_id).clearGridData();
- $.jgrid.info_dialog("", "", "");
+ alert("");
},
formatCell: function(rowid, cellname,value, iRow, iCol) {
if (cellname == "mark") {
@@ -302,7 +302,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");
}
@@ -328,7 +328,7 @@
$("#organisationGrid").trigger("reloadGrid");
},
errorCell: function(serverresponse, status) {
- $.jgrid.info_dialog("", "", "");
+ alert("");
},
gridComplete: function(){
processLessonDateFields( lessonDatesHidden, jQuery("#"+subgrid_table_id) );
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
Index: lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
===================================================================
diff -u -re6b3b4b473ebb151c10733808c40d4276b4f81ab -r051ab022e4087566f23069b2299f804d791c8e49
--- lams_gradebook/web/includes/jsp/jqGridIncludes.jsp (.../jqGridIncludes.jsp) (revision e6b3b4b473ebb151c10733808c40d4276b4f81ab)
+++ lams_gradebook/web/includes/jsp/jqGridIncludes.jsp (.../jqGridIncludes.jsp) (revision 051ab022e4087566f23069b2299f804d791c8e49)
@@ -186,4 +186,20 @@
};
+ <%-- Based on jqgrid internal functions --%>
+ function displayCellErrorMessage(table, iRow, iCol, errorLabel, errorMessage, buttonText ) {
+ setTimeout(function () {
+ try {
+ var frozenRows = table.grid.fbRows,
+ tr = table.rows[iRow];
+ tr = frozenRows != null && frozenRows[0].cells.length > iCol ? frozenRows[tr.rowIndex] : tr;
+ var td = tr != null && tr.cells != null ? $(tr.cells[iCol]) : $(),
+ rect = td[0].getBoundingClientRect();
+ $.jgrid.info_dialog.call(table, errorLabel, errorMessage, buttonText, {left:rect.left-200, top:rect.top});
+ } catch (e) {
+ alert(errorMessage);
+ }
+ }, 50);
+ }
+