Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 --- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 6e6db32c93f144dc842f21601eb37745cdd7ca60) +++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -206,8 +206,9 @@ label.monitoring.summary.results.question =Detailed question results label.monitoring.summary.see.results =See results label.monitoring.summary.choose =Choose... -label.monitoring.summary.user.name =User name +label.monitoring.summary.user.name =Name label.monitoring.summary.total =Total +label.monitoring.summary.learner.summary =Learner summary label.monitoring.user.summary.history.responses =User's history of responses label.monitoring.user.summary.user.name =User Name label.monitoring.user.summary.number.attempts =Number of attempts Index: lams_tool_assessment/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 --- lams_tool_assessment/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_assessment/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -34,10 +34,10 @@ VALUES ( 'laasse10', -'assessmentService', -'Shared Assessment', -'Shared Assessment', -'sharedassessment', +'laasseAssessmentService', +'Assessment', +'Assessment', +'assessment', '@tool_version@', NULL, NULL, @@ -59,4 +59,4 @@ NOW(), NOW(), 1 -) +) \ No newline at end of file Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java =================================================================== diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java (.../AssessmentConstants.java) (revision 6e6db32c93f144dc842f21601eb37745cdd7ca60) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java (.../AssessmentConstants.java) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -26,9 +26,9 @@ public class AssessmentConstants { public static final String TOOL_SIGNATURE = "laasse10"; - public static final String ASSESSMENT_SERVICE = "assessmentService"; + public static final String ASSESSMENT_SERVICE = "laasseAssessmentService"; - public static final String TOOL_CONTENT_HANDLER_NAME = "assessmentToolContentHandler"; + public static final String TOOL_CONTENT_HANDLER_NAME = "laasseAssessmentToolContentHandler"; public static final int COMPLETED = 1; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -4,90 +4,89 @@ - + - + org.lamsfoundation.lams.tool.assessment.ApplicationResources - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -107,8 +106,12 @@ - - + + + + + + @@ -121,10 +124,10 @@ - + - + false @@ -153,5 +156,4 @@ - - + \ No newline at end of file Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml =================================================================== diff -u --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml (revision 0) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -0,0 +1,11 @@ + + + + + + + + + + + Index: lams_tool_assessment/web/WEB-INF/web.xml =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 --- lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -1,17 +1,17 @@ - Shared Assessment + Assessment - Shared Assessment tool + Assessment tool javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.assessment.ApplicationResources contextConfigLocation - + classpath:/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml locatorFactorySelector @@ -130,7 +130,7 @@ org.lamsfoundation.lams.contentrepository.client.ToolDownload toolContentHandlerBeanName - assessmentToolContentHandler + laasseAssessmentToolContentHandler 3 @@ -355,4 +355,4 @@ /404.jsp - + \ No newline at end of file Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp =================================================================== diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 --- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp (.../masterDetailLoadUp.jsp) (revision 6e6db32c93f144dc842f21601eb37745cdd7ca60) +++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp (.../masterDetailLoadUp.jsp) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -1,5 +1,6 @@ <%@ include file="/common/taglibs.jsp"%> - Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp =================================================================== diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 --- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 6e6db32c93f144dc842f21601eb37745cdd7ca60) +++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -53,10 +53,8 @@ }, afterSaveCell : function (rowid,name,val,iRow,iCol){ var questionResultUid = jQuery("#session${session.sessionId}").getCell(rowid, 'questionResultUid'); - //alert(isNaN(val)); if (isNaN(val) || (questionResultUid=="")) { jQuery("#session${session.sessionId}").restoreCell(iRow,iCol); - //alert(jQuery("#session${session.sessionId}").getCell(iRow,iCol)); } else { var averageMark = (eval($("#averageMark").html())*numberOfValues - eval(previousCellValue) + eval(val))/numberOfValues; $("#averageMark").html(averageMark); Index: lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp =================================================================== diff -u -r7f0968bf243209b9fc78a0f8f4d4b3bdbc3b7649 -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 --- lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp (.../userresponse.jsp) (revision 7f0968bf243209b9fc78a0f8f4d4b3bdbc3b7649) +++ lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp (.../userresponse.jsp) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -9,27 +9,28 @@ - responseStr +=''; - - responseStr +=''; - responseStr +=''; - responseStr +=''; - responseStr +=''; - - responseStr +='
'; - responseStr +="${questionOption.question}"; - responseStr +=''; - responseStr +='-'; - - - - - responseStr +="${questionOption2.optionString}"; - - - - - responseStr +='
'; + + responseStr +='
'; + responseStr +='
'; + responseStr +="${questionOption.question}"; + responseStr +='
'; + responseStr +='
'; + responseStr +=' - '; + + + + + responseStr +="${questionOption2.optionString}"; + + + + + responseStr +='
'; + responseStr +='
'; + responseStr +='
'; + +
+
responseStr +="${questionResult.answerString}"; Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp =================================================================== diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 --- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 6e6db32c93f144dc842f21601eb37745cdd7ca60) +++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -49,7 +49,7 @@ cellurl: '', cellEdit: true, afterSaveCell : function (rowid,name,val,iRow,iCol){ - if (isNaN(val)) { + if (isNaN(val) || (questionResultUid=="")) { jQuery("#user${question.uid}").restoreCell(iRow,iCol); } }, Index: lams_tool_assessment/web/pages/monitoring/summary.jsp =================================================================== diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 --- lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 6e6db32c93f144dc842f21601eb37745cdd7ca60) +++ lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) @@ -32,7 +32,7 @@ {name:'${question.uid}', index:'${question.uid}', width:60, align:"right", sorttype:"float"}, - {name:'total',index:'total', width:50,align:"right",sorttype:"float"} + {name:'total',index:'total', width:50,align:"right",sorttype:"float", formatter:'number', formatoptions:{decimalPlaces: 2}} ], imgpath: pathToImageFolder + "jqGrid.basic.theme", @@ -53,10 +53,7 @@ var userId = jQuery("#list${summary.sessionId}").getCell(rowid, 'userId'); var sessionId = jQuery("#list${summary.sessionId}").getCell(rowid, 'sessionId'); var userMasterDetailUrl = ''; - //userMasterDetailUrl += "?userID=" + userId + "&sessionId=" + sessionId; - jQuery("#userSummary${summary.sessionId}").clearGridData().setGridParam({gridstate: "visible",caption:"ss"}).trigger("reloadGrid"); - // jQuery("#userSummary${summary.sessionId}").setGridParam({caption:"ss"}); - // jQuery("#userSummary${summary.sessionId}").trigger("reloadGrid"); + jQuery("#userSummary${summary.sessionId}").clearGridData().setGridParam({gridstate: "visible"}).trigger("reloadGrid"); $("#masterDetailArea").load( userMasterDetailUrl, { @@ -93,12 +90,12 @@ jQuery("#userSummary${summary.sessionId}").jqGrid({ datatype: "local", - - hiddengrid: true, + gridstate:"hidden", + //hiddengrid:true, height: 90, width: 530, shrinkToFit: false, - + caption: '', colNames:['#', 'questionResultUid', 'Question', @@ -115,12 +112,19 @@ imgpath: pathToImageFolder + "jqGrid.basic.theme", multiselect: false, - caption: "User summary", + cellurl: '', cellEdit: true, afterSaveCell : function (rowid,name,val,iRow,iCol){ + //var questionResultUid = jQuery("#session${session.sessionId}").getCell(rowid, 'questionResultUid'); || (questionResultUid=="") if (isNaN(val)) { jQuery("#userSummary${summary.sessionId}").restoreCell(iRow,iCol); + } else { + var parentSelectedRowId = jQuery("#list${summary.sessionId}").getGridParam("selrow"); + var previousValue = eval(jQuery("#list${summary.sessionId}").getCell(parentSelectedRowId, eval(rowid)+3)); + var previousTotal = eval(jQuery("#list${summary.sessionId}").getCell(parentSelectedRowId, 'total')); + jQuery("#list${summary.sessionId}").setCell(parentSelectedRowId, eval(rowid)+3, val, {}, {}); + jQuery("#list${summary.sessionId}").setCell(parentSelectedRowId, 'total', previousTotal - previousValue + eval(val), {}, {}); } }, beforeSubmitCell : function (rowid,name,val,iRow,iCol){ @@ -181,6 +185,9 @@ + + +
<%@ include file="parts/masterDetailLoadUp.jsp"%>