Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.20 -r1.21 --- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties 25 Mar 2009 22:46:28 -0000 1.20 +++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties 26 Mar 2009 19:07:06 -0000 1.21 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/tool_insert.sql,v diff -u -r1.3 -r1.4 --- lams_tool_assessment/db/sql/tool_insert.sql 26 Mar 2009 10:00:36 -0000 1.3 +++ lams_tool_assessment/db/sql/tool_insert.sql 26 Mar 2009 19:07:06 -0000 1.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java,v diff -u -r1.14 -r1.15 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java 25 Mar 2009 22:46:28 -0000 1.14 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java 26 Mar 2009 19:07:06 -0000 1.15 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml,v diff -u -r1.7 -r1.8 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml 26 Mar 2009 10:00:36 -0000 1.7 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml 26 Mar 2009 19:07:06 -0000 1.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml 26 Mar 2009 19:07:06 -0000 1.1 @@ -0,0 +1,11 @@ + + + + + + + + + + + Index: lams_tool_assessment/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/web.xml,v diff -u -r1.3 -r1.4 --- lams_tool_assessment/web/WEB-INF/web.xml 26 Mar 2009 10:00:36 -0000 1.3 +++ lams_tool_assessment/web/WEB-INF/web.xml 26 Mar 2009 19:07:06 -0000 1.4 @@ -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/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/summary.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_assessment/web/pages/monitoring/summary.jsp 25 Mar 2009 22:46:28 -0000 1.6 +++ lams_tool_assessment/web/pages/monitoring/summary.jsp 26 Mar 2009 19:07:06 -0000 1.7 @@ -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"%>
Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp 25 Mar 2009 22:46:28 -0000 1.1 +++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp 26 Mar 2009 19:07:06 -0000 1.2 @@ -1,5 +1,6 @@ <%@ include file="/common/taglibs.jsp"%> - Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp 25 Mar 2009 22:46:28 -0000 1.3 +++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp 26 Mar 2009 19:07:05 -0000 1.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp 19 Mar 2009 22:06:53 -0000 1.2 +++ lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp 26 Mar 2009 19:07:06 -0000 1.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp 25 Mar 2009 22:46:28 -0000 1.5 +++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp 26 Mar 2009 19:07:06 -0000 1.6 @@ -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); } },