Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/create_lams_tool_assessment.sql,v diff -u -r1.18 -r1.19 --- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql 18 May 2011 18:48:24 -0000 1.18 +++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql 2 Jun 2011 04:18:30 -0000 1.19 @@ -42,6 +42,7 @@ allow_wrong_answers tinyint, allow_grades_after_attempt tinyint, allow_history_responses tinyint, + display_summary tinyint, questions_per_page integer DEFAULT 0, shuffled tinyint, attempt_completion_notify tinyint DEFAULT 0, @@ -171,7 +172,7 @@ INSERT INTO `tl_laasse10_assessment` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_question_feedback`, - `allow_overall_feedback`, `allow_right_answers`, `allow_wrong_answers`, `allow_grades_after_attempt`, `allow_history_responses`, `shuffled`) VALUES - (1,NULL,NULL,NULL,'Assessment','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0,0); + `allow_overall_feedback`, `allow_right_answers`, `allow_wrong_answers`, `allow_grades_after_attempt`, `allow_history_responses`, `display_summary`, `shuffled`) VALUES + (1,NULL,NULL,NULL,'Assessment','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0,0,0); SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql,v diff -u -r1.2 -r1.3 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql 18 May 2011 18:48:24 -0000 1.2 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql 2 Jun 2011 04:18:30 -0000 1.3 @@ -8,6 +8,10 @@ -- LDEV-2657 Date and time restriction ALTER TABLE tl_laasse10_assessment ADD COLUMN submission_deadline DATETIME DEFAULT null; +-- LDEV-2684 Option for not displaying answers summary + +ALTER TABLE tl_laasse10_assessment ADD COLUMN display_summary tinyint DEFAULT false; + ----------------------Put all sql statements above here------------------------- -- If there were no errors, commit and restore autocommit to on Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java,v diff -u -r1.8 -r1.9 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java 18 May 2011 18:48:24 -0000 1.8 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java 2 Jun 2011 04:18:30 -0000 1.9 @@ -83,6 +83,8 @@ private boolean allowHistoryResponses; + private boolean displaySummary; + private boolean defineLater; private boolean contentInUse; @@ -598,6 +600,20 @@ } /** + * @hibernate.property column="display_summary" + * @return + */ + public boolean isDisplaySummary() { + return displaySummary; + } + + public void setDisplaySummary(boolean displaySummary) { + this.displaySummary = displaySummary; + } + + + + /** * @hibernate.property column="questions_per_page" * @return */ Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java,v diff -u -r1.3 -r1.4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java 2 Mar 2010 13:10:00 -0000 1.3 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java 2 Jun 2011 04:18:30 -0000 1.4 @@ -81,6 +81,7 @@ assessment.setDefineLater(false); assessment.setShuffled(false); assessment.setRunOffline(false); + assessment.setDisplaySummary(false); } } Index: lams_tool_assessment/web/pages/authoring/advance.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/advance.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_assessment/web/pages/authoring/advance.jsp 2 Mar 2010 13:10:00 -0000 1.3 +++ lams_tool_assessment/web/pages/authoring/advance.jsp 2 Jun 2011 04:18:30 -0000 1.4 @@ -96,6 +96,14 @@

+ + + +

+ +

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.16 -r1.17 --- lams_tool_assessment/web/pages/learning/learning.jsp 18 May 2011 18:48:24 -0000 1.16 +++ lams_tool_assessment/web/pages/learning/learning.jsp 2 Jun 2011 04:18:30 -0000 1.17 @@ -174,71 +174,15 @@
<%@ include file="parts/attemptsummary.jsp"%> - -

- - - - - - - -
- ${status.index + sessionMap.questionNumberingOffset} - - - -
- ${question.question} -
- - - - <%@ include file="parts/multiplechoice.jsp"%> - - - <%@ include file="parts/matchingpairs.jsp"%> - - - <%@ include file="parts/shortanswer.jsp"%> - - - <%@ include file="parts/numerical.jsp"%> - - - <%@ include file="parts/truefalse.jsp"%> - - - <%@ include file="parts/essay.jsp"%> - - - <%@ include file="parts/ordering.jsp"%> - - - - <%@ include file="parts/questionsummary.jsp"%> -
-
- - -
- - - - - - - - - - - ${status.index + 1} - - -
+ + <%@ include file="parts/allquestions.jsp"%> + + <%@ include file="parts/allquestions.jsp"%> + +
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/learning/parts/allquestions.jsp'. Fisheye: No comparison available. Pass `N' to diff?