--- trunk/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm 2003/06/11 20:40:11 1131
+++ trunk/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm 2003/11/19 18:44:47 1636
@@ -16,12 +16,15 @@
use warnings;
use CGI qw();
use File::Path qw(rmtree);
-use File::Temp qw(tempdir);
use WeBWorK::Form;
use WeBWorK::PG;
+use WeBWorK::PG::ImageGenerator;
use WeBWorK::PG::IO;
-use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string);
+use WeBWorK::Utils qw(writeLog writeCourseLog encodeAnswers decodeAnswers ref2string makeTempDirectory);
use WeBWorK::DB::Utils qw(global2user user2global findDefaults);
+use WeBWorK::Timing;
+
+my $timer0_ON=0; # times pg translation phase
############################################################
#
@@ -41,9 +44,16 @@
# submitAnswers - name of "Submit Answers" button
# checkAnswers - name of the "Check Answers" button
# previewAnswers - name of the "Preview Answers" button
+#
+# FIXME: this table is heinously out of date
#
############################################################
+# FIXME: what is this?
+sub templateName {
+ "problem";
+}
+
sub pre_header_initialize {
my ($self, $setName, $problemNumber) = @_;
my $r = $self->{r};
@@ -51,64 +61,97 @@
my $db = $self->{db};
my $userName = $r->param('user');
my $effectiveUserName = $r->param('effectiveUser');
- my $key = $r->param('key');
- my $user = $db->getUser($userName);
- my $effectiveUser = $db->getUser($effectiveUserName);
-
- # obtain the effective user set, or if that is not yet defined obtain global set
- my $set = $db->getMergedSet($effectiveUserName, $setName);
- unless (defined $set) {
- my $userSetClass = $courseEnv->{dbLayout}->{set_user}->{record};
- $set = global2user($userSetClass, $db->getGlobalSet($setName));
- $set->psvn('000');
- }
- my $psvn = $set->psvn();
-
- # obtain the effective user problem, or if that is not yet defined obtain global problem
- my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber);
- unless (defined $problem) {
- my $userProblemClass = $courseEnv->{dbLayout}->{problem_user}->{record};
- $problem = global2user($userProblemClass, $db->getGlobalProblem($setName,$problemNumber));
-
-# $problem->max_attempts(-1); # default is infinite number of attempts
-# $problem->value;
-# $problem->problem_seed;
-# $problem->source_file;
- $problem->user_id($userName); # is this the right value for this unassigned problem? FIXME
- $problem->status(0);
- $problem->attempted(0);
- $problem->num_correct(0);
- $problem->num_incorrect(0);
- $problem->last_answer(' ');
- }
- #$problem = $db->getGlobalProblem($setName, $problemNumber) unless defined($problem);
- # FIXME
- # a better solution at this point would be to take set and problem, convert them to global_user type
- # so that they have the right methods.
- # Stuff the local copy of $set and $problem with default data where it won't have been defined
- # Make sure that nothing bad is stored back in the database.
- # It would be nice to store lastAnswer somewhere -- perhaps that could be done as a special case.
-
-
- # This supplies a psvn if $set doesn't have it. Unfortunately the problem is called on to provide
- # data in many places and it might not even have methods defined.
-
- # global sets will not have a defined psvn
-# my $psvn;
-# if ($set->can('psvn') ) {
-# $psvn = $set->psvn();
-# } else { # we are viewing an unassigned problem set, psvn's are irrelevant
-# $psvn = '0000';
-# }
-
- my $permissionLevel = $db->getPermissionLevel($userName)->permission();
-
- $self->{userName} = $userName;
- $self->{user} = $user;
- $self->{effectiveUser} = $effectiveUser;
- $self->{set} = $set;
- $self->{problem} = $problem;
- $self->{permissionLevel} = $permissionLevel;
+ my $key = $r->param('key');
+
+ my $user = $db->getUser($userName); # checked
+ die "record for user $userName (real user) does not exist."
+ unless defined $user;
+
+ my $effectiveUser = $db->getUser($effectiveUserName); # checked
+ die "record for user $effectiveUserName (effective user) does not exist."
+ unless defined $effectiveUser;
+
+ my $PermissionLevel = $db->getPermissionLevel($userName); # checked
+ die "permission level record for user $userName does not exist (but the user does? odd...)"
+ unless defined $PermissionLevel;
+ my $permissionLevel = $PermissionLevel->permission;
+
+ # obtain the merged set for $effectiveUser
+ my $set = $db->getMergedSet($effectiveUserName, $setName); # checked
+
+ # obtain the merged problem for $effectiveUser
+ my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber); # checked
+
+ my $editMode = $r->param("editMode");
+
+ if ($permissionLevel > 0 and defined $editMode) {
+ # professors are allowed to fabricate sets and problems not
+ # assigned to them (or anyone). this allows them to use the
+ # editor to
+
+ # if that is not yet defined obtain the global set, convert
+ # it to a user set, and add fake user data
+ unless (defined $set) {
+ my $userSetClass = $db->{set_user}->{record};
+ my $globalSet = $db->getGlobalSet($setName); # checked
+ # if the global set doesn't exist either, bail!
+ die "Set $setName does not exist"
+ unless defined $set;
+ $set = global2user($userSetClass, $globalSet);
+ $set->psvn(0);
+ }
+
+ # if that is not yet defined obtain the global problem,
+ # convert it to a user problem, and add fake user data
+ unless (defined $problem) {
+ my $userProblemClass = $db->{problem_user}->{record};
+ my $globalProblem = $db->getGlobalProblem($setName, $problemNumber); # checked
+ # if the global problem doesn't exist either, bail!
+ die "Problem $problemNumber in set $setName does not exist"
+ unless defined $problem;
+ $problem = global2user($userProblemClass, $globalProblem);
+ $problem->user_id($effectiveUserName);
+ $problem->problem_seed(0);
+ $problem->status(0);
+ $problem->attempted(0);
+ $problem->last_answer("");
+ $problem->num_correct(0);
+ $problem->num_incorrect(0);
+ }
+
+ # now we're sure we have valid UserSet and UserProblem objects
+ # yay!
+
+ # now deal with possible editor overrides:
+
+ # if the caller is asking to override the source file, and
+ # editMode calls for a temporary file, do so
+ my $sourceFilePath = $r->param("sourceFilePath");
+ if (defined $sourceFilePath and $editMode eq "temporaryFile") {
+ $problem->source_file($sourceFilePath);
+ }
+
+ # if the caller is asking to override the problem seed, do so
+ my $problemSeed = $r->param("problemSeed");
+ if (defined $problemSeed) {
+ $problem->problem_seed($problemSeed);
+ }
+ } else {
+ # students can't view problems not assigned to them
+ die "Set $setName is not assigned to $effectiveUserName"
+ unless defined $set;
+ die "Problem $problemNumber in set $setName is not assigned to $effectiveUserName"
+ unless defined $problem;
+ }
+
+ $self->{userName} = $userName;
+ $self->{effectiveUserName} = $effectiveUserName;
+ $self->{user} = $user;
+ $self->{effectiveUser} = $effectiveUser;
+ $self->{permissionLevel} = $permissionLevel;
+ $self->{set} = $set;
+ $self->{problem} = $problem;
+ $self->{editMode} = $editMode;
##### form processing #####
@@ -120,27 +163,27 @@
my $previewAnswers = $r->param("previewAnswers");
# fields which may be defined when using Problem Editor
- my $override_seed = ($permissionLevel>=10) ? $r->param('problemSeed') : undef;
- my $override_problem_source = ($permissionLevel>=10) ? $r->param('sourceFilePath') : undef;
- my $editMode = undef;
- my $submit_button = $r->param('submit_button');
- if ( defined($submit_button ) ) {
- $editMode = "temporaryFile" if $submit_button eq 'Refresh';
- $editMode = 'savedFile' if $submit_button eq 'Save';
- }
-
- #override using the source file data from the form field
- $problem->source_file($override_problem_source) if defined($override_problem_source);
- $problem->problem_seed($override_seed) if defined($override_seed);
-
- # store path to source file for title.
- $self->{problem_source_name} = $problem->source_file;
- $self->{edit_mode} = $editMode;
-# $self->{current_problem_source} = (defined($override_problem_source) ) ?
-# $override_problem_source :
-# $problem->source_file;
+ #my $override_seed = ($permissionLevel>=10) ? $r->param('problemSeed') : undef;
+ #my $override_problem_source = ($permissionLevel>=10) ? $r->param('sourceFilePath') : undef;
+ #my $editMode = undef;
+ #my $submit_button = $r->param('submit_button');
+ #if ( defined($submit_button ) ) {
+ # $editMode = "temporaryFile" if $submit_button eq 'Refresh';
+ # $editMode = 'savedFile' if $submit_button eq 'Save';
+ #}
+ #
+ ##override using the source file data from the form field
+ #$problem->source_file($override_problem_source) if defined($override_problem_source);
+ #$problem->problem_seed($override_seed) if defined($override_seed);
+ #
+ ## store path to source file for title.
+ #$self->{problem_source_name} = $problem->source_file;
+ #$self->{edit_mode} = $editMode;
+ #$self->{current_problem_source} = (defined($override_problem_source) ) ?
+
# coerce form fields into CGI::Vars format
my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
+
$self->{displayMode} = $displayMode;
$self->{redisplay} = $redisplay;
@@ -149,7 +192,6 @@
$self->{previewAnswers} = $previewAnswers;
$self->{formFields} = $formFields;
-
##### permissions #####
# are we allowed to view this problem?
@@ -187,7 +229,28 @@
# attempts=num_correct+num_incorrect+1, as this happens before updating $problem
checkAnswers => canCheckAnswers($permissionLevel, $set->answer_date),
);
-
+ #########################################################
+ # more complicated logic for showing check answer button:
+ #########################################################
+ # checkAnswers button shows up after due date -- once a student can't record anymore
+ # checkAnswers button always shows up when an instructor or TA is acting
+ # as someone else (the $user and $effectiveUserName aren't the same).
+ $can{checkAnswers} = ($can{checkAnswers} && not $can{recordAnswers} ) ||
+ ( defined($userName) and defined($effectiveUserName) and
+ ($userName ne $effectiveUserName)
+ );
+ #########################################################
+ # more complicated logif for showing "submit answer" button
+ #########################################################
+ # We hide the submit answer button if someone is acting as a student
+ # This prevents errors where you accidently submit the answer for a student
+ # Not sure whether this a feature or a bug
+
+ $can{recordAnswers} = ($can{recordAnswers} and not
+ ( defined($userName) and defined($effectiveUserName) and
+ ($userName ne $effectiveUserName)
+ )
+ );
# final values for options
my %will;
foreach (keys %must) {
@@ -196,26 +259,25 @@
##### sticky answers #####
- if (not $submitAnswers and $will{showOldAnswers}) {
+ if (not ($submitAnswers or $previewAnswers or $checkAnswers) and $will{showOldAnswers}) {
# do this only if new answers are NOT being submitted
my %oldAnswers = decodeAnswers($problem->last_answer);
$formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers;
}
##### translation #####
-
+
+ $WeBWorK::timer0->continue("begin pg processing") if $timer0_ON;
my $pg = WeBWorK::PG->new(
$courseEnv,
$effectiveUser,
$key,
$set,
$problem,
- $psvn,
+ $set->psvn, # FIXME: this field should be removed
$formFields,
{ # translation options
displayMode => $displayMode,
- override_seed => $override_seed,
- override_problem_source =>$override_problem_source,
showHints => $will{showHints},
showSolutions => $will{showSolutions},
refreshMath2img => $will{showHints} || $will{showSolutions},
@@ -223,9 +285,11 @@
},
);
+ $WeBWorK::timer0->continue("end pg processing") if $timer0_ON;
##### fix hint/solution options #####
- $can{showHints} &&= $pg->{flags}->{hintExists};
+ $can{showHints} &&= $pg->{flags}->{hintExists}
+ &&= $pg->{flags}->{showHintLimit}<=$pg->{state}->{num_of_incorrect_ans};
$can{showSolutions} &&= $pg->{flags}->{solutionExists};
##### store fields #####
@@ -234,7 +298,6 @@
$self->{must} = \%must;
$self->{can} = \%can;
$self->{will} = \%will;
-
$self->{pg} = $pg;
}
@@ -295,21 +358,21 @@
my $db = $self->{db};
my $root = $ce->{webworkURLs}->{root};
my $courseName = $ce->{courseName};
-
print CGI::strong("Problems"), CGI::br();
my $effectiveUser = $self->{r}->param("effectiveUser");
- my @problems;
- push @problems, $db->getMergedProblem($effectiveUser, $setName, $_)
- foreach ($db->listUserProblems($effectiveUser, $setName));
- foreach my $problem (sort { $a->problem_id <=> $b->problem_id } @problems) {
- print CGI::a({-href=>"$root/$courseName/$setName/".$problem->problem_id."/?"
+ my @problemIDs = $db->listUserProblems($effectiveUser, $setName);
+ foreach my $problem (sort { $a <=> $b } @problemIDs) {
+ print ' '.CGI::a({-href=>"$root/$courseName/$setName/".$problem."/?"
. $self->url_authen_args . "&displayMode=" . $self->{displayMode}},
- "Problem ".$problem->problem_id), CGI::br();
+ "Problem ".$problem), CGI::br();
}
+
+ return "";
}
sub nav {
+ $WeBWorK::timer0->continue("begin nav subroutine") if $timer0_ON;
my $self = shift;
my $args = $_[-1];
my $setName = $self->{set}->set_id;
@@ -326,32 +389,30 @@
my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList");
- my $prevProblem = $db->getMergedProblem($effectiveUser, $setName, $problemNumber-1);
- my $nextProblem = $db->getMergedProblem($effectiveUser, $setName, $problemNumber+1);
- unshift @links, "Previous Problem" , ($prevProblem
- ? "$root/$courseName/$setName/".$prevProblem->problem_id
+ my @problemIDs = $db->listUserProblems($effectiveUser, $setName);
+ my ($prevID, $nextID);
+ foreach my $id (@problemIDs) {
+ $prevID = $id if $id < $problemNumber
+ and (not defined $prevID or $id > $prevID);
+ $nextID = $id if $id > $problemNumber
+ and (not defined $nextID or $id < $nextID);
+ }
+ unshift @links, "Previous Problem" , ($prevID
+ ? "$root/$courseName/$setName/".$prevID
: "") , "navPrev";
- push @links, "Next Problem" , ($nextProblem
- ? "$root/$courseName/$setName/".$nextProblem->problem_id
+ push @links, "Next Problem" , ($nextID
+ ? "$root/$courseName/$setName/".$nextID
: "") , "navNext";
- return $self->navMacro($args, $tail, @links);
+ my $result = $self->navMacro($args, $tail, @links);
+ $WeBWorK::timer0->continue("end nav subroutine") if $timer0_ON;
+ return $result;
}
sub title {
my $self = shift;
my $setName = $self->{set}->set_id;
-
- my $file_action;
- my $edit_mode = $self->{edit_mode};
- if ( not defined($edit_mode) ) {
- $file_action = '';
- } elsif ( $edit_mode eq 'temporaryFile') {
- $file_action .= 'Editing temporary file : '. CGI::br() . $self->{problem_source_name};
- } elsif ( $edit_mode eq 'savedFile' ){
- $file_action .= 'Problem saved to : '. CGI::br() . $self->{problem_source_name};
- }
- my $problemNumber = $self->{problem}->problem_id . " : " . $file_action;
+ my $problemNumber = $self->{problem}->problem_id;
return "$setName : Problem $problemNumber";
}
@@ -365,50 +426,69 @@
# unpack some useful variables
my $r = $self->{r};
my $db = $self->{db};
+ my $ce = $self->{ce};
+ my $root = $ce->{webworkURLs}->{root};
+ my $courseName = $ce->{courseName};
my $set = $self->{set};
my $problem = $self->{problem};
+ my $editMode = $self->{editMode};
my $permissionLevel = $self->{permissionLevel};
my $submitAnswers = $self->{submitAnswers};
my $checkAnswers = $self->{checkAnswers};
my $previewAnswers = $self->{previewAnswers};
my %want = %{ $self->{want} };
- my %can = %{ $self->{can} };
+ my %can = %{ $self->{can} };
my %must = %{ $self->{must} };
my %will = %{ $self->{will} };
my $pg = $self->{pg};
+
+
+ #####create Editor link #####
+ # print editor link if the user is an instructor AND the file is not in temporary editing mode
+ my $editorLinkMessage = '';
+ # and ( (not defined($self->{editMode})) or $self->{editMode} eq 'savedFile') # FIXME is this needed?
+ if ($self->{permissionLevel}>=10 ) {
+ $editorLinkMessage = CGI::a({-href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".
+ $set->set_id.'/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
+ }
##### translation errors? #####
if ($pg->{flags}->{error_flag}) {
- return $self->errorOutput($pg->{errors}, $pg->{body_text});
+ return $self->errorOutput($pg->{errors}, $pg->{body_text}.CGI::p($editorLinkMessage));
}
##### answer processing #####
-
+ $WeBWorK::timer0->continue("begin answer processing") if $timer0_ON;
# if answers were submitted:
+ my $scoreRecordedMessage;
if ($submitAnswers) {
# get a "pure" (unmerged) UserProblem to modify
# this will be undefined if the problem has not been assigned to this user
- my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id);
- # store answers in DB for sticky answers
- my %answersToStore;
- my %answerHash = %{ $pg->{answers} };
- $answersToStore{$_} = $answerHash{$_}->{original_student_ans}
- foreach (keys %answerHash);
- my $answerString = encodeAnswers(%answersToStore,
- @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} });
-
- $problem->last_answer($answerString);
- # if $pureProblem is defined ( there is a user ) then record the last answer.
- # FIXME (we're assuming that not being able to get a pure problem is enough to determine
- # whether or not the problem database needs to be updated. This should be thought through
- # more carefully to be sure.
- if ( defined($pureProblem) ) {
+ my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); # checked
+ if (defined $pureProblem) {
+ # store answers in DB for sticky answers
+ my %answersToStore;
+ my %answerHash = %{ $pg->{answers} };
+ $answersToStore{$_} = $self->{formFields}->{$_} #$answerHash{$_}->{original_student_ans} -- this may have been modified for fields with multiple values. Don't use it!!
+ foreach (keys %answerHash);
+ # There may be some more answers to store -- one which are auxiliary entries to a primary answer. Evaluating
+ # matrices works in this way, only the first answer triggers an answer evaluator, the rest are just inputs
+ # however we need to store them. Fortunately they are still in the input form.
+ my @extra_answer_names = @{ $pg->{flags}->{KEPT_EXTRA_ANSWERS}};
+
+ $answersToStore{$_} = $self->{formFields}->{$_} foreach (@extra_answer_names);
+
+ # Now let's encode these answers to store them -- append the extra answers to the end of answer entry order
+ my @answer_order = (@{$pg->{flags}->{ANSWER_ENTRY_ORDER}}, @extra_answer_names);
+ my $answerString = encodeAnswers(%answersToStore,
+ @answer_order);
+
+ # store last answer to database
+ $problem->last_answer($answerString);
$pureProblem->last_answer($answerString);
$db->putUserProblem($pureProblem);
- #die "pureProblem = ", defined($pureProblem);
-
-
+
# store state in DB if it makes sense
if ($will{recordAnswers}) {
$problem->status($pg->{state}->{recorded_score});
@@ -419,7 +499,11 @@
$pureProblem->attempted(1);
$pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
$pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
- $db->putUserProblem($pureProblem);
+ if ($db->putUserProblem($pureProblem)) {
+ $scoreRecordedMessage = "Your score was recorded.";
+ } else {
+ $scoreRecordedMessage = "Your score was not recorded because there was a failure in storing the problem record to the database.";
+ }
# write to the transaction log, just to make sure
writeLog($self->{ce}, "transaction",
$problem->problem_id."\t".
@@ -435,55 +519,78 @@
$pureProblem->num_correct."\t".
$pureProblem->num_incorrect
);
+ } else {
+ if (time < $set->open_date or time > $set->due_date) {
+ $scoreRecordedMessage = "Your score was not recorded because this problem set is closed.";
+ } else {
+ $scoreRecordedMessage = "Your score was not recorded.";
+ }
}
+ } else {
+ $scoreRecordedMessage = "Your score was not recorded because this problem has not been built for you.";
}
}
- # logging student answers
- my $pastAnswerLog = undef;
- if (defined( $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'} )) {
- $pastAnswerLog = $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'};
-
- if ($submitAnswers and defined($pastAnswerLog) ) {
+ # logging student answers
+
+ my $answer_log = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
+ if ( defined($answer_log )) {
+ if ($submitAnswers ) {
my $answerString = "";
my %answerHash = %{ $pg->{answers} };
$answerString = $answerString . $answerHash{$_}->{original_student_ans}."\t"
foreach (sort keys %answerHash);
$answerString = '' unless defined($answerString); # insure string is defined.
- writeLog($self->{ce}, "pastAnswerList",
- '|'.$problem->user_id.
- '|'.$problem->set_id.
- '|'.$problem->problem_id.'|'."\t".
- time()."\t".
- $answerString,
-
- );
-
+ writeCourseLog($self->{ce}, "answer_log",
+ join("",
+ '|', $problem->user_id,
+ '|', $problem->set_id,
+ '|', $problem->problem_id,
+ '|',"\t",
+ time(),"\t",
+ $answerString,
+ ),
+ );
+
}
+ }
- }
- # end logging student answers
+ $WeBWorK::timer0->continue("end answer processing") if $timer0_ON;
##### output #####
print CGI::start_div({class=>"problemHeader"});
+ # custom message for editor
+ if ($permissionLevel >= 10 and defined $editMode) {
+ if ($editMode eq "temporaryFile") {
+ print CGI::p(CGI::i("Editing temporary file: ", $problem->source_file));
+ } elsif ($editMode eq "savedFile") {
+ print CGI::p(CGI::i("Problem saved to: ", $problem->source_file));
+ }
+ }
+
# attempt summary
- if ($submitAnswers or $will{showCorrectAnswers}) {
+ #FIXME -- the following is a kludge: if showPartialCorrectAnswers is negative don't show anything.
+ # until after the due date
+ # do I need to check $wills{howCorrectAnswers} to make preflight work??
+ if (($pg->{flags}->{showPartialCorrectAnswers}>= 0 and $submitAnswers) ) {
# print this if user submitted answers OR requested correct answers
- print $self->attemptResults($pg, $submitAnswers,
+
+ print $self->attemptResults($pg, 1,
$will{showCorrectAnswers},
$pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
} elsif ($checkAnswers) {
# print this if user previewed answers
- print $self->attemptResults($pg, 1, 0, 1, 1, 1);
+ print "ANSWERS ONLY CHECKED -- ",CGI::br(),"ANSWERS NOT RECORDED", CGI::br();
+ print $self->attemptResults($pg, 1, $will{showCorrectAnswers}, 1, 1, 1);
# show attempt answers
- # don't show correct answers
+ # show correct answers if asked
# show attempt results (correctness)
- # don't show attempt previews
+ # show attempt previews
} elsif ($previewAnswers) {
# print this if user previewed answers
- print $self->attemptResults($pg, 1, 0, 0, 0, 1);
+ print "PREVIEW ONLY -- NOT RECORDED",CGI::br(),$self->attemptResults($pg, 1, 0, 0, 0, 1);
# show attempt answers
# don't show correct answers
# don't show attempt results (correctness)
@@ -501,16 +608,37 @@
CGI::p($pg->{body_text}),
CGI::p($pg->{result}->{msg} ? CGI::b("Note: ") : "", CGI::i($pg->{result}->{msg})),
CGI::p(
+ ($can{showCorrectAnswers}
+ ? CGI::checkbox(
+ -name => "showCorrectAnswers",
+ -checked => $will{showCorrectAnswers},
+ -label => "Show correct answers",
+ ) ." "
+ : "" ),
+ ($can{showHints}
+ ? ''. CGI::checkbox(
+ -name => "showHints",
+ -checked => $will{showHints},
+ -label => "Show Hints",
+ ) . "
"
+ : " " ),
+ ($can{showSolutions}
+ ? CGI::checkbox(
+ -name => "showSolutions",
+ -checked => $will{showSolutions},
+ -label => "Show Solutions",
+ ) . " "
+ : " " ),CGI::br(),
+ CGI::submit(-name=>"previewAnswers",
+ -label=>"Preview Answers"),
($can{recordAnswers}
? CGI::submit(-name=>"submitAnswers",
-label=>"Submit Answers")
: ""),
- ($can{checkAnswers}
+ ( $can{checkAnswers}
? CGI::submit(-name=>"checkAnswers",
-label=>"Check Answers")
: ""),
- CGI::submit(-name=>"previewAnswers",
- -label=>"Preview Answers"),
);
print CGI::end_div();
@@ -542,6 +670,7 @@
}
}
print CGI::p(
+ $submitAnswers ? $scoreRecordedMessage . CGI::br() : "",
"You have attempted this problem $attempts $attemptsNoun.", CGI::br(),
$problem->attempted
? "Your recorded score is $lastScore." . CGI::br()
@@ -551,42 +680,38 @@
print CGI::end_div();
# save state for viewOptions
- print CGI::hidden(
- -name => "showOldAnswers",
- -value => $will{showOldAnswers}
- ),
- CGI::hidden(
- -name => "showCorrectAnswers",
- -value => $will{showCorrectAnswers}
- ),
- CGI::hidden(
- -name => "showHints",
- -value => $will{showHints}),
- CGI::hidden(
- -name => "showSolutions",
- -value => $will{showSolutions},
- ),
- CGI::hidden(
- -name => "displayMode",
- -value => $self->{displayMode}
- );
-
+ print CGI::hidden(
+ -name => "showOldAnswers",
+ -value => $will{showOldAnswers}
+ ),
+
+ CGI::hidden(
+ -name => "displayMode",
+ -value => $self->{displayMode}
+ );
+ print( CGI::hidden(
+ -name => 'editMode',
+ -value => $self->{editMode},
+ )
+ ) if defined($self->{editMode}) and $self->{editMode} eq 'temporaryFile';
+ print( CGI::hidden(
+ -name => 'sourceFilePath',
+ -value => $self->{problem}->{source_file}
+ )) if defined($self->{problem}->{source_file});
+
# end of main form
print CGI::endform();
- # stuff we need below (pull these out at the beginning?)
- my $ce = $self->{ce};
- my $root = $ce->{webworkURLs}->{root};
- my $courseName = $ce->{courseName};
print CGI::start_div({class=>"problemFooter"});
# arguments for answer inspection button
my $prof_url = $ce->{webworkURLs}->{oldProf};
+ my $webworkURL = $ce->{webworkURLs}->{root};
my $cgi_url = $prof_url;
$cgi_url=~ s|/[^/]*$||; # clip profLogin.pl
my $authen_args = $self->url_authen_args();
- my $showPastAnswersURL = "$cgi_url/showPastAnswers.pl";
+ my $showPastAnswersURL = "$webworkURL/$courseName/instructor/show_answers/";
# print answer inspection button
if ($self->{permissionLevel} > 0) {
@@ -594,9 +719,9 @@
CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
$self->hidden_authen_fields,"\n",
CGI::hidden(-name => 'course', -value=>$courseName), "\n",
- CGI::hidden(-name => 'probNum', -value=>$problem->problem_id), "\n",
- CGI::hidden(-name => 'setNum', -value=>$problem->set_id), "\n",
- CGI::hidden(-name => 'User', -value=>$problem->user_id), "\n",
+ CGI::hidden(-name => 'problemNumber', -value=>$problem->problem_id), "\n",
+ CGI::hidden(-name => 'setName', -value=>$problem->set_id), "\n",
+ CGI::hidden(-name => 'studentUser', -value=>$problem->user_id), "\n",
CGI::p( {-align=>"left"},
CGI::submit(-name => 'action', -value=>'Show Past Answers')
), "\n",
@@ -623,16 +748,12 @@
CGI::hidden("showHints", $will{showHints}),"\n",
CGI::hidden("showSolutions", $will{showSolutions}),"\n",
CGI::p({-align=>"left"},
- CGI::submit(-name=>"feedbackForm", -label=>"Contact instructor")
+ CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
),
CGI::endform(),"\n";
# FIXME print editor link
- # print editor link if the user is an instructor AND the file is not in temporary editing mode
- if ($self->{permissionLevel}>=10 and ( (not defined($self->{edit_mode})) or $self->{edit_mode} eq 'savedFile') ) {
- print CGI::a({-href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".$set->set_id.
- '/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
- }
+ print $editorLinkMessage; #empty unless it is appropriate to have an editor link.
print CGI::end_div();
@@ -671,12 +792,25 @@
my $showAttemptResults = $showAttemptAnswers && shift;
my $showSummary = shift;
my $showAttemptPreview = shift || 0;
+ my $ce = $self->{ce};
my $problemResult = $pg->{result}; # the overall result of the problem
my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
- my $header = CGI::th("Part");
+ my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview";
+ my $imgGen = WeBWorK::PG::ImageGenerator->new(
+ tempDir => $ce->{webworkDirs}->{tmp},
+ latex => $ce->{externalPrograms}->{latex},
+ dvipng => $ce->{externalPrograms}->{dvipng},
+ useCache => 1,
+ cacheDir => $ce->{webworkDirs}->{equationCache},
+ cacheURL => $ce->{webworkURLs}->{equationCache},
+ cacheDB => $ce->{webworkFiles}->{equationCacheDB},
+ );
+
+ my $header;
+ #$header .= CGI::th("Part");
$header .= $showAttemptAnswers ? CGI::th("Entered") : "";
$header .= $showAttemptPreview ? CGI::th("Answer Preview") : "";
$header .= $showCorrectAnswers ? CGI::th("Correct") : "";
@@ -688,20 +822,21 @@
my $answerResult = $pg->{answers}->{$name};
my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
my $preview = ($showAttemptPreview
- ? $self->previewAnswer($answerResult)
- : "");
+ ? $self->previewAnswer($answerResult, $imgGen)
+ : "");
my $correctAnswer = $answerResult->{correct_ans};
my $answerScore = $answerResult->{score};
my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
-
+ #FIXME --Can we be sure that $answerScore is an integer-- could the problem give partial credit?
$numCorrect += $answerScore > 0;
my $resultString = $answerScore ? "correct" : "incorrect";
# get rid of the goofy prefix on the answer names (supposedly, the format
# of the answer names is changeable. this only fixes it for "AnSwEr"
- $name =~ s/^AnSwEr//;
+ #$name =~ s/^AnSwEr//;
- my $row = CGI::td($name);
+ my $row;
+ #$row .= CGI::td($name);
$row .= $showAttemptAnswers ? CGI::td(nbsp($studentAnswer)) : "";
$row .= $showAttemptPreview ? CGI::td(nbsp($preview)) : "";
$row .= $showCorrectAnswers ? CGI::td(nbsp($correctAnswer)) : "";
@@ -710,15 +845,43 @@
push @tableRows, $row;
}
- my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
+ # render equation images
+ $imgGen->render(refresh => 1);
+
+# my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
- my $summary = "On this attempt, you answered $numCorrect out of "
- . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
- return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p($summary) : "");
+# FIXME -- I left the old code in in case we have to back out.
+# my $summary = "On this attempt, you answered $numCorrect out of "
+# . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
+ my $summary = "";
+ if (scalar @answerNames == 1) {
+ if ($numCorrect == scalar @answerNames) {
+ $summary .= "The above answer is correct.";
+ } else {
+ $summary .= "The above answer is NOT correct.";
+ }
+ } else {
+ if ($numCorrect == scalar @answerNames) {
+ $summary .= "All of the above answers are correct.";
+ } else {
+ $summary .= "At least one of the above answers is NOT correct.";
+ }
+ }
+ #FIXME there must be a better way to force refresh.
+ #my $refresh_warning = 'Hold down shift and click "refresh" or "reload" to update answer preview images.';
+ #return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) .
+ #CGI::div({style=>'color:red; font-size:10pt'},$refresh_warning) .
+ #($showSummary ? CGI::p({class=>'emphasis'},$summary) : "");
+ # ... this has been fixed by equation caching.
+ return
+ CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows))
+ . ($showSummary ? CGI::p({class=>'emphasis'},$summary) : "");
}
sub nbsp {
my $str = shift;
- ($str) ? $str : ' '; # returns non-breaking space for empty strings
+ ($str =~/\S/) ? $str : ' ' ; # returns non-breaking space for empty strings
+ # tricky cases: $str =0;
+ # $str is a complex number
}
sub viewOptions($) {
my $self = shift;
@@ -735,24 +898,7 @@
-checked => $will{showOldAnswers},
-label => "Saved answers",
), " ".CGI::br();
- $can{showCorrectAnswers} and $optionLine .= join "",
- CGI::checkbox(
- -name => "showCorrectAnswers",
- -checked => $will{showCorrectAnswers},
- -label => "Correct answers",
- ), " ".CGI::br();
- $can{showHints} and $optionLine .= join "",
- CGI::checkbox(
- -name => "showHints",
- -checked => $will{showHints},
- -label => "Hints",
- ), " ".CGI::br();
- $can{showSolutions} and $optionLine .= join "",
- CGI::checkbox(
- -name => "showSolutions",
- -checked => $will{showSolutions},
- -label => "Solutions",
- ), " ".CGI::br();
+
$optionLine and $optionLine .= join "", CGI::br();
return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex align: left"},
@@ -774,7 +920,7 @@
}
sub previewAnswer($$) {
- my ($self, $answerResult) = @_;
+ my ($self, $answerResult, $imgGen) = @_;
my $ce = $self->{ce};
my $effectiveUser = $self->{effectiveUser};
my $set = $self->{set};
@@ -788,7 +934,7 @@
my $tex = $answerResult->{preview_latex_string};
- return "" if $tex eq "";
+ return "" unless defined $tex and $tex ne "";
if ($displayMode eq "plainText") {
return $tex;
@@ -805,30 +951,32 @@
}
return $result;
} elsif ($displayMode eq "images") {
- # how are we going to name this?
- my $targetPathCommon = "/m2i/"
- . $effectiveUser->user_id . "."
- . $set->set_id . "."
- . $problem->problem_id . "."
- . $answerResult->{ans_name} . ".png";
-
- # figure out where to put things
- my $wd = tempdir("webwork-dvipng-XXXXXXXX", DIR => $ce->{courseDirs}->{html_temp});
- my $latex = $ce->{externalPrograms}->{latex};
- my $dvipng = $ce->{externalPrograms}->{dvipng};
- my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
- # should use surePathToTmpFile, but we have to
- # isolate it from the problem enivronment first
- my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
-
- # call dvipng to generate a preview
- dvipng($wd, $latex, $dvipng, $tex, $targetPath);
- rmtree($wd, 0, 0);
- if (-e $targetPath) {
- return "![\"$tex\"](\"$targetURL\")
";
- } else {
- return "[math2img failed]";
- }
+ ## how are we going to name this?
+ #my $targetPathCommon = "/m2i/"
+ # . $effectiveUser->user_id . "."
+ # . $set->set_id . "."
+ # . $problem->problem_id . "."
+ # . $answerResult->{ans_name} . ".png";
+ #
+ ## figure out where to put things
+ #my $wd = makeTempDirectory($ce->{courseDirs}->{html_temp}, "webwork-dvipng");
+ #my $latex = $ce->{externalPrograms}->{latex};
+ #my $dvipng = $ce->{externalPrograms}->{dvipng};
+ #my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
+ # # should use surePathToTmpFile, but we have to
+ # # isolate it from the problem enivronment first
+ #my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
+ #
+ ## call dvipng to generate a preview
+ #dvipng($wd, $latex, $dvipng, $tex, $targetPath);
+ #rmtree($wd, 0, 0);
+ #if (-e $targetPath) {
+ # return "";
+ #} else {
+ # return "[math2img failed]";
+ #}
+ $imgGen->add($answerResult->{preview_latex_string});
+
}
}