Index: lams_tool_lamc/build.xml =================================================================== diff -u -raf25ca5039b2313e92284652b0e100812391440b -rf04e5eaf5a3b6bd01c39426e993609857686d936 --- lams_tool_lamc/build.xml (.../build.xml) (revision af25ca5039b2313e92284652b0e100812391440b) +++ lams_tool_lamc/build.xml (.../build.xml) (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -253,9 +253,21 @@ + + + + + + + + + + + - + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== diff -u -ra51515ebaa71710396deb9a1fa11724023f7479f -rf04e5eaf5a3b6bd01c39426e993609857686d936 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision a51515ebaa71710396deb9a1fa11724023f7479f) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -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 =================================================================== diff -u -ra51515ebaa71710396deb9a1fa11724023f7479f -rf04e5eaf5a3b6bd01c39426e993609857686d936 --- lams_tool_lamc/db/sql/create_lams_tool_mc.sql (.../create_lams_tool_mc.sql) (revision a51515ebaa71710396deb9a1fa11724023f7479f) +++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql (.../create_lams_tool_mc.sql) (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -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 =================================================================== diff -u --- lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql (revision 0) +++ lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -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 =================================================================== diff -u --- lams_tool_lamc/web/export/class.jsp (revision 0) +++ lams_tool_lamc/web/export/class.jsp (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -0,0 +1,114 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
 
: +   ( + ) +
+ + + + + + +
+ + + +   () + +
+
+ +
+ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: +
+ +   ( ) +
+ + + + + +
+ \ No newline at end of file Index: lams_tool_lamc/web/export/exportportfolio.jsp =================================================================== diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -rf04e5eaf5a3b6bd01c39426e993609857686d936 --- lams_tool_lamc/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) +++ lams_tool_lamc/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -51,271 +51,20 @@ + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + - - - - - -
- -
 
: -   ( - ) -
- - - - - - -
- - - -   () - -
-
- -
- - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: -
- -   ( ) -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
: -   ( - ) -
- - - - - - -
- - - -   () - -
-
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - () - - -
- - - - - - -
- -
-
- -
- : -
- : -
- - - - - - - - - - - - -
-   -
- - - - - - - - - - - - - - - - - - - - - -
- -
- : - - - - -
-
- - - - - - - - Index: lams_tool_lamc/web/export/learner.jsp =================================================================== diff -u --- lams_tool_lamc/web/export/learner.jsp (revision 0) +++ lams_tool_lamc/web/export/learner.jsp (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -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 =================================================================== diff -u --- lams_tool_lamc/web/export/reflections.jsp (revision 0) +++ lams_tool_lamc/web/export/reflections.jsp (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -0,0 +1,45 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + +
+   +
+ + + + + + + + + + + + + + + + + + + + + +
+ +
+ : + + + + +
+
\ No newline at end of file Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp =================================================================== diff -u -r54782040456712801d69b620cfd567f7dbf39059 -rf04e5eaf5a3b6bd01c39426e993609857686d936 --- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp (.../CombinedAnswersContent.jsp) (revision 54782040456712801d69b620cfd567f7dbf39059) +++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp (.../CombinedAnswersContent.jsp) (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -56,7 +56,7 @@
- + [ Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp =================================================================== diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -rf04e5eaf5a3b6bd01c39426e993609857686d936 --- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) +++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -84,7 +84,7 @@

- + Index: lams_tool_lamc/web/learning/RedoQuestions.jsp =================================================================== diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -rf04e5eaf5a3b6bd01c39426e993609857686d936 --- lams_tool_lamc/web/learning/RedoQuestions.jsp (.../RedoQuestions.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) +++ lams_tool_lamc/web/learning/RedoQuestions.jsp (.../RedoQuestions.jsp) (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -87,9 +87,9 @@

- + - +

Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp =================================================================== diff -u -rcdcf81bed7731048affeec8f53caa5865c8fe045 -rf04e5eaf5a3b6bd01c39426e993609857686d936 --- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp (.../SingleQuestionAnswersContent.jsp) (revision cdcf81bed7731048affeec8f53caa5865c8fe045) +++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp (.../SingleQuestionAnswersContent.jsp) (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -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 =================================================================== diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -rf04e5eaf5a3b6bd01c39426e993609857686d936 --- lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) +++ lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision f04e5eaf5a3b6bd01c39426e993609857686d936) @@ -214,7 +214,7 @@
+ test="${((mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true'))}">