Index: lams_gradebook/web/gradebookCourseMonitor.jsp =================================================================== diff -u -r36dd665e11edc512f2cc27c9c6ebf0f5ade9480a -r0933451e694b19886dd20e2962fc984e997dbf6e --- lams_gradebook/web/gradebookCourseMonitor.jsp (.../gradebookCourseMonitor.jsp) (revision 36dd665e11edc512f2cc27c9c6ebf0f5ade9480a) +++ lams_gradebook/web/gradebookCourseMonitor.jsp (.../gradebookCourseMonitor.jsp) (revision 0933451e694b19886dd20e2962fc984e997dbf6e) @@ -1,10 +1,6 @@ +<%@ include file="/common/taglibs.jsp"%> -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> -<%@ taglib uri="tags-lams" prefix="lams"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-core" prefix="c"%> - <fmt:message key="gradebook.title.window.courseMonitor"/> @@ -93,11 +89,11 @@ }, subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { - var subgrid_table_id; - var lessonID = jQuery("#organisationGrid").getRowData(row_id)["id"]; - subgrid_table_id = subgrid_id+"_t"; - jQuery("#"+subgrid_id).html("
"); - jQuery("#"+subgrid_table_id).jqGrid({ + var subgrid_table_id = subgrid_id+"_t"; + lessonID = jQuery("#organisationGrid").getRowData(row_id)["id"]; + + jQuery("#"+subgrid_id).html("
"); + jQuery("#"+subgrid_table_id).jqGrid({ guiStyle: "bootstrap", iconSet: 'fontAwesome', autoencode:false, @@ -107,7 +103,7 @@ autowidth:true, cmTemplate: { title: false }, cellEdit:true, - cellurl: "gradebook/gradebookMonitoring/updateUserLessonGradebookData.do?lessonID=" + lessonID, + cellurl: "gradebook/gradebookMonitoring/updateUserLessonGradebookData.do?&lessonID=" + lessonID, sortorder: "asc", sortname: "rowName", pager: subgrid_table_id + "_pager", @@ -312,10 +308,9 @@ //modify cellurl setting to include lessonid var lessonID = jQuery("#"+subgrid_table_id).getRowData(rowid)["id"]; - $("#"+subgrid_table_id).setGridParam({cellurl: "gradebook/gradebookMonitoring/updateUserLessonGradebookData.do?lessonID=" + lessonID + "&id=" + userID}); + $("#"+subgrid_table_id).setGridParam({cellurl: "gradebook/gradebookMonitoring/updateUserLessonGradebookData.do?&lessonID=" + lessonID + "&id=" + userID}); }, afterSaveCell: function(rowid, cellname,value, iRow, iCol) { - var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid); if (cellname == "mark") { @@ -349,7 +344,7 @@ $("#export-course-button").click(function() { var areaToBlock = "export-link-area"; - var exportExcelUrl = "gradebookMonitoring/exportExcelCourseGradebook.do?organisationID=${organisationID}"; + var exportExcelUrl = "gradebookMonitoring/exportExcelCourseGradebook.do?&organisationID=${organisationID}"; blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait); return false; @@ -368,7 +363,7 @@ var areaToBlock = "select-lessons-area"; var simplified = jQuery("#export-selected-simplified").prop('checked'); simplified = "simplified="+simplified; - var exportExcelUrl = "gradebookMonitoring/exportExcelSelectedLessons.do?"+simplified+"&organisationID=${organisationID}" + lessonIds; + var exportExcelUrl = "gradebookMonitoring/exportExcelSelectedLessons.do?&"+simplified+"&organisationID=${organisationID}" + lessonIds; blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait); }