Index: lams_gradebook/web/gradebookCourseLearner.jsp =================================================================== diff -u -re6b3b4b473ebb151c10733808c40d4276b4f81ab -r5ec41d4ed4459b29690d8e575899f85cf0558460 --- lams_gradebook/web/gradebookCourseLearner.jsp (.../gradebookCourseLearner.jsp) (revision e6b3b4b473ebb151c10733808c40d4276b4f81ab) +++ lams_gradebook/web/gradebookCourseLearner.jsp (.../gradebookCourseLearner.jsp) (revision 5ec41d4ed4459b29690d8e575899f85cf0558460) @@ -30,6 +30,7 @@ height: 'auto', width: $(window).width() - 100, shrinkToFit: false, + cmTemplate: { title: false }, sortorder: "asc", sortname: "id", pager: 'organisationGridPager', @@ -48,36 +49,37 @@ "", ""], 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:'status',index:'status', sortable:false, editable:false, search:false, width:50, align:"center"}, - {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:'feedback',index:'feedback', sortable:false, editable:false, search:false, width:200}, - {name:'medianTimeTaken',index:'medianTimeTaken', sortable:true, hidden:true, editable:false, search:false, width:80, align:"center"}, - {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, hidden:true, search:false, width:80, align:"center"}, - {name:'averageMark',index:'averageMark', sortable:true, editable:false, search:false, width:50, align:"center"}, - {name:'mark',index:'mark', sortable:true, editable:false, search:false, width:50, align:"center"} + {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:'status',index:'status', sortable:false, editable:false, search:false, width:50, align:"center"}, + {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:'feedback',index:'feedback', sortable:false, editable:false, search:false, width:200}, + {name:'medianTimeTaken',index:'medianTimeTaken', sortable:true, hidden:true, editable:false, search:false, width:80, align:"center"}, + {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, hidden:true, search:false, width:80, align:"center"}, + {name:'averageMark',index:'averageMark', sortable:true, editable:false, search:false, width:50, align:"center"}, + {name:'mark',index:'mark', sortable:true, editable:false, search:false, width:50, align:"center"} ], loadError: function(xhr,st,err) { - $("#organisationGrid").jqGrid('clearGridData'); - alert('\n\n'); + $("#organisationGrid").jqGrid('clearGridData'); + alert('\n\n'); }, subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { - var subgrid_table_id; - var lessonID = $("#organisationGrid").getRowData(row_id)["id"]; - subgrid_table_id = subgrid_id+"_t"; - $("#"+subgrid_id).html("
"); - $("#"+subgrid_table_id).jqGrid({ + var subgrid_table_id; + var lessonID = $("#organisationGrid").getRowData(row_id)["id"]; + subgrid_table_id = subgrid_id+"_t"; + $("#"+subgrid_id).html("
"); + $("#"+subgrid_table_id).jqGrid({ guiStyle: "bootstrap", iconSet: 'fontAwesome', autoencode:false, datatype: "xml", url: "/gradebook/gradebook.do?dispatch=getActivityGridData&view=lrnActivity&lessonID=" + lessonID, height: "100%", autowidth:true, + cmTemplate: { title: false }, pager: subgrid_table_id + "_pager", rowList:[10,20,30,40,50,100], rowNum:10, @@ -102,20 +104,18 @@ {name:'mark', width:100, index:'mark', sortable:true, editable: false, width:50, align:"center"} ], loadError: function(xhr,st,err) { - $("#"+subgrid_table_id).jqGrid('clearGridData'); - alert('\n\n'); + $("#"+subgrid_table_id).jqGrid('clearGridData'); + alert('\n\n'); }, gridComplete: function(){ - toolTip($(".jqgrow")); fixPagerInCenter(subgrid_table_id+"_pager", 1); } }).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}); // applying refresh button - }, - gridComplete: function(){ - toolTip($(".jqgrow")); // enable tooltips for grid - fixPagerInCenter('organisationGridPager', 0); - } - }).navGrid("#organisationGridPager", {edit:false,add:false,del:false,search:false}); + }, + gridComplete: function(){ + fixPagerInCenter('organisationGridPager', 0); + } + }).navGrid("#organisationGridPager", {edit:false,add:false,del:false,search:false}); jQuery("#organisationGrid").jqGrid('filterToolbar'); Index: lams_gradebook/web/gradebookCourseMonitor.jsp =================================================================== diff -u -r051ab022e4087566f23069b2299f804d791c8e49 -r5ec41d4ed4459b29690d8e575899f85cf0558460 --- lams_gradebook/web/gradebookCourseMonitor.jsp (.../gradebookCourseMonitor.jsp) (revision 051ab022e4087566f23069b2299f804d791c8e49) +++ lams_gradebook/web/gradebookCourseMonitor.jsp (.../gradebookCourseMonitor.jsp) (revision 5ec41d4ed4459b29690d8e575899f85cf0558460) @@ -41,8 +41,8 @@ document.getElementById("datesShown").style.display="none"; document.getElementById("datesNotShown").style.display="inline"; } else { - grid.jqGrid('showCol','startDate'); - grid.jqGrid('showCol','finishDate'); + grid.jqGrid('showCol','startDate'); + grid.jqGrid('showCol','finishDate'); document.getElementById("datesShown").style.display="inline"; document.getElementById("datesNotShown").style.display="none"; } @@ -64,6 +64,7 @@ height: "100%", width: jqgridWidth, shrinkToFit: false, + cmTemplate: { title: false }, sortorder: "asc", sortname: "id", pager: 'organisationGridPager', @@ -88,7 +89,7 @@ {name:'avgMark',index:'avgMark', sortable:true, editable:false, search:false, width:50, align:"center"} ], loadError: function(xhr,st,err) { - jQuery("#organisationGrid").clearGridData(); + jQuery("#organisationGrid").clearGridData(); alert(""); }, subGrid: true, @@ -105,6 +106,7 @@ url: "/gradebook/gradebook.do?dispatch=getUserGridData&view=monCourse&lessonID=" + lessonID, height: "100%", autowidth:true, + cmTemplate: { title: false }, cellEdit:true, cellurl: "/gradebook/gradebookMonitoring.do?dispatch=updateUserLessonGradebookData&lessonID=" + lessonID, sortorder: "asc", @@ -117,11 +119,11 @@ "", "", "", - "", - "", + "", + "", "", - "", - 'portraitId' + "", + 'portraitId' ], colModel:[ {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true}, @@ -169,15 +171,13 @@ fixArrowColumn(subgrid_id); processLessonDateFields( lessonDatesHidden, jQuery("#"+subgrid_table_id) ); fixPagerInCenter(subgrid_table_id+"_pager",2); - toolTip($(".jqgrow")); // enable tooltips for grid initializePortraitPopover(''); } }).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}) jQuery("#"+subgrid_table_id).jqGrid('filterToolbar'); }, gridComplete: function(){ - toolTip($(".jqgrow")); // enable tooltips for grid fixPagerInCenter('organisationGridPager', 0); processLessonDateFields( lessonDatesHidden, jQuery("#organisationGrid") ); // LDEV-4289 hide dates to start hideShowLessonCheckboxes(); @@ -196,6 +196,7 @@ height: "100%", width: jqgridWidth, shrinkToFit: false, + cmTemplate: { title: false }, sortorder: "asc", sortname: "rowName", pager: 'userViewPager', @@ -217,18 +218,19 @@ }, subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { - var subgrid_table_id; - var userID = jQuery("#userView").getRowData(row_id)["id"]; - subgrid_table_id = subgrid_id+"_t"; - jQuery("#"+subgrid_id).html("
"); - jQuery("#"+subgrid_table_id).jqGrid({ + var subgrid_table_id; + var userID = jQuery("#userView").getRowData(row_id)["id"]; + subgrid_table_id = subgrid_id+"_t"; + jQuery("#"+subgrid_id).html("
"); + jQuery("#"+subgrid_table_id).jqGrid({ guiStyle: "bootstrap", iconSet: 'fontAwesome', autoencode:false, datatype: "xml", url: "/gradebook/gradebook.do?dispatch=getCourseGridData&view=monUserView&organisationID=${organisationID}&userID=" + userID, height: "100%", autowidth:true, + cmTemplate: { title: false }, cellEdit:true, pager: subgrid_table_id + "_pager", rowList:[10,20,30,40,50,100], @@ -333,16 +335,14 @@ gridComplete: function(){ processLessonDateFields( lessonDatesHidden, jQuery("#"+subgrid_table_id) ); fixPagerInCenter(subgrid_table_id+"_pager",1); - toolTip($(".jqgrow")); } - }).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}); // applying refresh button + }).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}); // applying refresh button - }, - gridComplete: function(){ - toolTip($(".jqgrow")); // allowing tooltips for this grid - fixPagerInCenter('userViewPager',0); - initializePortraitPopover(''); - } + }, + gridComplete: function(){ + fixPagerInCenter('userViewPager',0); + initializePortraitPopover(''); + } }).navGrid("#userViewPager", {edit:false,add:false,del:false,search:false}); // applying refresh button jQuery("#userView").jqGrid('filterToolbar'); Index: lams_gradebook/web/gradebookMonitor.jsp =================================================================== diff -u -r051ab022e4087566f23069b2299f804d791c8e49 -r5ec41d4ed4459b29690d8e575899f85cf0558460 --- lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 051ab022e4087566f23069b2299f804d791c8e49) +++ lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 5ec41d4ed4459b29690d8e575899f85cf0558460) @@ -155,6 +155,7 @@ height: "100%", width: jqgridWidth, shrinkToFit: false, + cmTemplate: { title: false }, cellEdit: true, viewrecords: true, sortorder: "asc", @@ -164,7 +165,7 @@ rowNum:10, cellurl: "/gradebook/gradebookMonitoring.do?dispatch=updateUserLessonGradebookData&lessonID=${lessonDetails.lessonID}", colNames:["", - "", + "AAAAAAAAAAA", "", "", "", @@ -185,8 +186,8 @@ {name:'portraitId', index:'portraitId', width:0, hidden: true} ], loadError: function(xhr,st,err) { - jQuery("#userView").clearGridData(); - alert(""); + jQuery("#userView").clearGridData(); + alert(""); }, subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { @@ -202,6 +203,7 @@ url: "/gradebook/gradebook.do?dispatch=getActivityGridData&lessonID=${lessonDetails.lessonID}&view=monUserView&userID=" + userID, height: "100%", autowidth:true, + cmTemplate: { title: false }, cellEdit:true, pager: subgrid_table_id + "_pager", rowList:[10,20,30,40,50,100], @@ -230,7 +232,7 @@ {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(); + jQuery("#"+subgrid_table_id).clearGridData(); alert(""); }, formatCell: function(rowid, cellname,value, iRow, iCol) { @@ -302,14 +304,12 @@ alert(""); }, gridComplete: function(){ - toolTip($(".jqgrow"), "jqgridTooltip"); fixPagerInCenter(subgrid_table_id+"_pager", 1); } }).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}); // applying refresh button }, gridComplete: function(){ - toolTip($(".jqgrow"), "jqgridTooltip"); // Allow tooltips for this grid initializePortraitPopover(''); // Load dates shown but hide straight away as all columns needed initially so that subgrid is displayed properly LDEV-4289 processLessonDateFields( lessonDatesHidden ); @@ -328,10 +328,11 @@ height: "100%", width: jqgridWidth, shrinkToFit: false, + cmTemplate: { title: false }, cellEdit: true, pager: "activityViewPager", rowList:[10,20,30,40,50,100], - rowNum:10, + rowNum:10, sortorder: "asc", sortname: "activityId", colNames:[ @@ -351,9 +352,9 @@ {name:'avgMark',index:'avgMark', sortable:true, editable:false, width:50, align:"center"} ], loadError: function(xhr,st,err) { - jQuery("#activityView").clearGridData(); - alert(""); - }, + jQuery("#activityView").clearGridData(); + alert(""); + }, subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { var subgrid_table_id; @@ -370,6 +371,7 @@ url: "/gradebook/gradebook.do?dispatch=getUserGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}&activityID=" + activityID + "&groupId=" + groupID, height: "100%", autowidth:true, + cmTemplate: { title: false }, cellEdit:true, cellurl: "/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradebookData&lessonID=${lessonDetails.lessonID}&view=monActivityView&activityID=" + activityID, sortorder: "asc", @@ -471,7 +473,6 @@ alert(""); }, gridComplete: function(){ - toolTip($(".jqgrow"), "jqgridTooltip"); // applying tooltips for this grid initializePortraitPopover(''); fixPagerInCenter(subgrid_table_id+"_pager", 1); } @@ -480,7 +481,6 @@ }, gridComplete: function(){ - toolTip($(".jqgrow"), "jqgridTooltip"); // enable tooltips for grid fixPagerInCenter('activityViewPager', 0); } }).navGrid("#activityViewPager", {edit:false,add:false,del:false,search:false}); // enable refresh button @@ -732,10 +732,7 @@
-
- - <%-- not #tooltip as it conflicts with the learner progress tooltip --%> -
+
Index: lams_gradebook/web/includes/jsp/jqGridIncludes.jsp =================================================================== diff -u -r033346e575fe3604ea0282435914e0f8ae74fbc3 -r5ec41d4ed4459b29690d8e575899f85cf0558460 --- lams_gradebook/web/includes/jsp/jqGridIncludes.jsp (.../jqGridIncludes.jsp) (revision 033346e575fe3604ea0282435914e0f8ae74fbc3) +++ lams_gradebook/web/includes/jsp/jqGridIncludes.jsp (.../jqGridIncludes.jsp) (revision 5ec41d4ed4459b29690d8e575899f85cf0558460) @@ -63,83 +63,6 @@ // --------------------------------------------------------------------- - - // Applies tooltips to a jqgrid - function toolTip(gRowObject, tooltipDiv) { - var my_tooltip = null; // Div created for tooltip - if ( tooltipDiv != undefined && tooltipDiv.length > 0 ) - my_tooltip = $('#'+tooltipDiv); - else - my_tooltip = $('#tooltip'); - gRowObject.css({ - cursor: 'pointer' - }).mouseover(function(kmouse){ - if (checkCell(kmouse)) { - showToolTip(my_tooltip, kmouse); - //setTimeout(function(){showToolTip(my_tooltip, kmouse);}, 1000); - } - }).mousemove(function(kmouse){ - if (checkCell(kmouse)) { - moveToolTipBox(my_tooltip, kmouse); - //setTimeout(function(){moveToolTipBox(my_tooltip, kmouse);}, 1000); - } - }).mouseout(function(){ - my_tooltip.stop().fadeOut(400); - }).css({cursor:'pointer'}).click(function(e){ - my_tooltip.stop().fadeOut(400); - }); - } - - // Check a cell before opening tooltip to make sure empty or invalid cells do not display - function checkCell(kmouse) { - var cell = $(kmouse.target).html(); - if (cell != null && cell !="" && cell !=" " && cell != "-" && cell.charAt(0) != '<' && cell.indexOf('popover')==-1 ) { - var parent = $(kmouse.target).parent().html(); - return ( ! ( parent.indexOf("-1 ) ); - } - return false; - } - - // Shows a tootip and applies the cell value - function showToolTip(my_tooltip, kmouse) { - - var cell = $(kmouse.target).html(); - my_tooltip.html(cell); - my_tooltip.css({ - opacity: 0.75, - display: "none" - }).stop().fadeIn(400); - } - - // Moves the tooltip box so it is not in the way of the mouse - function moveToolTipBox(my_tooltip, kmouse) { - var border_top = $(window).scrollTop(); - var border_right = $(window).width(); - var left_pos; - var top_pos; - var offset = 20; - if (border_right - (offset * 2) >= my_tooltip.width() + kmouse.pageX) - { - left_pos = kmouse.pageX + offset; - } - else - { - left_pos = border_right - my_tooltip.width() - offset; - } - if (border_top + (offset * 2) >= kmouse.pageY - my_tooltip.height()) - { - top_pos = border_top + offset; - } - else - { - top_pos = kmouse.pageY - my_tooltip.height() - offset; - } - my_tooltip.css({ - left: left_pos, - top: top_pos - }); - } - // launches a popup from the page function launchPopup(url,title,width,height) { var wd = null;