Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v diff -u -r1.46 -r1.47 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 6 Jun 2014 16:41:01 -0000 1.46 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 27 Jun 2014 23:18:18 -0000 1.47 @@ -473,7 +473,7 @@ AssessmentQuestionResult questionAnswer = null; // get questionResult from DB instance of AssessmentResult for (AssessmentQuestionResult dbQuestionAnswer : assessmentResult.getQuestionResults()) { - if (question.equals(dbQuestionAnswer.getAssessmentQuestion())) { + if (question.getUid().equals(dbQuestionAnswer.getAssessmentQuestion().getUid())) { questionAnswer = dbQuestionAnswer; } } @@ -483,6 +483,7 @@ questionAnswer = new AssessmentQuestionResult(); questionAnswer.setAssessmentQuestion(question); questionAnswer.setAssessmentResult(assessmentResult); + assessmentResult.getQuestionResults().add(questionAnswer); Set optionAnswers = questionAnswer.getOptionAnswers(); for (AssessmentQuestionOption option : question.getOptions()) { Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java,v diff -u -r1.7 -r1.8 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java 17 Jan 2014 21:35:01 -0000 1.7 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java 27 Jun 2014 23:18:18 -0000 1.8 @@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRequest; import org.lamsfoundation.lams.learning.export.web.action.Bundler; +import org.lamsfoundation.lams.tool.assessment.AssessmentConstants; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HttpUrlConnectionUtil; @@ -77,6 +78,7 @@ for (String directoryName : directoriesNames) { directories.add(outputDirectory + File.separator + "javascript" + File.separator + directoryName); } + directories.add(outputDirectory + File.separator + "css"); this.createDirectories(directories); String[] imageNames = new String[] { "ui-bg_flat_0_aaaaaa_40x100.png", "ui-bg_flat_55_fbec88_40x100.png", @@ -112,6 +114,10 @@ urlToConnectTo = getServerUrl() + "css" + URL_SEPARATOR + "jquery.jqGrid.css"; directoryToStoreFile = outputDirectory + File.separator + "javascript" + File.separator + "css"; HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, "jquery.jqGrid.css", cookies); + + urlToConnectTo = getAssessmentToolUrlDir() + "css" + URL_SEPARATOR + "assessment.css"; + directoryToStoreFile = outputDirectory + File.separator + "css"; + HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, "assessment.css", cookies); } @@ -128,5 +134,10 @@ return serverUrl; } } + + private String getAssessmentToolUrlDir() { + String toolFolder = getServerUrl() + "tool" + URL_SEPARATOR + AssessmentConstants.TOOL_SIGNATURE + URL_SEPARATOR + "includes" + URL_SEPARATOR; + return toolFolder; + } } Index: lams_tool_assessment/web/common/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/common/header.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_assessment/web/common/header.jsp 13 Dec 2010 23:43:36 -0000 1.2 +++ lams_tool_assessment/web/common/header.jsp 27 Jun 2014 23:18:18 -0000 1.3 @@ -3,14 +3,13 @@ - - - + + + + + + + - - - - - Index: lams_tool_assessment/web/includes/css/assessment.css =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/includes/css/assessment.css,v diff -u -r1.1 -r1.2 --- lams_tool_assessment/web/includes/css/assessment.css 29 Jan 2009 05:59:05 -0000 1.1 +++ lams_tool_assessment/web/includes/css/assessment.css 27 Jun 2014 23:18:18 -0000 1.2 @@ -1,3 +1,43 @@ +table.forum th { + font-size: inherit; + border-left: none; +} +table.forum { + background:none; + border: 1px solid #cacdd1; + padding-top:0px; + margin-bottom: 10px; + border-spacing: 0px; + border-collapse: separate; +} +table.forum.question-summary-table { + width: 83%; + padding: 0px 15px 0px; + font-style: italic; + color:#47bc23; + border: none; +} +table.forum.question-summary-table th{ + padding-top:0px; +} +table.forum.question-summary-table th:first-child{ + width: 30px; + border-left: none; + padding-left:0px; + text-align: center; +} +table.forum.question-summary-table td{ + padding-left: 15px; + vertical-align: middle; + background: none; +} +table.forum.question-summary-table td:first-child{ + padding-left: 10px; +} +table.forum.question-summary-table tr:last-child td{ + border-bottom: none; +} + .innerforms { border: 0px; font-size: small; @@ -31,3 +71,73 @@ div.message img.icon { vertical-align: middle; } + +div.growlUI { + background: url(check48.png) no-repeat 10px 10px +} +div.growlUI h1, div.growlUI h2 { + color: white; + padding: 5px 5px 5px 0px; + text-align: center; +} + +table.alternative-color td.question-numbers { + padding: 15px 15px 15px; + width: 10px; + font-weight: bold; +} +table.question-table { + padding-bottom: 10px; + border-spacing: 0; + border-collapse: separate; +} +table.question-table td { + vertical-align:middle; + background:none; + border-bottom:0px; +} +.question-table .has-radio-button { + padding:5px 0px 2px 15px; + width: 5px; +} +.question-table .complete-item-gif { + padding:5px 0px 2px 15px; + width: 7px; +} +.question-table .complete-item-gif img { + border:1px; +} +.question-type { + padding: 10px 15px 7px; + font-style: italic; +} +.question-table .question-feedback, div.question-feedback { + padding: 10px 15px 0px; + font-style: italic; + color:#47bc23; +} +.question-table .question-option { + padding:5px 10px 2px; +} +.question-table .reg-padding { + padding:5px 0px 2px 15px; +} +#quesion-summary-title { + padding: 2px 15px 10px; + font-style: italic; + color:#47bc23; +} + + +#pager { + text-align: center; + padding-top: 60px; +} +#pager a{ + margin-left: 10px; + font-size: 130%; +} +.color-red { + color: red; +} + Index: lams_tool_assessment/web/pages/export/parts/exportlearner.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/export/parts/exportlearner.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_assessment/web/pages/export/parts/exportlearner.jsp 6 Apr 2014 20:27:59 -0000 1.8 +++ lams_tool_assessment/web/pages/export/parts/exportlearner.jsp 27 Jun 2014 23:18:18 -0000 1.9 @@ -11,6 +11,7 @@ + @@ -81,7 +82,7 @@

