--- trunk/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm 2002/08/22 21:11:53 502 +++ trunk/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm 2003/01/06 19:17:28 683 @@ -15,12 +15,11 @@ use warnings; use base qw(WeBWorK::ContentGenerator); use CGI qw(); +use File::Temp qw(tempdir); use WeBWorK::Form; use WeBWorK::PG; -use WeBWorK::Utils qw(ref2string encodeAnswers decodeAnswers); - -# TODO: -# 7. make warnings work +use WeBWorK::PG::IO; +use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string); ############################################################ # @@ -46,10 +45,6 @@ my $r = $self->{r}; my $userName = $r->param('user'); - # fix format of setName and problem - $setName =~ s/^set//; - $problemNumber =~ s/^prob//; - ##### database setup ##### my $cldb = WeBWorK::DB::Classlist->new($courseEnv); @@ -68,6 +63,7 @@ my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode}; my $redisplay = $r->param("redisplay"); my $submitAnswers = $r->param("submitAnswers"); + my $previewAnswers = $r->param("previewAnswers"); # coerce form fields into CGI::Vars format my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars }; @@ -105,8 +101,9 @@ # final values for options my %will; - foreach(keys %must) { + foreach (keys %must) { $will{$_} = $can{$_} && ($want{$_} || $must{$_}); + #warn "$_: can? $can{$_} want? $want{$_} must? $must{$_} will? $will{$_}\n"; } ##### sticky answers ##### @@ -148,10 +145,11 @@ $self->{problem} = $problem; $self->{permissionLevel} = $permissionLevel; - $self->{displayMode} = $displayMode; - $self->{redisplay} = $redisplay; - $self->{submitAnswers} = $submitAnswers; - $self->{formFields} = $formFields; + $self->{displayMode} = $displayMode; + $self->{redisplay} = $redisplay; + $self->{submitAnswers} = $submitAnswers; + $self->{previewAnswers} = $previewAnswers; + $self->{formFields} = $formFields; $self->{want} = \%want; $self->{must} = \%must; @@ -161,9 +159,21 @@ $self->{pg} = $pg; } -#sub header { -# # *** we need to print $pg->{header_text} here! -#} +sub if_warnings($$) { + my ($self, $arg) = @_; + return $self->{pg}->{warnings} ne ""; +} + +sub if_errors($$) { + my ($self, $arg) = @_; + return $self->{pg}->{flags}->{error_flag}; +} + +sub head { + my $self = shift; + + return $self->{pg}->{head_text} if $self->{pg}->{head_text}; +} sub path { my $self = shift; @@ -177,7 +187,7 @@ return $self->pathMacro($args, "Home" => "$root", $courseName => "$root/$courseName", - $setName => "$root/$courseName/set$setName", + $setName => "$root/$courseName/$setName", "Problem $problemNumber" => "", ); } @@ -191,6 +201,8 @@ my $root = $ce->{webworkURLs}->{root}; my $courseName = $ce->{courseName}; + print CGI::strong("Problems"), CGI::br(); + my $wwdb = $self->{wwdb}; my $user = $self->{r}->param("user"); my @problems; @@ -215,14 +227,16 @@ my $wwdb = $self->{wwdb}; my $user = $self->{r}->param("user"); - my @links = ("Problem List" => "$root/$courseName/set$setName"); + my @links = ("Problem List" => "$root/$courseName/$setName"); my $prevProblem = $wwdb->getProblem($user, $setName, $problemNumber-1); my $nextProblem = $wwdb->getProblem($user, $setName, $problemNumber+1); - unshift @links, "Previous Problem" => "$root/$courseName/set$setName/prob".$prevProblem->id - if $prevProblem; - push @links, "Next Problem" => "$root/$courseName/set$setName/prob".$nextProblem->id - if $nextProblem; + unshift @links, "Previous Problem" => $prevProblem + ? "$root/$courseName/$setName/".$prevProblem->id + : ""; + push @links, "Next Problem" => $nextProblem + ? "$root/$courseName/$setName/".$nextProblem->id + : ""; return $self->navMacro($args, @links); } @@ -238,8 +252,6 @@ sub body { my $self = shift; - #$self->prepare(@_); - # unpack some useful variables my $r = $self->{r}; my $wwdb = $self->{wwdb}; @@ -247,14 +259,14 @@ my $problem = $self->{problem}; my $permissionLevel = $self->{permissionLevel}; my $submitAnswers = $self->{submitAnswers}; + my $previewAnswers = $self->{previewAnswers}; my %will = %{ $self->{will} }; my $pg = $self->{pg}; ##### translation errors? ##### if ($pg->{flags}->{error_flag}) { - print translationError($pg->{errors}, $pg->{body_text}); - return ""; + return translationError($pg->{errors}, $pg->{body_text}); } ##### answer processing ##### @@ -278,6 +290,21 @@ $problem->num_correct($pg->{state}->{num_of_correct_ans}); $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans}); $wwdb->setProblem($problem); + # write to the transaction log, just to make sure + writeLog($self->{courseEnvironment}, "transaction", + $problem->id."\t". + $problem->set_id."\t". + $problem->login_id."\t". + $problem->source_file."\t". + $problem->value."\t". + $problem->max_attempts."\t". + $problem->problem_seed."\t". + $problem->status."\t". + $problem->attempted."\t". + $problem->last_answer."\t". + $problem->num_correct."\t". + $problem->num_incorrect + ); } } @@ -286,8 +313,13 @@ # attempt summary if ($submitAnswers or $will{showCorrectAnswers}) { # print this if user submitted answers OR requested correct answers - print attemptResults($pg, $submitAnswers, $will{showCorrectAnswers}, - $pg->{flags}->{showPartialCorrectAnswers}); + print $self->attemptResults($pg, $submitAnswers, $will{showCorrectAnswers}, + $pg->{flags}->{showPartialCorrectAnswers}, 0); + } elsif ($previewAnswers) { + # print this if user previewed answers + print $self->attemptResults($pg, 1, 0, 0, 1); + # don't show correctness + # don't show correct answers } # score summary @@ -321,13 +353,6 @@ $setClosedMessage, ); - # BY THE WAY.......... - # we have to figure out some way to tell the student if their NEW answer, - # on THIS attempt, has been recorded. however, this is decided in part by - # the grader, so is there any way for us to know? we can rule out several - # cases where the answer is NOT being recorded, because of things decided - # in &canRecordAnswers... - print CGI::hr(); # main form @@ -336,23 +361,52 @@ $self->hidden_authen_fields, CGI::p(CGI::i($pg->{result}->{msg})), CGI::p($pg->{body_text}), - CGI::p(CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers")), - $self->viewOptions, + CGI::p( + CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers"), + CGI::submit(-name=>"previewAnswers", -label=>"Preview Answers"), + ), + $self->viewOptions(), + CGI::endform(); + + # feedback form + my $ce = $self->{courseEnvironment}; + my $root = $ce->{webworkURLs}->{root}; + my $courseName = $ce->{courseName}; + my $feedbackURL = "$root/$courseName/feedback/"; + print + CGI::startform("POST", $feedbackURL), + $self->hidden_authen_fields, + CGI::hidden("module", __PACKAGE__), + CGI::hidden("set", $set->id), + CGI::hidden("problem", $problem->id), + CGI::hidden("displayMode", $self->{displayMode}), + CGI::hidden("showOldAnswers", $will{showOldAnswers}), + CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}), + CGI::hidden("showHints", $will{showHints}), + CGI::hidden("showSolutions", $will{showSolutions}), + CGI::p({-align=>"right"}, + CGI::submit(-name=>"feedbackForm", -label=>"Send Feedback") + ), CGI::endform(); + # warning output + if ($pg->{warnings} ne "") { + print CGI::hr(), warningOutput($pg->{warnings}); + } + # debugging stuff #print - # hr(), - # h2("debugging information"), - # h3("form fields"), - # ref2string($formFields), - # h3("user object"), - # ref2string($user), - # h3("set object"), + # CGI::hr(), + # CGI::h2("debugging information"), + # CGI::h3("form fields"), + # ref2string($self->{formFields}), + # CGI::h3("user object"), + # ref2string($self->{user}), + # CGI::h3("set object"), # ref2string($set), - # h3("problem object"), + # CGI::h3("problem object"), # ref2string($problem), - # h3("PG object"), + # CGI::h3("PG object"), # ref2string($pg, {'WeBWorK::PG::Translator' => 1}); return ""; @@ -360,6 +414,7 @@ ##### output utilities ##### +# this is used by ProblemSet.pm too, so don't fuck it up sub translationError($$) { my ($error, $details) = @_; return @@ -374,16 +429,36 @@ CGI::h3("Error context"), CGI::blockquote(CGI::pre($details)); } -sub attemptResults($$$) { +# this is used by ProblemSet.pm too, so don't fuck it up +sub warningOutput($) { + my $warnings = shift; + + return + CGI::h2("Software Warnings"), + CGI::p(<{result}; # the overall result of the problem my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }; my $header = CGI::th("answer"); $header .= $showAttemptAnswers ? CGI::th("attempt") : ""; + $header .= $showAttemptPreview ? CGI::th("preview") : ""; $header .= $showCorrectAnswers ? CGI::th("correct") : ""; $header .= $showAttemptResults ? CGI::th("result") : ""; $header .= $showAttemptAnswers ? CGI::th("messages") : ""; @@ -392,15 +467,23 @@ foreach my $name (@answerNames) { my $answerResult = $pg->{answers}->{$name}; my $studentAnswer = $answerResult->{student_ans}; # original_student_ans + my $preview = ($showAttemptPreview + ? $self->previewAnswer($answerResult) + : ""); my $correctAnswer = $answerResult->{correct_ans}; my $answerScore = $answerResult->{score}; my $answerMessage = $showAttemptAnswers ? $answerResult->{ans_message} : ""; $numCorrect += $answerScore > 0; - my $resultString = $answerScore ? "correct :^)" : "incorrect >:("; + 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//; my $row = CGI::td($name); $row .= $showAttemptAnswers ? CGI::td($studentAnswer) : ""; + $row .= $showAttemptPreview ? CGI::td($preview) : ""; $row .= $showCorrectAnswers ? CGI::td($correctAnswer) : ""; $row .= $showAttemptResults ? CGI::td($resultString) : ""; $row .= $answerMessage ? CGI::td($answerMessage) : ""; @@ -466,6 +549,63 @@ ); } +sub previewAnswer($$) { + my ($self, $answerResult) = @_; + my $ce = $self->{courseEnvironment}; + my $user = $self->{user}; + my $set = $self->{set}; + my $problem = $self->{problem}; + my $displayMode = $self->{displayMode}; + + # note: right now, we have to do things completely differently when we are + # rendering math from INSIDE the translator and from OUTSIDE the translator. + # so we'll just deal with each case explicitly here. there's some code + # duplication that can be dealt with later by abstracting out tth/dvipng/etc. + + my $tex = $answerResult->{preview_latex_string}; + + if ($displayMode eq "plainText") { + return $tex; + } elsif ($displayMode eq "formattedText") { + my $tthCommand = $ce->{externalPrograms}->{tth} + . " -L -f5 -r 2> /dev/null < /dev/null\n" + . "\\($tex\\)\n" + . "END_OF_INPUT\n"; + + + # call tth + my $result = `$tthCommand`; + if ($?) { + return "[tth failed: $? $@]"; + } + return $result; + } elsif ($displayMode eq "images") { + # how are we going to name this? + my $targetPathCommon = "/png/" + . $user->id . "." + . $set->id . "." + . $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); + if (-e $targetPath) { + return "\"$tex\""; + } else { + return "[math2img failed]"; + } + } +} + ##### permission queries ##### # this stuff should be abstracted out into the permissions system @@ -490,8 +630,9 @@ my ($permissionLevel, $openDate, $dueDate, $maxAttempts, $attempts) = @_; my $permHigh = $permissionLevel > 0; my $timeOK = time >= $openDate && time <= $dueDate; - my $attemptsOK = $attempts <= $maxAttempts; - return $permHigh || ($timeOK && $attemptsOK); + my $attemptsOK = $maxAttempts == -1 || $attempts <= $maxAttempts; + my $recordAnswers = $permHigh || ($timeOK && $attemptsOK); + return $recordAnswers; } sub mustRecordAnswers($) {