Index: lams_learning/web/lessonComplete.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -19,190 +19,209 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-lams" prefix="lams"%> - - - + - - +<%@ include file="/common/taglibs.jsp"%> - - - - + + + + + + + + + + - // submit lesson total mark to the integrated server in case request comes from an integrated server - if (${not empty lessonFinishUrl}) { - $.ajax({ - url: "${lessonFinishUrl}", - type: "POST", - dataType: 'html', - cache: false, - async: 'false', - success: function (data) { - //log mark has been successfullly pushed to the integrated server - if (data && ((data == 'OK') || (data == 'No Lineitem object found'))) { - $.ajax({ - url: "logLessonMarkPushedToIntegrations", - data: {lessonID: "${lessonID}"}, - type: "POST", - cache: false - }); - } - }, - error: function (ajaxContext) { - alert("There was an error on trying to submit lesson total mark to the integrated server: " + ajaxContext.responseText) - } - }); - } - - - $(document).ready(function(){ - // Create the organisation view grid with sub grid for users - $("#userGradebookGrid").jqGrid({ - datatype : "json", - url : "gradebook/gradebook/getLessonCompleteGridData.do?lessonID=${lessonID}", - height : "100%", - // use new theme - guiStyle : "bootstrap", - iconSet : 'fontAwesome', - autoencode : false, - colNames : [ - '', - '', - '', - '' - ], - colModel : [ - { - 'name' : 'name', - 'index' : 'name', - 'title' : false - }, - { - 'name' : 'progress', - 'index' : 'progress', - 'align' : 'center', - 'width' : 100, - 'title' : false - }, - { - 'name' : 'averageMark', - 'index' : 'averageMark', - 'align' : 'center', - 'width' : 100, - 'title' : false - }, - { - 'name' : 'mark', - 'index' : 'mark', - 'align' : 'center', - 'width' : 100, - 'title' : false - } - ], - beforeProcessing : function(data) { - // Wrap each activity name in a link to show same pop up - // as if the user clicked the activity in progress bar. - // The code depends on progressBar.js import in Page.tag - $.each(data.rows, function() { - this.cell[0] = '' + this.cell[0] + ''; - }); - }, - loadComplete : function(data) { - // display non-grid data - $('#learnerLessonMark').text(data.learnerLessonMark); - $('#averageLessonMark').text(data.averageLessonMark); - }, - loadError : function(xhr,st,err) { - $("#userGradebookGrid").clearGridData(); - $.jgrid.info_dialog('', - '', - ''); + + + + - - + } -

- - - - - -

+ + $(document).ready(function(){ + // Create the organisation view grid with sub grid for users + $("#userGradebookGrid").jqGrid({ + datatype : "json", + url : "gradebook/gradebook/getLessonCompleteGridData.do?lessonID=${lessonID}", + height : "100%", + // use new theme + guiStyle : "bootstrap", + iconSet : 'fontAwesome', + autoencode : false, + colNames : [ + '', + '', + '', + '' + ], + colModel : [ + { + 'name' : 'name', + 'index' : 'name', + 'title' : false + }, + { + 'name' : 'progress', + 'index' : 'progress', + 'align' : 'center', + 'width' : 100, + 'title' : false + }, + { + 'name' : 'averageMark', + 'index' : 'averageMark', + 'align' : 'center', + 'width' : 100, + 'title' : false + }, + { + 'name' : 'mark', + 'index' : 'mark', + 'align' : 'center', + 'width' : 100, + 'title' : false + } + ], + beforeProcessing : function(data) { + // Wrap each activity name in a link to show same pop up + // as if the user clicked the activity in progress bar. + // The code depends on progressBar.js import in Page.tag + $.each(data.rows, function() { + this.cell[0] = '' + this.cell[0] + ''; + }); + }, + loadComplete : function(data) { + // display non-grid data + $('#learnerLessonMark').text(data.learnerLessonMark); + $('#averageLessonMark').text(data.averageLessonMark); + }, + loadError : function(xhr,st,err) { + $("#userGradebookGrid").clearGridData(); + $.jgrid.info_dialog('', + '', + ''); + } + }); + }); + -

- - - - - - - - -

+ - -

- - - - + + +

+ + + + +

- - - +

- + - - + + + + +

- - - -

:

+ +

+ + + + +

+ -

- - \ No newline at end of file + +

+ + + + + +

+ + + +

+ +

:

+ +

+ + + + +