Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.4.2.3.2.7 -r1.4.2.3.2.8
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties 16 May 2011 04:04:46 -0000 1.4.2.3.2.7
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties 2 Jun 2011 02:14:29 -0000 1.4.2.3.2.8
@@ -104,6 +104,7 @@
label.authoring.advance.allow.students.right.wrong.answers =Allow students to see right/wrong answers
label.authoring.advance.allow.students.grades =Allow students to see grades at the end of each attempt
label.authoring.advance.allow.students.history.responses =Allow students to see history of responses at the end of each attempt
+label.authoring.advance.display.summary = Display all questions and answers once the student finishes.
label.authoring.advance.overall.feedback =Overall feedback
label.authoring.advance.grade.boundary =Grade boundary
label.authoring.advance.feedback =Feedback
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.12.2.2.2.4 -r1.12.2.2.2.5
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql 13 Apr 2011 20:11:54 -0000 1.12.2.2.2.4
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql 2 Jun 2011 02:14:29 -0000 1.12.2.2.2.5
@@ -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.1.2.1 -r1.1.2.2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql 13 Apr 2011 20:11:54 -0000 1.1.2.1
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql 2 Jun 2011 02:14:29 -0000 1.1.2.2
@@ -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.5.6.3 -r1.5.6.4
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java 13 Apr 2011 20:11:54 -0000 1.5.6.3
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java 2 Jun 2011 02:14:29 -0000 1.5.6.4
@@ -83,6 +83,8 @@
private boolean allowHistoryResponses;
+ private boolean displaySummary;
+
private boolean defineLater;
private boolean contentInUse;
@@ -597,7 +599,22 @@
this.allowHistoryResponses = allowHistoryResponses;
}
+
/**
+ * @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.2.8.1 -r1.2.8.2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java 25 Feb 2010 23:47:12 -0000 1.2.8.1
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java 2 Jun 2011 02:14:29 -0000 1.2.8.2
@@ -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.2.8.1 -r1.2.8.2
--- lams_tool_assessment/web/pages/authoring/advance.jsp 25 Feb 2010 23:47:12 -0000 1.2.8.1
+++ lams_tool_assessment/web/pages/authoring/advance.jsp 2 Jun 2011 02:14:29 -0000 1.2.8.2
@@ -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.10.6.4 -r1.10.6.5
--- lams_tool_assessment/web/pages/learning/learning.jsp 13 Apr 2011 20:11:54 -0000 1.10.6.4
+++ lams_tool_assessment/web/pages/learning/learning.jsp 2 Jun 2011 02:14:29 -0000 1.10.6.5
@@ -171,8 +171,11 @@
<%@ include file="/common/messages.jsp"%>
+
<%@ include file="parts/attemptsummary.jsp"%>
+
+
+
+