Update of /cvsroot/aimmath/AIM/WEB-INF/maple/aim/review
In directory sc8-pr-cvs1:/tmp/cvs-serv12052/WEB-INF/maple/aim/review
Modified Files:
Quiz.mpl
Added Files:
Question.mpl
Log Message:
merged from develop_2_1
Index: Quiz.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/review/Quiz.mpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Quiz.mpl 5 May 2003 03:25:46 -0000 1.2
--- Quiz.mpl 25 Aug 2003 21:47:19 -0000 1.3
***************
*** 18,21 ****
--- 18,22 ----
rqc0['StudentIsTeacher'] := true:
rqc0['QuizReviewMode'] := true:
+ rqc0['QuestionReviewMode'] := false:
rqc0['QuizTryMode'] := false:
rqc0['QuestionTryMode'] := false:
***************
*** 40,46 ****
rqc0['ShowPrevious'] := true:
rqc0['ShowFeedback'] := true:
- rqc0['ShowFeedbackMC'] := true:
rqc0['ShowMark'] := true:
- rqc0['ShowMarkMC'] := true:
rqc0['ShowRightAnswer'] := false:
rqc0['ShowSolution'] := false:
--- 41,45 ----
***************
*** 62,65 ****
--- 61,65 ----
rqc1['StudentIsTeacher'] := true:
rqc1['QuizReviewMode'] := true:
+ rqc1['QuestionReviewMode'] := true:
rqc1['QuizTryMode'] := true:
rqc1['QuestionTryMode'] := true:
***************
*** 84,90 ****
rqc1['ShowPrevious'] := true:
rqc1['ShowFeedback'] := true:
- rqc1['ShowFeedbackMC'] := true:
rqc1['ShowMark'] := true:
- rqc1['ShowMarkMC'] := true:
rqc1['ShowRightAnswer'] := true:
rqc1['ShowSolution'] := true:
--- 84,88 ----
***************
*** 125,133 ****
'ExtraScript' = "f.ShowSolution.value = 'false';"]],
! ['Action',"TryQuestion",
! "Try a question",
! ['Command' = "try/Question",
! 'LinkText' = __("Try"),
! 'Arguments' = ["QuestionName","QuestionSeed","RawAnswer"]]],
['Action',"EditSource",
--- 123,131 ----
'ExtraScript' = "f.ShowSolution.value = 'false';"]],
! ['Action',"ReviewQuestion",
! "Review a question",
! ['Command' = "review/Question",
! 'LinkText' = __("Review"),
! 'Arguments' = ["QuestionLabel","AttemptNumber"]]],
['Action',"EditSource",
***************
*** 205,209 ****
local subject,register,quiz,id,
student,studentname,emailstudent,adminstudent,togglesolution,
! seed,quizversion,quizinstance,history,questionhistory,
question,label,rawtable,quizcontext;
--- 203,207 ----
local subject,register,quiz,id,
student,studentname,emailstudent,adminstudent,togglesolution,
! seed,quizversion,quizinstance,history,labeltable,
question,label,rawtable,quizcontext;
***************
*** 260,276 ****
rawtable := table([]);
! questionhistory := eval(history['QuestionHistory']);
for question in quizversion['Questions'] do
label := question['Label'];
rawtable[cat("RawAnswer",label)] :=
! eval(questionhistory[label])['LastRawAnswer'];
od;
- quizinstance :=
- eval(quizversion['MakeInstance',
- eval(rawtable),
- eval(history),
- true]);
-
if p["ShowSolution"] = "true" then
quizcontext := `aim/review/Quiz/Context/Sol`;
--- 258,268 ----
rawtable := table([]);
! labeltable := eval(history['LabelTable']);
for question in quizversion['Questions'] do
label := question['Label'];
rawtable[cat("RawAnswer",label)] :=
! eval(labeltable[label])['LastRawAnswer'];
od;
if p["ShowSolution"] = "true" then
quizcontext := `aim/review/Quiz/Context/Sol`;
***************
*** 280,283 ****
--- 272,281 ----
togglesolution := page['ActionLink',"ShowSolution"];
fi;
+
+ quizinstance :=
+ eval(quizversion['MakeInstance',
+ eval(rawtable),
+ eval(history),
+ eval(quizcontext)]);
quizinstance['SetBody',quizcontext];
|