- +
Index: lams_tool_assessment/web/pages/export/parts/exportteacher.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/export/parts/exportteacher.jsp,v diff -u -r1.10 -r1.11 --- lams_tool_assessment/web/pages/export/parts/exportteacher.jsp 10 Apr 2014 21:10:52 -0000 1.10 +++ lams_tool_assessment/web/pages/export/parts/exportteacher.jsp 27 Jun 2014 23:18:18 -0000 1.11 @@ -12,6 +12,7 @@ + @@ -163,7 +164,7 @@
- +
+ +
Index: lams_tool_assessment/web/pages/learning/learning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/learning.jsp,v diff -u -r1.32 -r1.33 --- lams_tool_assessment/web/pages/learning/learning.jsp 7 Apr 2014 22:06:39 -0000 1.32 +++ lams_tool_assessment/web/pages/learning/learning.jsp 27 Jun 2014 23:18:18 -0000 1.33 @@ -1,7 +1,6 @@ - - + <%@ include file="/common/taglibs.jsp"%> + @@ -36,12 +35,6 @@ - Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/allquestions.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp 11 Dec 2013 11:41:23 -0000 1.6 +++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp 27 Jun 2014 23:18:18 -0000 1.7 @@ -1,68 +1,67 @@ <%@ include file="/common/taglibs.jsp"%> -
- - - - - - + +
- ${status.index + sessionMap.questionNumberingOffset} -
+ + + + + - - - -
+ ${status.index + sessionMap.questionNumberingOffset} + - + + -
- ${question.question} -
+
+ ${question.question} +
- - - <%@ include file="multiplechoice.jsp"%> - - - <%@ include file="matchingpairs.jsp"%> - - - <%@ include file="shortanswer.jsp"%> - - - <%@ include file="numerical.jsp"%> - - - <%@ include file="truefalse.jsp"%> - - - <%@ include file="essay.jsp"%> - - - <%@ include file="ordering.jsp"%> - - - - <%@ include file="questionsummary.jsp"%> -
-
- - - - - - + + <%@ include file="matchingpairs.jsp"%> + + + <%@ include file="shortanswer.jsp"%> + + + <%@ include file="numerical.jsp"%> + + + <%@ include file="truefalse.jsp"%> + + + <%@ include file="essay.jsp"%> + + + <%@ include file="ordering.jsp"%> + + + + <%@ include file="questionsummary.jsp"%> + +
+ + + + + + Index: lams_tool_assessment/web/pages/learning/parts/attemptsummary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/attemptsummary.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_assessment/web/pages/learning/parts/attemptsummary.jsp 7 Apr 2014 21:58:15 -0000 1.3 +++ lams_tool_assessment/web/pages/learning/parts/attemptsummary.jsp 27 Jun 2014 23:18:18 -0000 1.4 @@ -1,7 +1,7 @@ - +
- - - - -
+ @@ -10,15 +10,15 @@
+
+ @@ -28,7 +28,7 @@
+ @@ -40,7 +40,7 @@
+ Index: lams_tool_assessment/web/pages/learning/parts/essay.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/essay.jsp,v diff -u -r1.7 -r1.8 --- lams_tool_assessment/web/pages/learning/parts/essay.jsp 8 Jan 2014 17:47:02 -0000 1.7 +++ lams_tool_assessment/web/pages/learning/parts/essay.jsp 27 Jun 2014 23:18:18 -0000 1.8 @@ -1,12 +1,12 @@ <%@ include file="/common/taglibs.jsp"%> -
+
- +
- -
+ @@ -20,6 +20,6 @@
+
<%@ include file="markandpenaltyarea.jsp"%> \ No newline at end of file Index: lams_tool_assessment/web/pages/learning/parts/markandpenaltyarea.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/markandpenaltyarea.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_assessment/web/pages/learning/parts/markandpenaltyarea.jsp 22 Mar 2012 08:59:51 -0000 1.6 +++ lams_tool_assessment/web/pages/learning/parts/markandpenaltyarea.jsp 27 Jun 2014 23:18:18 -0000 1.7 @@ -3,13 +3,13 @@ -
+
-
+
${question.defaultGrade} Index: lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp 21 Apr 2014 22:14:02 -0000 1.9 +++ lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp 27 Jun 2014 23:18:18 -0000 1.10 @@ -1,28 +1,28 @@ <%@ include file="/common/taglibs.jsp"%> -
+
- +
- - -
+ - + - + + + Index: lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp 21 Apr 2014 22:14:02 -0000 1.9 +++ lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp 27 Jun 2014 23:18:18 -0000 1.10 @@ -1,6 +1,6 @@ <%@ include file="/common/taglibs.jsp"%> -
+
@@ -11,23 +11,23 @@
- +
- + - - @@ -59,7 +59,7 @@ - @@ -71,17 +71,17 @@ -
+
-
+
-
+
Index: lams_tool_assessment/web/pages/learning/parts/numerical.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/numerical.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_assessment/web/pages/learning/parts/numerical.jsp 8 Jan 2014 17:47:02 -0000 1.8 +++ lams_tool_assessment/web/pages/learning/parts/numerical.jsp 27 Jun 2014 23:18:18 -0000 1.9 @@ -1,24 +1,24 @@ <%@ include file="/common/taglibs.jsp"%> -
+
-
+ - + - + - + + +
+
- -
+ - + - + + disabled="disabled" /> @@ -27,7 +27,7 @@
-
+
Index: lams_tool_assessment/web/pages/learning/parts/ordering.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/ordering.jsp,v diff -u -r1.10 -r1.11 --- lams_tool_assessment/web/pages/learning/parts/ordering.jsp 21 Apr 2014 22:14:02 -0000 1.10 +++ lams_tool_assessment/web/pages/learning/parts/ordering.jsp 27 Jun 2014 23:18:18 -0000 1.11 @@ -7,20 +7,20 @@
-
+
- +
- -
+ + " @@ -50,7 +50,7 @@
-
+
Index: lams_tool_assessment/web/pages/learning/parts/questionsummary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/questionsummary.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_assessment/web/pages/learning/parts/questionsummary.jsp 21 Apr 2014 22:14:02 -0000 1.4 +++ lams_tool_assessment/web/pages/learning/parts/questionsummary.jsp 27 Jun 2014 23:18:18 -0000 1.5 @@ -1,23 +1,23 @@ <%@ include file="/common/taglibs.jsp"%> -
+
- +
- - - - @@ -26,18 +26,15 @@ - - - - - - +
+ # + + +
+ ${status.index + 1} +
${currentAssessmentResult.finishDate}
+ @@ -101,16 +98,14 @@ +
\ No newline at end of file Index: lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp 8 Jan 2014 17:47:02 -0000 1.8 +++ lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp 27 Jun 2014 23:18:18 -0000 1.9 @@ -1,24 +1,24 @@ <%@ include file="/common/taglibs.jsp"%> -
+
- +
- -
+ - + - + + disabled="disabled" /> @@ -27,7 +27,7 @@
-
+
Index: lams_tool_assessment/web/pages/learning/parts/truefalse.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/truefalse.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_assessment/web/pages/learning/parts/truefalse.jsp 8 Jan 2014 17:47:02 -0000 1.6 +++ lams_tool_assessment/web/pages/learning/parts/truefalse.jsp 27 Jun 2014 23:18:18 -0000 1.7 @@ -1,68 +1,68 @@ <%@ include file="/common/taglibs.jsp"%> -
+
- +
- - - - - - @@ -72,12 +72,12 @@ -
+
-
+
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.11 -r1.12 --- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp 27 Mar 2014 00:57:00 -0000 1.11 +++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp 27 Jun 2014 23:18:18 -0000 1.12 @@ -146,7 +146,7 @@

<%@ include file="/common/messages.jsp"%> -
+ - + - + - checked="checked" - disabled="disabled" - /> + + checked="checked" + disabled="disabled" + /> +
+ - + - + - checked="checked" - disabled="disabled" - /> + + checked="checked" + disabled="disabled" + /> +
+
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.15 -r1.16 --- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp 6 Apr 2014 20:30:24 -0000 1.15 +++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp 27 Jun 2014 23:18:18 -0000 1.16 @@ -136,7 +136,7 @@

<%@ include file="/common/messages.jsp"%> - +