Index: lams_tool_lamc/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/build.xml,v diff -u -r1.43 -r1.44 --- lams_tool_lamc/build.xml 21 Feb 2007 06:57:43 -0000 1.43 +++ lams_tool_lamc/build.xml 15 Aug 2007 03:56:23 -0000 1.44 @@ -253,9 +253,21 @@ + + + + + + + + + + + - + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McQueUsr.hbm.xml,v diff -u -r1.10 -r1.11 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml 14 Feb 2007 11:16:35 -0000 1.10 +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml 15 Aug 2007 03:55:53 -0000 1.11 @@ -69,7 +69,21 @@ > + + + + - - -MCQ Tool for Lams 1.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - + + + +MCQ Tool for Lams 1.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + Index: lams_tool_lamc/db/sql/create_lams_tool_mc.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/create_lams_tool_mc.sql,v diff -u -r1.22 -r1.23 --- lams_tool_lamc/db/sql/create_lams_tool_mc.sql 14 Feb 2007 11:16:35 -0000 1.22 +++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql 15 Aug 2007 03:56:04 -0000 1.23 @@ -71,6 +71,8 @@ , fullname VARCHAR(255) , responseFinalised TINYINT(1) NOT NULL DEFAULT 0 , viewSummaryRequested TINYINT(1) NOT NULL DEFAULT 0 + , last_attempt_order INTEGER + , last_attempt_total_mark INTEGER , PRIMARY KEY (uid) , INDEX (mc_session_id) , CONSTRAINT FK_tl_lamc11_que_usr_1 FOREIGN KEY (mc_session_id) Index: lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/updatescripts/Attic/updateTo20070820.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql 15 Aug 2007 03:56:03 -0000 1.1 @@ -0,0 +1,25 @@ +-- Update the Multiple Choice tables from version 20070214 to 20070820 +-- This is for the LAMS 2.0.1 release. + +ALTER TABLE tl_lamc11_que_usr +ADD COLUMN last_attempt_order INTEGER +, ADD COLUMN last_attempt_total_mark INTEGER + +-- Fix problems with the marks in the attempt table. It was recording the number of questions answered correctly for the activity. +-- Now it records the mark for each question. The overall mark is put in the que_usr table. +update tl_lamc11_usr_attempt a +set a.mark = (select c.mark from tl_lamc11_que_content c where c.uid = a.mc_que_content_id) +where a.isAttemptCorrect = 1; + +update tl_lamc11_usr_attempt a +set a.mark = 0 +where a.isAttemptCorrect = 0; + +-- Now that the individual marks are right, we can recalculate the overall mark for an attempt. We need to find just the +-- final attempt for each user. At present, there can only be one option selected for a question, so we don't +-- need to worry about repeated data. +update tl_lamc11_que_usr qu1 set qu1.last_attempt_order = +( select max(attemptOrder) from tl_lamc11_usr_attempt att where att.que_usr_id = qu1.uid ); + +update tl_lamc11_que_usr qu1 set qu1.last_attempt_total_mark = +( select sum(mark) from tl_lamc11_usr_attempt att where att.que_usr_id = qu1.uid and att.attemptOrder = qu1.last_attempt_order); \ No newline at end of file Index: lams_tool_lamc/web/export/class.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/export/class.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/web/export/class.jsp 15 Aug 2007 03:56:16 -0000 1.1 @@ -0,0 +1,114 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
 
: +   ( + ) +
+ + + + + + +
+ + + +   () + +
+
+ +
+ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: +
+ +   ( ) +
+ + + + + +
+ \ No newline at end of file Index: lams_tool_lamc/web/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/export/exportportfolio.jsp,v diff -u -r1.20 -r1.21 --- lams_tool_lamc/web/export/exportportfolio.jsp 8 Jun 2007 01:38:23 -0000 1.20 +++ lams_tool_lamc/web/export/exportportfolio.jsp 15 Aug 2007 03:56:16 -0000 1.21 @@ -51,271 +51,20 @@ + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + - - - - - -
- -
 
: -   ( - ) -
- - - - - - -
- - - -   () - -
-
- -
- - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: -
- -   ( ) -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
: -   ( - ) -
- - - - - - -
- - - -   () - -
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - () - - -
- - - - - - -
- -
-
- -
- : -
- : -
- - - - - - - - - - - - -
-   -
- - - - - - - - - - - - - - - - - - - - - -
- -
- : - - - - -
-
- - - - - - - - Index: lams_tool_lamc/web/export/learner.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/export/learner.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/web/export/learner.jsp 15 Aug 2007 03:56:16 -0000 1.1 @@ -0,0 +1,72 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + + + + + + <%-- only expect one entry for the following two maps as it is one entry per session and then one per user --%> + + + + + + + + + + + + + +
 
: +   ( + ) +
+ + + + + + +
+ + + +   () + +
+
+ + + + + + + + + + + + + + +
()
+ : +
+
+ : +
+ : +
\ No newline at end of file Index: lams_tool_lamc/web/export/reflections.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/export/reflections.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/web/export/reflections.jsp 15 Aug 2007 03:56:16 -0000 1.1 @@ -0,0 +1,45 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + +
+   +
+ + + + + + + + + + + + + + + + + + + + + +
+ +
+ : + + + + +
+
\ No newline at end of file Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/CombinedAnswersContent.jsp,v diff -u -r1.28 -r1.29 --- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp 5 Dec 2006 03:02:23 -0000 1.28 +++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp 15 Aug 2007 03:56:16 -0000 1.29 @@ -56,7 +56,7 @@
- + [ Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/IndividualLearnerResults.jsp,v diff -u -r1.46 -r1.47 --- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp 8 Jun 2007 01:38:22 -0000 1.46 +++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp 15 Aug 2007 03:56:16 -0000 1.47 @@ -84,7 +84,7 @@

- + Index: lams_tool_lamc/web/learning/RedoQuestions.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/RedoQuestions.jsp,v diff -u -r1.26 -r1.27 --- lams_tool_lamc/web/learning/RedoQuestions.jsp 8 Jun 2007 01:38:21 -0000 1.26 +++ lams_tool_lamc/web/learning/RedoQuestions.jsp 15 Aug 2007 03:56:16 -0000 1.27 @@ -87,9 +87,9 @@

- + - +

Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp,v diff -u -r1.26 -r1.27 --- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp 17 Dec 2006 22:47:44 -0000 1.26 +++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp 15 Aug 2007 03:56:16 -0000 1.27 @@ -37,7 +37,7 @@ test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.passMark != '0'}"> ( ) > + value="${mcGeneralLearnerFlowDTO.passMark}" /> ) @@ -55,7 +55,7 @@
- + [ Index: lams_tool_lamc/web/learning/ViewAnswers.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v diff -u -r1.53 -r1.54 --- lams_tool_lamc/web/learning/ViewAnswers.jsp 8 Jun 2007 01:38:22 -0000 1.53 +++ lams_tool_lamc/web/learning/ViewAnswers.jsp 15 Aug 2007 03:56:16 -0000 1.54 @@ -214,7 +214,7 @@
+ test="${((mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true'))}">