[system] / branches / gage_dev / webwork2 / lib / WeBWorK / ContentGenerator / Problem.pm Repository:
ViewVC logotype

Diff of /branches/gage_dev/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 906 Revision 5605
1################################################################################ 1################################################################################
2# WeBWorK mod_perl (c) 2000-2002 WeBWorK Project 2# WeBWorK Online Homework Delivery System
3# $Id$ 3# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
4# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v 1.210 2007/08/13 22:59:55 sh002i Exp $
5#
6# This program is free software; you can redistribute it and/or modify it under
7# the terms of either: (a) the GNU General Public License as published by the
8# Free Software Foundation; either version 2, or (at your option) any later
9# version, or (b) the "Artistic License" which comes with this package.
10#
11# This program is distributed in the hope that it will be useful, but WITHOUT
12# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
13# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the
14# Artistic License for more details.
4################################################################################ 15################################################################################
5 16
6package WeBWorK::ContentGenerator::Problem; 17package WeBWorK::ContentGenerator::Problem;
7use base qw(WeBWorK::ContentGenerator); 18use base qw(WeBWorK::ContentGenerator);
8 19
9=head1 NAME 20=head1 NAME
10 21
11WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem. 22WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem.
12 23
13=cut 24=cut
14 25
15use strict; 26use strict;
16use warnings; 27use warnings;
17use CGI qw(); 28#use CGI qw(-nosticky );
18use File::Temp qw(tempdir); 29use WeBWorK::CGI;
30use File::Path qw(rmtree);
31use WeBWorK::Debug;
19use WeBWorK::Form; 32use WeBWorK::Form;
20use WeBWorK::PG; 33use WeBWorK::PG;
34use WeBWorK::PG::ImageGenerator;
21use WeBWorK::PG::IO; 35use WeBWorK::PG::IO;
22use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string); 36use WeBWorK::Utils qw(readFile writeLog writeCourseLog encodeAnswers decodeAnswers
37 ref2string makeTempDirectory path_is_subdir sortByName before after between);
38use WeBWorK::DB::Utils qw(global2user user2global);
39use URI::Escape;
23 40
41use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
42
24############################################################ 43################################################################################
44# CGI param interface to this module (up-to-date as of v1.153)
45################################################################################
46
47# Standard params:
25# 48#
26# user 49# user - user ID of real user
27# effectiveUser 50# key - session key
28# key 51# effectiveUser - user ID of effective user
29# 52#
30# displayMode 53# Integration with PGProblemEditor:
31# showOldAnswers
32# showCorrectAnswers
33# showHints
34# showSolutions
35# 54#
36# AnSwEr# - answer blanks in problem 55# editMode - if set, indicates alternate problem source location.
56# can be "temporaryFile" or "savedFile".
37# 57#
58# sourceFilePath - path to file to be edited
59# problemSeed - force problem seed to value
60# success - success message to display
61# failure - failure message to display
62#
63# Rendering options:
64#
65# displayMode - name of display mode to use
66#
67# showOldAnswers - request that last entered answer be shown (if allowed)
68# showCorrectAnswers - request that correct answers be shown (if allowed)
69# showHints - request that hints be shown (if allowed)
70# showSolutions - request that solutions be shown (if allowed)
71#
72# Problem interaction:
73#
74# AnSwEr# - answer blanks in problem
75#
38# redisplay - name of the "Redisplay Problem" button 76# redisplay - name of the "Redisplay Problem" button
39# submitAnswers - name of "Submit Answers" button 77# submitAnswers - name of "Submit Answers" button
40# checkAnswers - name of the "Check Answers" button 78# checkAnswers - name of the "Check Answers" button
41# previewAnswers - name of the "Preview Answers" button 79# previewAnswers - name of the "Preview Answers" button
42# 80
43############################################################ 81################################################################################
82# "can" methods
83################################################################################
84
85# Subroutines to determine if a user "can" perform an action. Each subroutine is
86# called with the following arguments:
87#
88# ($self, $User, $EffectiveUser, $Set, $Problem)
89
90# Note that significant parts of the "can" methods are lifted into the
91# GatewayQuiz module. It isn't direct, however, because of the necessity
92# of dealing with versioning there.
93
94sub can_showOldAnswers {
95 #my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
96
97 return 1;
98}
99
100sub can_showCorrectAnswers {
101 my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
102 my $authz = $self->r->authz;
103
104 return
105 after($Set->answer_date)
106 ||
107 $authz->hasPermissions($User->user_id, "show_correct_answers_before_answer_date")
108 ;
109}
110
111sub can_showHints {
112 #my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
113
114 return 1;
115}
116
117sub can_showSolutions {
118 my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
119 my $authz = $self->r->authz;
120
121 return
122 after($Set->answer_date)
123 ||
124 $authz->hasPermissions($User->user_id, "show_solutions_before_answer_date")
125 ;
126}
127
128sub can_recordAnswers {
129 my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
130 my $authz = $self->r->authz;
131 my $thisAttempt = $submitAnswers ? 1 : 0;
132 if ($User->user_id ne $EffectiveUser->user_id) {
133 return $authz->hasPermissions($User->user_id, "record_answers_when_acting_as_student");
134 }
135 if (before($Set->open_date)) {
136 return $authz->hasPermissions($User->user_id, "record_answers_before_open_date");
137 } elsif (between($Set->open_date, $Set->due_date)) {
138 my $max_attempts = $Problem->max_attempts;
139 my $attempts_used = $Problem->num_correct + $Problem->num_incorrect + $thisAttempt;
140 if ($max_attempts == -1 or $attempts_used < $max_attempts) {
141 return $authz->hasPermissions($User->user_id, "record_answers_after_open_date_with_attempts");
142 } else {
143 return $authz->hasPermissions($User->user_id, "record_answers_after_open_date_without_attempts");
144 }
145 } elsif (between($Set->due_date, $Set->answer_date)) {
146 return $authz->hasPermissions($User->user_id, "record_answers_after_due_date");
147 } elsif (after($Set->answer_date)) {
148 return $authz->hasPermissions($User->user_id, "record_answers_after_answer_date");
149 }
150}
151
152sub can_checkAnswers {
153 my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
154 my $authz = $self->r->authz;
155 my $thisAttempt = $submitAnswers ? 1 : 0;
156
157 if (before($Set->open_date)) {
158 return $authz->hasPermissions($User->user_id, "check_answers_before_open_date");
159 } elsif (between($Set->open_date, $Set->due_date)) {
160 my $max_attempts = $Problem->max_attempts;
161 my $attempts_used = $Problem->num_correct + $Problem->num_incorrect + $thisAttempt;
162 if ($max_attempts == -1 or $attempts_used < $max_attempts) {
163 return $authz->hasPermissions($User->user_id, "check_answers_after_open_date_with_attempts");
164 } else {
165 return $authz->hasPermissions($User->user_id, "check_answers_after_open_date_without_attempts");
166 }
167 } elsif (between($Set->due_date, $Set->answer_date)) {
168 return $authz->hasPermissions($User->user_id, "check_answers_after_due_date");
169 } elsif (after($Set->answer_date)) {
170 return $authz->hasPermissions($User->user_id, "check_answers_after_answer_date");
171 }
172}
173
174# Reset the default in some cases
175sub set_showOldAnswers_default {
176 my ($self, $ce, $userName, $authz, $set) = @_;
177 # these people always use the system/course default, so don't
178 # override the value of ...->{showOldAnswers}
179 return if $authz->hasPermissions($userName, "can_always_use_show_old_answers_default");
180 # this person should always default to 0
181 $ce->{pg}->{options}->{showOldAnswers} = 0
182 unless ($authz->hasPermissions($userName, "can_show_old_answers_by_default"));
183 # we are after the due date, so default to not showing it
184 $ce->{pg}->{options}->{showOldAnswers} = 0 if $set->{due_date} && after($set->{due_date});
185}
186
187################################################################################
188# output utilities
189################################################################################
190
191# Note: the substance of attemptResults is lifted into GatewayQuiz.pm,
192# with some changes to the output format
193
194sub attemptResults {
195 my $self = shift;
196 my $pg = shift;
197 my $showAttemptAnswers = shift;
198 my $showCorrectAnswers = shift;
199 my $showAttemptResults = $showAttemptAnswers && shift;
200 my $showSummary = shift;
201 my $showAttemptPreview = shift || 0;
202
203 my $ce = $self->r->ce;
204
205 my $problemResult = $pg->{result}; # the overall result of the problem
206 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
207
208 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
209
210 my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview";
211
212 # to make grabbing these options easier, we'll pull them out now...
213 my %imagesModeOptions = %{$ce->{pg}->{displayModeOptions}->{images}};
214
215 my $imgGen = WeBWorK::PG::ImageGenerator->new(
216 tempDir => $ce->{webworkDirs}->{tmp},
217 latex => $ce->{externalPrograms}->{latex},
218 dvipng => $ce->{externalPrograms}->{dvipng},
219 useCache => 1,
220 cacheDir => $ce->{webworkDirs}->{equationCache},
221 cacheURL => $ce->{webworkURLs}->{equationCache},
222 cacheDB => $ce->{webworkFiles}->{equationCacheDB},
223 dvipng_align => $imagesModeOptions{dvipng_align},
224 dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
225 );
226
227 my $header;
228 #$header .= CGI::th("Part");
229 $header .= $showAttemptAnswers ? CGI::th("Entered") : "";
230 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : "";
231 $header .= $showCorrectAnswers ? CGI::th("Correct") : "";
232 $header .= $showAttemptResults ? CGI::th("Result") : "";
233 $header .= $showMessages ? CGI::th("Messages") : "";
234 my $fully = '';
235 my @tableRows = ( $header );
236 my $numCorrect = 0;
237 my $numBlanks =0;
238 my $tthPreambleCache;
239 foreach my $name (@answerNames) {
240 my $answerResult = $pg->{answers}->{$name};
241 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
242 my $preview = ($showAttemptPreview
243 ? $self->previewAnswer($answerResult, $imgGen, \$tthPreambleCache)
244 : "");
245 my $correctAnswer = $answerResult->{correct_ans};
246 my $answerScore = $answerResult->{score};
247 my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
248 $answerMessage =~ s/\n/<BR>/g;
249 $numCorrect += $answerScore >= 1;
250 $numBlanks++ unless $studentAnswer =~/\S/ || $answerScore >= 1; # unless student answer contains entry
251 my $resultString = $answerScore >= 1 ? "correct" :
252 $answerScore > 0 ? int($answerScore*100)."% correct" :
253 "incorrect";
254 $fully = 'completely ' if $answerScore >0 and $answerScore < 1;
255
256 # get rid of the goofy prefix on the answer names (supposedly, the format
257 # of the answer names is changeable. this only fixes it for "AnSwEr"
258 #$name =~ s/^AnSwEr//;
259
260 my $row;
261 #$row .= CGI::td($name);
262 $row .= $showAttemptAnswers ? CGI::td($self->nbsp($studentAnswer)) : "";
263 $row .= $showAttemptPreview ? CGI::td($self->nbsp($preview)) : "";
264 $row .= $showCorrectAnswers ? CGI::td($self->nbsp($correctAnswer)) : "";
265 $row .= $showAttemptResults ? CGI::td($self->nbsp($resultString)) : "";
266 $row .= $showMessages ? CGI::td({-class=>"Message"},$self->nbsp($answerMessage)) : "";
267 push @tableRows, $row;
268 }
269
270 # render equation images
271 $imgGen->render(refresh => 1);
272
273# my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
274 my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
275# FIXME -- I left the old code in in case we have to back out.
276# my $summary = "On this attempt, you answered $numCorrect out of "
277# . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
278 my $summary = "";
279 unless (defined($problemResult->{summary}) and $problemResult->{summary} =~ /\S/) {
280 if (scalar @answerNames == 1) { #default messages
281 if ($numCorrect == scalar @answerNames) {
282 $summary .= CGI::div({class=>"ResultsWithoutError"},"The answer above is correct.");
283 } else {
284 $summary .= CGI::div({class=>"ResultsWithError"},"The answer above is NOT ${fully}correct.");
285 }
286 } else {
287 if ($numCorrect == scalar @answerNames) {
288 $summary .= CGI::div({class=>"ResultsWithoutError"},"All of the answers above are correct.");
289 }
290 unless ($numCorrect + $numBlanks == scalar( @answerNames)) {
291 $summary .= CGI::div({class=>"ResultsWithError"},"At least one of the answers above is NOT ${fully}correct.");
292 }
293 if ($numBlanks) {
294 my $s = ($numBlanks>1)?'':'s';
295 $summary .= CGI::div({class=>"ResultsAlert"},"$numBlanks of the questions remain$s unanswered.");
296 }
297 }
298 } else {
299 $summary = $problemResult->{summary}; # summary has been defined by grader
300 }
301 return
302 CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows))
303 . ($showSummary ? CGI::p({class=>'attemptResultsSummary'},$summary) : "");
304}
305
306
307# Note: previewAnswer is lifted into GatewayQuiz.pm
308
309sub previewAnswer {
310 my ($self, $answerResult, $imgGen, $tthPreambleCache) = @_;
311 my $ce = $self->r->ce;
312 my $effectiveUser = $self->{effectiveUser};
313 my $set = $self->{set};
314 my $problem = $self->{problem};
315 my $displayMode = $self->{displayMode};
316
317 # note: right now, we have to do things completely differently when we are
318 # rendering math from INSIDE the translator and from OUTSIDE the translator.
319 # so we'll just deal with each case explicitly here. there's some code
320 # duplication that can be dealt with later by abstracting out tth/dvipng/etc.
321
322 my $tex = $answerResult->{preview_latex_string};
323
324 return "" unless defined $tex and $tex ne "";
325
326 if ($displayMode eq "plainText") {
327 return $tex;
328 } elsif ($displayMode eq "formattedText") {
329
330 # read the TTH preamble, or use the cached copy passed in from the caller
331 my $tthPreamble='';
332 if (defined $$tthPreambleCache) {
333 $tthPreamble = $$tthPreambleCache;
334 } else {
335 my $tthPreambleFile = $ce->{courseDirs}->{templates} . "/tthPreamble.tex";
336 if (-r $tthPreambleFile) {
337 $tthPreamble = readFile($tthPreambleFile);
338 # thanks to Jim Martino. each line in the definition file should end with
339 #a % to prevent adding supurious paragraphs to output:
340 $tthPreamble =~ s/(.)\n/$1%\n/g;
341 # solves the problem if the file doesn't end with a return:
342 $tthPreamble .="%\n";
343 # store preamble in cache:
344 $$tthPreambleCache = $tthPreamble;
345 } else {
346 }
347 }
348
349 # construct TTH command line
350 my $tthCommand = $ce->{externalPrograms}->{tth}
351 . " -L -f5 -u -r 2> /dev/null <<END_OF_INPUT; echo > /dev/null\n"
352 . $tthPreamble . "\\[" . $tex . "\\]\n"
353 . "END_OF_INPUT\n";
354
355 # call tth
356 my $result = `$tthCommand`;
357 if ($?) {
358 return "<b>[tth failed: $? $@]</b>";
359 } else {
360 # avoid border problems in tables and remove unneeded initial <br>
361 $result =~ s/(<table [^>]*)>/$1 CLASS="ArrayLayout">/gi;
362 $result =~ s!\s*<br clear="all" />!!;
363 return $result;
364 }
365
366 } elsif ($displayMode eq "images") {
367 $imgGen->add($tex);
368 } elsif ($displayMode eq "jsMath") {
369 $tex =~ s/</&lt;/g; $tex =~ s/>/&gt;/g;
370 return '<SPAN CLASS="math">\\displaystyle{'.$tex.'}</SPAN>';
371 }
372}
373
374################################################################################
375# Template escape implementations
376################################################################################
44 377
45sub pre_header_initialize { 378sub pre_header_initialize {
46 my ($self, $setName, $problemNumber) = @_; 379 my ($self) = @_;
47 my $r = $self->{r}; 380 my $r = $self->r;
48 my $courseEnv = $self->{ce}; 381 my $ce = $r->ce;
49 my $db = $self->{db}; 382 my $db = $r->db;
383 my $authz = $r->authz;
384 my $urlpath = $r->urlpath;
385
386 my $setName = $urlpath->arg("setID");
387 my $problemNumber = $r->urlpath->arg("problemID");
50 my $userName = $r->param('user'); 388 my $userName = $r->param('user');
51 my $effectiveUserName = $r->param('effectiveUser'); 389 my $effectiveUserName = $r->param('effectiveUser');
390 my $key = $r->param('key');
391 my $editMode = $r->param("editMode");
52 392
53 my $user = $db->getUser($userName); 393 my $user = $db->getUser($userName); # checked
394 die "record for user $userName (real user) does not exist."
395 unless defined $user;
396
54 my $effectiveUser = $db->getUser($effectiveUserName); 397 my $effectiveUser = $db->getUser($effectiveUserName); # checked
398 die "record for user $effectiveUserName (effective user) does not exist."
399 unless defined $effectiveUser;
400
401 # obtain the merged set for $effectiveUser
402 my $set = $db->getMergedSet($effectiveUserName, $setName); # checked
403
404 $self->set_showOldAnswers_default($ce, $userName, $authz, $set);
405
406 # Database fix (in case of undefined published values)
407 # this is only necessary because some people keep holding to ww1.9 which did not have a published field
408 # make sure published is set to 0 or 1
409 if ( $set and $set->published ne "0" and $set->published ne "1") {
410 my $globalSet = $db->getGlobalSet($set->set_id);
411 $globalSet->published("1"); # defaults to published
412 $db->putGlobalSet($globalSet);
55 my $set = $db->getGlobalUserSet($effectiveUserName, $setName); 413 $set = $db->getMergedSet($effectiveUserName, $setName);
414 } else {
415 # don't do anything just yet, maybe we're a professor and we're
416 # fabricating a set or haven't assigned it to ourselves just yet
417 }
418
419 # obtain the merged problem for $effectiveUser
56 my $problem = $db->getGlobalUserProblem($effectiveUserName, $setName, $problemNumber); 420 my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber); # checked
57 my $psvn = $set->psvn(); 421
58 my $permissionLevel = $db->getPermissionLevel($userName)->permission(); 422 if ($authz->hasPermissions($userName, "modify_problem_sets")) {
59 423 # professors are allowed to fabricate sets and problems not
424 # assigned to them (or anyone). this allows them to use the
425 # editor to
426
427 # if a User Set does not exist for this user and this set
428 # then we check the Global Set
429 # if that does not exist we create a fake set
430 # if it does, we add fake user data
431 unless (defined $set) {
432 my $userSetClass = $db->{set_user}->{record};
433 my $globalSet = $db->getGlobalSet($setName); # checked
434
435 if (not defined $globalSet) {
436 $set = fake_set($db);
437 } else {
438 $set = global2user($userSetClass, $globalSet);
439 $set->psvn(0);
440 }
441 }
442
443 # if that is not yet defined obtain the global problem,
444 # convert it to a user problem, and add fake user data
445 unless (defined $problem) {
446 my $userProblemClass = $db->{problem_user}->{record};
447 my $globalProblem = $db->getGlobalProblem($setName, $problemNumber); # checked
448 # if the global problem doesn't exist either, bail!
449 if(not defined $globalProblem) {
450 my $sourceFilePath = $r->param("sourceFilePath");
451 die "sourceFilePath is unsafe!" unless path_is_subdir($sourceFilePath, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
452 # These are problems from setmaker. If declared invalid, they won't come up
453 $self->{invalidProblem} = $self->{invalidSet} = 1 unless defined $sourceFilePath;
454# die "Problem $problemNumber in set $setName does not exist" unless defined $sourceFilePath;
455 $problem = fake_problem($db);
456 $problem->problem_id(1);
457 $problem->source_file($sourceFilePath);
458 $problem->user_id($effectiveUserName);
459 } else {
460 $problem = global2user($userProblemClass, $globalProblem);
461 $problem->user_id($effectiveUserName);
462 $problem->problem_seed(0);
463 $problem->status(0);
464 $problem->attempted(0);
465 $problem->last_answer("");
466 $problem->num_correct(0);
467 $problem->num_incorrect(0);
468 }
469 }
470
471 # now we're sure we have valid UserSet and UserProblem objects
472 # yay!
473
474 # now deal with possible editor overrides:
475
476 # if the caller is asking to override the source file, and
477 # editMode calls for a temporary file, do so
478 my $sourceFilePath = $r->param("sourceFilePath");
479 if (defined $editMode and $editMode eq "temporaryFile" and defined $sourceFilePath) {
480 die "sourceFilePath is unsafe!" unless path_is_subdir($sourceFilePath, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
481 $problem->source_file($sourceFilePath);
482 }
483
484 # if the problem does not have a source file or no source file has been passed in
485 # then this is really an invalid problem (probably from a bad URL)
486 $self->{invalidProblem} = not (defined $sourceFilePath or $problem->source_file);
487
488 # if the caller is asking to override the problem seed, do so
489 my $problemSeed = $r->param("problemSeed");
490 if (defined $problemSeed) {
491 $problem->problem_seed($problemSeed);
492 }
493
494 my $publishedClass = ($set->published) ? "Published" : "Unpublished";
495 my $publishedText = ($set->published) ? "visible to students." : "hidden from students.";
496 $self->addmessage(CGI::p("This set is " . CGI::font({class=>$publishedClass}, $publishedText)));
497
498 # test for additional problem validity if it's not already invalid
499 } else {
500 $self->{invalidProblem} = !(defined $problem and ($set->published || $authz->hasPermissions($userName, "view_unpublished_sets")));
501
502 $self->addbadmessage(CGI::p("This problem will not count towards your grade.")) if $problem and not $problem->value and not $self->{invalidProblem};
503 }
504
60 $self->{userName} = $userName; 505 $self->{userName} = $userName;
506 $self->{effectiveUserName} = $effectiveUserName;
61 $self->{user} = $user; 507 $self->{user} = $user;
62 $self->{effectiveUser} = $effectiveUser; 508 $self->{effectiveUser} = $effectiveUser;
63 $self->{set} = $set; 509 $self->{set} = $set;
64 $self->{problem} = $problem; 510 $self->{problem} = $problem;
65 $self->{permissionLevel} = $permissionLevel; 511 $self->{editMode} = $editMode;
66 512
67 ##### form processing ##### 513 ##### form processing #####
68 514
69 # set options from form fields (see comment at top of file for names) 515 # set options from form fields (see comment at top of file for names)
70 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode}; 516 my $displayMode = $r->param("displayMode") || $ce->{pg}->{options}->{displayMode};
71 my $redisplay = $r->param("redisplay"); 517 my $redisplay = $r->param("redisplay");
72 my $submitAnswers = $r->param("submitAnswers"); 518 my $submitAnswers = $r->param("submitAnswers");
73 my $checkAnswers = $r->param("checkAnswers"); 519 my $checkAnswers = $r->param("checkAnswers");
74 my $previewAnswers = $r->param("previewAnswers"); 520 my $previewAnswers = $r->param("previewAnswers");
75 521
76 # coerce form fields into CGI::Vars format
77 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars }; 522 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
78 523
79 $self->{displayMode} = $displayMode; 524 $self->{displayMode} = $displayMode;
80 $self->{redisplay} = $redisplay; 525 $self->{redisplay} = $redisplay;
81 $self->{submitAnswers} = $submitAnswers; 526 $self->{submitAnswers} = $submitAnswers;
82 $self->{checkAnswers} = $checkAnswers; 527 $self->{checkAnswers} = $checkAnswers;
83 $self->{previewAnswers} = $previewAnswers; 528 $self->{previewAnswers} = $previewAnswers;
84 $self->{formFields} = $formFields; 529 $self->{formFields} = $formFields;
530
531 # get result and send to message
532 my $status_message = $r->param("status_message");
533 $self->addmessage(CGI::p("$status_message")) if $status_message;
534
535 # now that we've set all the necessary variables quit out if the set or problem is invalid
536 return if $self->{invalidSet} || $self->{invalidProblem};
85 537
86 ##### permissions ##### 538 ##### permissions #####
87 539
88 # are we allowed to view this problem?
89 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
90 return unless $self->{isOpen};
91
92 # what does the user want to do? 540 # what does the user want to do?
541 #FIXME There is a problem with checkboxes -- if they are not checked they are invisible. Hence if the default mode in $ce is 1
542 # there is no way to override this. Probably this is ok for the last three options, but it was definitely not ok for showing
543 # saved answers which is normally on, but you want to be able to turn it off! This section should be moved to ContentGenerator
544 # so that you can set these options anywhere. We also need mechanisms for making them sticky.
545 # Note: ProblemSet and ProblemSets might set showOldAnswers to '', which
546 # needs to be treated as if it is not set.
93 my %want = ( 547 my %want = (
94 showOldAnswers => $r->param("showOldAnswers") || $courseEnv->{pg}->{options}->{showOldAnswers}, 548 showOldAnswers => (defined($r->param("showOldAnswers")) and $r->param("showOldAnswers") ne '') ? $r->param("showOldAnswers") : $ce->{pg}->{options}->{showOldAnswers},
95 showCorrectAnswers => $r->param("showCorrectAnswers") || $courseEnv->{pg}->{options}->{showCorrectAnswers}, 549 showCorrectAnswers => $r->param("showCorrectAnswers") || $ce->{pg}->{options}->{showCorrectAnswers},
96 showHints => $r->param("showHints") || $courseEnv->{pg}->{options}->{showHints}, 550 showHints => $r->param("showHints") || $ce->{pg}->{options}->{showHints},
97 showSolutions => $r->param("showSolutions") || $courseEnv->{pg}->{options}->{showSolutions}, 551 showSolutions => $r->param("showSolutions") || $ce->{pg}->{options}->{showSolutions},
98 recordAnswers => $submitAnswers, 552 recordAnswers => $submitAnswers,
99 checkAnswers => $checkAnswers, 553 checkAnswers => $checkAnswers,
554 getSubmitButton => 1,
100 ); 555 );
101 556
102 # are certain options enforced? 557 # are certain options enforced?
103 my %must = ( 558 my %must = (
104 showOldAnswers => 0, 559 showOldAnswers => 0,
105 showCorrectAnswers => 0, 560 showCorrectAnswers => 0,
106 showHints => 0, 561 showHints => 0,
107 showSolutions => 0, 562 showSolutions => 0,
108 recordAnswers => mustRecordAnswers($permissionLevel), 563 recordAnswers => ! $authz->hasPermissions($userName, "avoid_recording_answers"),
109 checkAnswers => 0, 564 checkAnswers => 0,
565 getSubmitButton => 0,
110 ); 566 );
111 567
112 # does the user have permission to use certain options? 568 # does the user have permission to use certain options?
569 my @args = ($user, $effectiveUser, $set, $problem);
113 my %can = ( 570 my %can = (
114 showOldAnswers => 1, 571 showOldAnswers => $self->can_showOldAnswers(@args),
115 showCorrectAnswers => canShowCorrectAnswers($permissionLevel, $set->answer_date), 572 showCorrectAnswers => $self->can_showCorrectAnswers(@args),
116 showHints => 1, 573 showHints => $self->can_showHints(@args),
117 showSolutions => canShowSolutions($permissionLevel, $set->answer_date), 574 showSolutions => $self->can_showSolutions(@args),
118 recordAnswers => canRecordAnswers($permissionLevel, $set->open_date, $set->due_date, 575 recordAnswers => $self->can_recordAnswers(@args, 0),
119 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1), 576 checkAnswers => $self->can_checkAnswers(@args, $submitAnswers),
120 # attempts=num_correct+num_incorrect+1, as this happens before updating $problem 577 getSubmitButton => $self->can_recordAnswers(@args, $submitAnswers),
121 checkAnswers => canCheckAnswers($permissionLevel, $set->answer_date),
122 ); 578 );
123 579
124 # final values for options 580 # final values for options
125 my %will; 581 my %will;
126 foreach (keys %must) { 582 foreach (keys %must) {
127 $will{$_} = $can{$_} && ($want{$_} || $must{$_}); 583 $will{$_} = $can{$_} && ($want{$_} || $must{$_});
128 } 584 }
129 585
130 ##### sticky answers ##### 586 ##### sticky answers #####
131 587
132 if (not $submitAnswers and $will{showOldAnswers}) { 588 if (not ($submitAnswers or $previewAnswers or $checkAnswers) and $will{showOldAnswers}) {
133 # do this only if new answers are NOT being submitted 589 # do this only if new answers are NOT being submitted
134 my %oldAnswers = decodeAnswers($problem->last_answer); 590 my %oldAnswers = decodeAnswers($problem->last_answer);
135 $formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers; 591 $formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers;
136 } 592 }
137 593
138 ##### translation ##### 594 ##### translation #####
139 595
596 debug("begin pg processing");
140 my $pg = WeBWorK::PG->new( 597 my $pg = WeBWorK::PG->new(
141 $courseEnv, 598 $ce,
142 $effectiveUser, 599 $effectiveUser,
143 $r->param('key'), 600 $key,
144 $set, 601 $set,
145 $problem, 602 $problem,
146 $psvn, 603 $set->psvn, # FIXME: this field should be removed
147 $formFields, 604 $formFields,
148 { # translation options 605 { # translation options
149 displayMode => $displayMode, 606 displayMode => $displayMode,
150 showHints => $will{showHints}, 607 showHints => $will{showHints},
151 showSolutions => $will{showSolutions}, 608 showSolutions => $will{showSolutions},
152 refreshMath2img => $will{showHints} || $will{showSolutions}, 609 refreshMath2img => $will{showHints} || $will{showSolutions},
153 processAnswers => 1, 610 processAnswers => 1,
154 }, 611 },
155 ); 612 );
156 613
614 debug("end pg processing");
615
157 ##### fix hint/solution options ##### 616 ##### fix hint/solution options #####
158 617
159 $can{showHints} &&= $pg->{flags}->{hintExists}; 618 $can{showHints} &&= $pg->{flags}->{hintExists}
619 &&= $pg->{flags}->{showHintLimit}<=$pg->{state}->{num_of_incorrect_ans};
160 $can{showSolutions} &&= $pg->{flags}->{solutionExists}; 620 $can{showSolutions} &&= $pg->{flags}->{solutionExists};
161 621
162 ##### store fields ##### 622 ##### store fields #####
163 623
164 $self->{want} = \%want; 624 $self->{want} = \%want;
165 $self->{must} = \%must; 625 $self->{must} = \%must;
166 $self->{can} = \%can; 626 $self->{can} = \%can;
167 $self->{will} = \%will; 627 $self->{will} = \%will;
168
169 $self->{pg} = $pg; 628 $self->{pg} = $pg;
170}
171
172sub if_warnings($$) {
173 my ($self, $arg) = @_;
174 return 0 unless $self->{isOpen};
175 return $self->{pg}->{warnings} ne "";
176} 629}
177 630
178sub if_errors($$) { 631sub if_errors($$) {
179 my ($self, $arg) = @_; 632 my ($self, $arg) = @_;
180 return 0 unless $self->{isOpen}; 633
634 if ($self->{isOpen}) {
181 return $self->{pg}->{flags}->{error_flag}; 635 return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
636 } else {
637 return !$arg;
638 }
182} 639}
183 640
184sub head { 641sub head {
185 my $self = shift; 642 my ($self) = @_;
186 return "" unless $self->{isOpen}; 643
644 return "" if ( $self->{invalidSet} );
187 return $self->{pg}->{head_text} if $self->{pg}->{head_text}; 645 return $self->{pg}->{head_text} if $self->{pg}->{head_text};
188} 646}
189 647
190sub path { 648sub options {
191 my $self = shift; 649 my ($self) = @_;
192 my $args = $_[-1]; 650 #warn "doing options in Problem";
193 my $setName = $self->{set}->set_id;
194 my $problemNumber = $self->{problem}->problem_id;
195 651
196 my $ce = $self->{ce}; 652 # don't show options if we don't have anything to show
197 my $root = $ce->{webworkURLs}->{root}; 653 return "" if $self->{invalidSet} or $self->{invalidProblem};
198 my $courseName = $ce->{courseName}; 654
655 my $displayMode = $self->{displayMode};
656 my %can = %{ $self->{can} };
657
658 my @options_to_show = "displayMode";
659 push @options_to_show, "showOldAnswers" if $can{showOldAnswers};
660 push @options_to_show, "showHints" if $can{showHints};
661 push @options_to_show, "showSolutions" if $can{showSolutions};
662
199 return $self->pathMacro($args, 663 return $self->optionsMacro(
200 "Home" => "$root", 664 options_to_show => \@options_to_show,
201 $courseName => "$root/$courseName", 665 extra_params => ["editMode", "sourceFilePath"],
202 $setName => "$root/$courseName/$setName",
203 "Problem $problemNumber" => "",
204 ); 666 );
205} 667}
206 668
207sub siblings { 669sub siblings {
208 my $self = shift; 670 my ($self) = @_;
671 my $r = $self->r;
672 my $db = $r->db;
673 my $urlpath = $r->urlpath;
674
675 # can't show sibling problems if the set is invalid
676 return "" if $self->{invalidSet};
677
678 my $courseID = $urlpath->arg("courseID");
209 my $setName = $self->{set}->set_id; 679 my $setID = $self->{set}->set_id;
210 my $problemNumber = $self->{problem}->problem_id;
211
212 my $ce = $self->{ce};
213 my $db = $self->{db};
214 my $root = $ce->{webworkURLs}->{root};
215 my $courseName = $ce->{courseName};
216
217 print CGI::strong("Problems"), CGI::br();
218
219 my $effectiveUser = $self->{r}->param("effectiveUser"); 680 my $eUserID = $r->param("effectiveUser");
220 my @problems; 681 my @problemIDs = sort { $a <=> $b } $db->listUserProblems($eUserID, $setID);
221 push @problems, $db->getGlobalUserProblem($effectiveUser, $setName, $_) 682
222 foreach ($db->listUserProblems($effectiveUser, $setName)); 683 print CGI::start_div({class=>"info-box", id=>"fisheye"});
223 foreach my $problem (sort { $a->problem_id <=> $b->problem_id } @problems) { 684 print CGI::h2("Problems");
224 print CGI::a({-href=>"$root/$courseName/$setName/".$problem->problem_id."/?" 685 #print CGI::start_ul({class=>"LinksMenu"});
225 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}}, 686 #print CGI::start_li();
226 "Problem ".$problem->problem_id), CGI::br(); 687 #print CGI::span({style=>"font-size:larger"}, "Problems");
688 print CGI::start_ul();
689
690 foreach my $problemID (@problemIDs) {
691 my $problemPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",
692 courseID => $courseID, setID => $setID, problemID => $problemID);
693 print CGI::li(CGI::a( {href=>$self->systemLink($problemPage,
694 params=>{ displayMode => $self->{displayMode},
695 showOldAnswers => $self->{will}->{showOldAnswers}
696 })}, "Problem $problemID")
697 );
227 } 698 }
699
700 print CGI::end_ul();
701 #print CGI::end_li();
702 #print CGI::end_ul();
703 print CGI::end_div();
704
705 return "";
228} 706}
229 707
230sub nav { 708sub nav {
231 my $self = shift; 709 my ($self, $args) = @_;
232 my $args = $_[-1];
233 my $setName = $self->{set}->set_id;
234 my $problemNumber = $self->{problem}->problem_id;
235
236 my $ce = $self->{ce}; 710 my $r = $self->r;
237 my $db = $self->{db}; 711 my $db = $r->db;
238 my $root = $ce->{webworkURLs}->{root}; 712 my $urlpath = $r->urlpath;
239 my $courseName = $ce->{courseName};
240 713
241 my $wwdb = $self->{wwdb}; 714 return "" if ( $self->{invalidSet} );
715
716 my $courseID = $urlpath->arg("courseID");
717 my $setID = $self->{set}->set_id if !($self->{invalidSet});
718 my $problemID = $self->{problem}->problem_id if !($self->{invalidProblem});
242 my $effectiveUser = $self->{r}->param("effectiveUser"); 719 my $eUserID = $r->param("effectiveUser");
243 my $tail = "&displayMode=".$self->{displayMode};
244 720
245 my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList"); 721 my ($prevID, $nextID);
722
723 if (!$self->{invalidProblem}) {
724 my @problemIDs = $db->listUserProblems($eUserID, $setID);
725 foreach my $id (@problemIDs) {
726 $prevID = $id if $id < $problemID
727 and (not defined $prevID or $id > $prevID);
728 $nextID = $id if $id > $problemID
729 and (not defined $nextID or $id < $nextID);
730 }
731 }
246 732
247 my $prevProblem = $db->getGlobalUserProblem($effectiveUser, $setName, $problemNumber-1); 733 my @links;
248 my $nextProblem = $db->getGlobalUserProblem($effectiveUser, $setName, $problemNumber+1); 734
249 unshift @links, "Previous Problem" , ($prevProblem 735 if ($prevID) {
250 ? "$root/$courseName/$setName/".$prevProblem->problem_id 736 my $prevPage = $urlpath->newFromModule(__PACKAGE__,
251 : "") , "navPrev"; 737 courseID => $courseID, setID => $setID, problemID => $prevID);
738 push @links, "Previous Problem", $r->location . $prevPage->path, "navPrev";
739 } else {
740 push @links, "Previous Problem", "", "navPrevGrey";
741 }
742
743 push @links, "Problem List", $r->location . $urlpath->parent->path, "navProbList";
744
745 if ($nextID) {
746 my $nextPage = $urlpath->newFromModule(__PACKAGE__,
747 courseID => $courseID, setID => $setID, problemID => $nextID);
748 push @links, "Next Problem", $r->location . $nextPage->path, "navNext";
749 } else {
252 push @links, "Next Problem" , ($nextProblem 750 push @links, "Next Problem", "", "navNextGrey";
253 ? "$root/$courseName/$setName/".$nextProblem->problem_id 751 }
254 : "") , "navNext";
255 752
753 my $tail = "";
754
755 $tail .= "&displayMode=".$self->{displayMode} if defined $self->{displayMode};
756 $tail .= "&showOldAnswers=".$self->{will}->{showOldAnswers}
757 if defined $self->{will}->{showOldAnswers};
256 return $self->navMacro($args, $tail, @links); 758 return $self->navMacro($args, $tail, @links);
257} 759}
258 760
259sub title { 761sub title {
260 my $self = shift; 762 my ($self) = @_;
261 my $setName = $self->{set}->set_id; 763
262 my $problemNumber = $self->{problem}->problem_id; 764 # using the url arguments won't break if the set/problem are invalid
765 my $setID = WeBWorK::ContentGenerator::underscore2nbsp($self->r->urlpath->arg("setID"));
766 my $problemID = $self->r->urlpath->arg("problemID");
263 767
264 return "$setName : Problem $problemNumber"; 768 return "$setID: Problem $problemID";
265} 769}
266 770
267sub body { 771sub body {
268 my $self = shift; 772 my $self = shift;
773 my $r = $self->r;
774 my $ce = $r->ce;
775 my $db = $r->db;
776 my $authz = $r->authz;
777 my $urlpath = $r->urlpath;
778 my $user = $r->param('user');
779 my $effectiveUser = $r->param('effectiveUser');
780
781 if ( $self->{invalidSet} ) {
782 return CGI::div({class=>"ResultsWithError"},
783 CGI::p("The selected problem set (" .
784 $urlpath->arg("setID") . ") is not " .
785 "a valid set for $effectiveUser:"),
786 CGI::p($self->{invalidSet}));
787 }
269 788
270 return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the problem set that contains it is not yet open.")) 789 if ($self->{invalidProblem}) {
271 unless $self->{isOpen}; 790 return CGI::div({class=>"ResultsWithError"},
272 791 CGI::p("The selected problem (" . $urlpath->arg("problemID") . ") is not a valid problem for set " . $self->{set}->set_id . "."));
792 }
793
273 # unpack some useful variables 794 # unpack some useful variables
274 my $r = $self->{r};
275 my $db = $self->{db};
276 my $set = $self->{set}; 795 my $set = $self->{set};
277 my $problem = $self->{problem}; 796 my $problem = $self->{problem};
278 my $permissionLevel = $self->{permissionLevel}; 797 my $editMode = $self->{editMode};
279 my $submitAnswers = $self->{submitAnswers}; 798 my $submitAnswers = $self->{submitAnswers};
280 my $checkAnswers = $self->{checkAnswers}; 799 my $checkAnswers = $self->{checkAnswers};
281 my $previewAnswers = $self->{previewAnswers}; 800 my $previewAnswers = $self->{previewAnswers};
282 my %want = %{ $self->{want} }; 801 my %want = %{ $self->{want} };
283 my %can = %{ $self->{can} }; 802 my %can = %{ $self->{can} };
284 my %must = %{ $self->{must} }; 803 my %must = %{ $self->{must} };
285 my %will = %{ $self->{will} }; 804 my %will = %{ $self->{will} };
286 my $pg = $self->{pg}; 805 my $pg = $self->{pg};
287 806
807 my $courseName = $urlpath->arg("courseID");
808
809 # FIXME: move editor link to top, next to problem number.
810 # format as "[edit]" like we're doing with course info file, etc.
811 # add edit link for set as well.
812 my $editorLink = "";
813 # if we are here without a real homework set, carry that through
814 my $forced_field = [];
815 $forced_field = ['sourceFilePath' => $r->param("sourceFilePath")] if
816 ($set->set_id eq 'Undefined_Set');
817 if ($authz->hasPermissions($user, "modify_problem_sets")) {
818 my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
819 courseID => $courseName, setID => $set->set_id, problemID => $problem->problem_id);
820 my $editorURL = $self->systemLink($editorPage, params=>$forced_field);
821 $editorLink = CGI::p(CGI::a({href=>$editorURL,target =>'WW_Editor'}, "Edit this problem"));
822 }
823
288 ##### translation errors? ##### 824 ##### translation errors? #####
289 825
290 if ($pg->{flags}->{error_flag}) { 826 if ($pg->{flags}->{error_flag}) {
827 if ($authz->hasPermissions($user, "view_problem_debugging_info")) {
291 return $self->errorOutput($pg->{errors}, $pg->{body_text}); 828 print $self->errorOutput($pg->{errors}, $pg->{body_text});
829 } else {
830 print $self->errorOutput($pg->{errors}, "You do not have permission to view the details of this error.");
831 }
832 print $editorLink;
833 return "";
292 } 834 }
293 835
294 ##### answer processing ##### 836 ##### answer processing #####
295 837 debug("begin answer processing");
296 # if answers were submitted: 838 # if answers were submitted:
839 my $scoreRecordedMessage;
840 my $pureProblem;
297 if ($submitAnswers) { 841 if ($submitAnswers) {
298 # get a "pure" (unmerged) UserProblem to modify 842 # get a "pure" (unmerged) UserProblem to modify
843 # this will be undefined if the problem has not been assigned to this user
299 my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); 844 $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); # checked
845 if (defined $pureProblem) {
300 # store answers in DB for sticky answers 846 # store answers in DB for sticky answers
301 my %answersToStore; 847 my %answersToStore;
302 my %answerHash = %{ $pg->{answers} }; 848 my %answerHash = %{ $pg->{answers} };
303 $answersToStore{$_} = $answerHash{$_}->{original_student_ans} 849 $answersToStore{$_} = $self->{formFields}->{$_} #$answerHash{$_}->{original_student_ans} -- this may have been modified for fields with multiple values. Don't use it!!
304 foreach (keys %answerHash); 850 foreach (keys %answerHash);
851
852 # There may be some more answers to store -- one which are auxiliary entries to a primary answer. Evaluating
853 # matrices works in this way, only the first answer triggers an answer evaluator, the rest are just inputs
854 # however we need to store them. Fortunately they are still in the input form.
855 my @extra_answer_names = @{ $pg->{flags}->{KEPT_EXTRA_ANSWERS}};
856 $answersToStore{$_} = $self->{formFields}->{$_} foreach (@extra_answer_names);
857
858 # Now let's encode these answers to store them -- append the extra answers to the end of answer entry order
859 my @answer_order = (@{$pg->{flags}->{ANSWER_ENTRY_ORDER}}, @extra_answer_names);
305 my $answerString = encodeAnswers(%answersToStore, 860 my $answerString = encodeAnswers(%answersToStore,
306 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }); 861 @answer_order);
862
863 # store last answer to database
864 $problem->last_answer($answerString);
307 $pureProblem->last_answer($answerString); 865 $pureProblem->last_answer($answerString);
308 $problem->last_answer($answerString);
309 $db->putUserProblem($pureProblem);
310
311 # store state in DB if it makes sense
312 if ($will{recordAnswers}) {
313 $problem->status($pg->{state}->{recorded_score});
314 $problem->attempted(1);
315 $problem->num_correct($pg->{state}->{num_of_correct_ans});
316 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
317 $pureProblem->status($pg->{state}->{recorded_score});
318 $pureProblem->attempted(1);
319 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
320 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
321 $db->putUserProblem($pureProblem); 866 $db->putUserProblem($pureProblem);
867
868 # store state in DB if it makes sense
869 if ($will{recordAnswers}) {
870 $problem->status($pg->{state}->{recorded_score});
871 $problem->attempted(1);
872 $problem->num_correct($pg->{state}->{num_of_correct_ans});
873 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
874 $pureProblem->status($pg->{state}->{recorded_score});
875 $pureProblem->attempted(1);
876 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
877 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
878 if ($db->putUserProblem($pureProblem)) {
879 $scoreRecordedMessage = "Your score was recorded.";
880 } else {
881 $scoreRecordedMessage = "Your score was not recorded because there was a failure in storing the problem record to the database.";
882 }
322 # write to the transaction log, just to make sure 883 # write to the transaction log, just to make sure
323 writeLog($self->{ce}, "transaction", 884 writeLog($self->{ce}, "transaction",
324 $problem->problem_id."\t". 885 $problem->problem_id."\t".
325 $problem->set_id."\t". 886 $problem->set_id."\t".
326 $problem->user_id."\t". 887 $problem->user_id."\t".
327 $problem->source_file."\t". 888 $problem->source_file."\t".
328 $problem->value."\t". 889 $problem->value."\t".
329 $problem->max_attempts."\t". 890 $problem->max_attempts."\t".
330 $problem->problem_seed."\t". 891 $problem->problem_seed."\t".
331 $pureProblem->status."\t". 892 $pureProblem->status."\t".
332 $pureProblem->attempted."\t". 893 $pureProblem->attempted."\t".
333 $pureProblem->last_answer."\t". 894 $pureProblem->last_answer."\t".
334 $pureProblem->num_correct."\t". 895 $pureProblem->num_correct."\t".
335 $pureProblem->num_incorrect 896 $pureProblem->num_incorrect
897 );
898 } else {
899 if (before($set->open_date) or after($set->due_date)) {
900 $scoreRecordedMessage = "Your score was not recorded because this homework set is closed.";
901 } else {
902 $scoreRecordedMessage = "Your score was not recorded.";
903 }
904 }
905 } else {
906 $scoreRecordedMessage = "Your score was not recorded because this problem has not been assigned to you.";
907 }
908 }
909
910 # logging student answers
911
912 my $answer_log = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
913 if ( defined($answer_log ) and defined($pureProblem)) {
914 if ($submitAnswers && !$authz->hasPermissions($effectiveUser, "dont_log_past_answers")) {
915 my $answerString = ""; my $scores = "";
916 my %answerHash = %{ $pg->{answers} };
917 # FIXME this is the line 552 error. make sure original student ans is defined.
918 # The fact that it is not defined is probably due to an error in some answer evaluator.
919 # But I think it is useful to suppress this error message in the log.
920 foreach (sortByName(undef, keys %answerHash)) {
921 my $orig_ans = $answerHash{$_}->{original_student_ans};
922 my $student_ans = defined $orig_ans ? $orig_ans : '';
923 $answerString .= $student_ans."\t";
924 $scores .= $answerHash{$_}->{score} >= 1 ? "1" : "0";
925 }
926 $answerString = '' unless defined($answerString); # insure string is defined.
927 writeCourseLog($self->{ce}, "answer_log",
928 join("",
929 '|', $problem->user_id,
930 '|', $problem->set_id,
931 '|', $problem->problem_id,
932 '|', $scores, "\t",
933 time(),"\t",
934 $answerString,
935 ),
336 ); 936 );
337 }
338 }
339 # logging student answers
340 my $pastAnswerLog = undef;
341 if (defined( $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'} )) {
342
343 $pastAnswerLog = $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'};
344
345 if ($submitAnswers and defined($pastAnswerLog) ) {
346 my $answerString = "";
347 my %answerHash = %{ $pg->{answers} };
348 $answerString = $answerString . $answerHash{$_}->{original_student_ans}."\t"
349 foreach (sort keys %answerHash);
350 writeLog($self->{ce}, "pastAnswerList",
351 '|'.$problem->user_id.
352 '|'.$problem->set_id.
353 '|'.$problem->problem_id.'|'."\t".
354 time()."\t".
355 $answerString,
356
357 );
358 937
938 }
359 } 939 }
360 940
361 } 941 debug("end answer processing");
362 # end logging student answers
363 942
364 ##### output ##### 943 ##### output #####
944 # custom message for editor
945 if ($authz->hasPermissions($user, "modify_problem_sets") and defined $editMode) {
946 if ($editMode eq "temporaryFile") {
947 print CGI::p(CGI::div({class=>'temporaryFile'}, "Viewing temporary file: ", $problem->source_file));
948 } elsif ($editMode eq "savedFile") {
949 # taken care of in the initialization phase
950 }
951 }
365 print CGI::start_div({class=>"problemHeader"}); 952 print CGI::start_div({class=>"problemHeader"});
953
954
955
366 # attempt summary 956 # attempt summary
367 if ($submitAnswers or $will{showCorrectAnswers}) { 957 #FIXME -- the following is a kludge: if showPartialCorrectAnswers is negative don't show anything.
958 # until after the due date
959 # do I need to check $will{showCorrectAnswers} to make preflight work??
960 if (($pg->{flags}->{showPartialCorrectAnswers} >= 0 and $submitAnswers) ) {
368 # print this if user submitted answers OR requested correct answers 961 # print this if user submitted answers OR requested correct answers
962
369 print $self->attemptResults($pg, $submitAnswers, 963 print $self->attemptResults($pg, 1,
370 $will{showCorrectAnswers}, 964 $will{showCorrectAnswers},
371 $pg->{flags}->{showPartialCorrectAnswers}, 1, 0); 965 $pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
372 } elsif ($checkAnswers) { 966 } elsif ($checkAnswers) {
373 # print this if user previewed answers 967 # print this if user previewed answers
968 print CGI::div({class=>'ResultsWithError'},"ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"), CGI::br();
374 print $self->attemptResults($pg, 1, 0, 1, 1, 0); 969 print $self->attemptResults($pg, 1, $will{showCorrectAnswers}, 1, 1, 1);
375 # show attempt answers 970 # show attempt answers
376 # don't show correct answers 971 # show correct answers if asked
377 # show attempt results (correctness) 972 # show attempt results (correctness)
378 # don't show attempt previews 973 # show attempt previews
379 } elsif ($previewAnswers) { 974 } elsif ($previewAnswers) {
380 # print this if user previewed answers 975 # print this if user previewed answers
381 print $self->attemptResults($pg, 1, 0, 0, 0, 1); 976 print CGI::div({class=>'ResultsWithError'},"PREVIEW ONLY -- ANSWERS NOT RECORDED"),CGI::br(),$self->attemptResults($pg, 1, 0, 0, 0, 1);
382 # show attempt answers 977 # show attempt answers
383 # don't show correct answers 978 # don't show correct answers
384 # don't show attempt results (correctness) 979 # don't show attempt results (correctness)
385 # show attempt previews 980 # show attempt previews
386 } 981 }
387 982
388 print CGI::end_div(); 983 print CGI::end_div();
389 984
985 # main form
986 print "\n";
987 print CGI::start_form(-method=>"POST", -action=> $r->uri,-name=>"problemMainForm", onSubmit=>"submitAction()");
988 print $self->hidden_authen_fields;
989 print "\n";
390 print CGI::start_div({class=>"problem"}); 990 print CGI::start_div({class=>"problem"});
391 #print CGI::hr();
392 # main form
393 print
394 CGI::startform("POST", $r->uri),
395 $self->hidden_authen_fields,
396 CGI::p($pg->{body_text}), 991 print CGI::p($pg->{body_text});
397 CGI::p($pg->{result}->{msg} ? CGI::b("Note: ") : "", CGI::i($pg->{result}->{msg})), 992 print CGI::p(CGI::b("Note: "). CGI::i($pg->{result}->{msg})) if $pg->{result}->{msg};
398 CGI::p( 993 print $editorLink; # this is empty unless it is appropriate to have an editor link.
399 ($can{recordAnswers} 994 print CGI::end_div();
400 ? CGI::submit(-name=>"submitAnswers", 995
401 -label=>"Submit Answers") 996 print CGI::start_p();
402 : ""), 997
403 ($can{checkAnswers} 998 if ($can{showCorrectAnswers}) {
404 ? CGI::submit(-name=>"checkAnswers", 999 print CGI::checkbox(
405 -label=>"Check Answers") 1000 -name => "showCorrectAnswers",
406 : ""), 1001 -checked => $will{showCorrectAnswers},
407 CGI::submit(-name=>"previewAnswers", 1002 -label => "Show correct answers",
408 -label=>"Preview Answers"),
409 ); 1003 );
1004 }
1005 if ($can{showHints}) {
1006 print CGI::div({style=>"color:red"},
1007 CGI::checkbox(
1008 -name => "showHints",
1009 -checked => $will{showHints},
1010 -label => "Show Hints",
1011 )
1012 );
1013 }
1014 if ($can{showSolutions}) {
1015 print CGI::checkbox(
1016 -name => "showSolutions",
1017 -checked => $will{showSolutions},
1018 -label => "Show Solutions",
1019 );
1020 }
1021
1022 if ($can{showCorrectAnswers} or $can{showHints} or $can{showSolutions}) {
1023 print CGI::br();
1024 }
1025
1026 print CGI::submit(-name=>"previewAnswers", -label=>"Preview Answers");
1027 if ($can{checkAnswers}) {
1028 print CGI::submit(-name=>"checkAnswers", -label=>"Check Answers");
1029 }
1030 if ($can{getSubmitButton}) {
1031 if ($user ne $effectiveUser) {
1032 # if acting as a student, make it clear that answer submissions will
1033 # apply to the student's records, not the professor's.
1034 print CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers for $effectiveUser");
1035 } else {
1036 print CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers");
1037 }
1038 }
1039
410 print CGI::end_div(); 1040 print CGI::end_p();
411 1041
412 print CGI::start_div({class=>"scoreSummary"}); 1042 print CGI::start_div({class=>"scoreSummary"});
1043
413 # score summary 1044 # score summary
414 my $attempts = $problem->num_correct + $problem->num_incorrect; 1045 my $attempts = $problem->num_correct + $problem->num_incorrect;
415 my $attemptsNoun = $attempts != 1 ? "times" : "time"; 1046 my $attemptsNoun = $attempts != 1 ? "times" : "time";
416 my $lastScore = int ($problem->status * 100) . "%"; 1047 my $problem_status = $problem->status || 0;
1048 my $lastScore = sprintf("%.0f%%", $problem_status * 100); # Round to whole number
417 my ($attemptsLeft, $attemptsLeftNoun); 1049 my ($attemptsLeft, $attemptsLeftNoun);
418 if ($problem->max_attempts == -1) { 1050 if ($problem->max_attempts == -1) {
419 # unlimited attempts 1051 # unlimited attempts
420 $attemptsLeft = "unlimited"; 1052 $attemptsLeft = "unlimited";
421 $attemptsLeftNoun = "attempts"; 1053 $attemptsLeftNoun = "attempts";
… …
424 $attemptsLeftNoun = $attemptsLeft == 1 ? "attempt" : "attempts"; 1056 $attemptsLeftNoun = $attemptsLeft == 1 ? "attempt" : "attempts";
425 } 1057 }
426 1058
427 my $setClosed = 0; 1059 my $setClosed = 0;
428 my $setClosedMessage; 1060 my $setClosedMessage;
429 if (time < $set->open_date or time > $set->due_date) { 1061 if (before($set->open_date) or after($set->due_date)) {
430 $setClosed = 1; 1062 $setClosed = 1;
1063 if (before($set->open_date)) {
1064 $setClosedMessage = "This homework set is not yet open.";
1065 } elsif (after($set->due_date)) {
431 $setClosedMessage = "This problem set is closed."; 1066 $setClosedMessage = "This homework set is closed.";
432 if ($permissionLevel > 0) { 1067 }
1068 }
1069 #if (before($set->open_date) or after($set->due_date)) {
1070 # $setClosed = 1;
1071 # $setClosedMessage = "This homework set is closed.";
1072 # if ($authz->hasPermissions($user, "view_answers")) {
433 $setClosedMessage .= " Since you are a privileged user, additional attempts will be recorded."; 1073 # $setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
434 } else { 1074 # } else {
435 $setClosedMessage .= " Additional attempts will not be recorded."; 1075 # $setClosedMessage .= " Additional attempts will not be recorded.";
436 } 1076 # }
437 } 1077 #}
1078 unless (defined( $pg->{state}->{state_summary_msg}) and $pg->{state}->{state_summary_msg}=~/\S/) {
1079 my $notCountedMessage = ($problem->value) ? "" : "(This problem will not count towards your grade.)";
438 print CGI::p( 1080 print CGI::p(join("",
1081 $submitAnswers ? $scoreRecordedMessage . CGI::br() : "",
439 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(), 1082 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(),
1083 $submitAnswers ?"You received a score of ".sprintf("%.0f%%", $pg->{result}->{score} * 100)." for this attempt.".CGI::br():'',
440 $problem->attempted 1084 $problem->attempted
441 ? "Your recorded score is $lastScore." . CGI::br() 1085 ? "Your overall recorded score is $lastScore. $notCountedMessage" . CGI::br()
442 : "", 1086 : "",
443 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining." 1087 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining."
1088 ));
1089 }else {
1090 print CGI::p($pg->{state}->{state_summary_msg});
1091 }
1092 print CGI::end_div();
1093
1094 # save state for viewOptions
1095 print CGI::hidden(
1096 -name => "showOldAnswers",
1097 -value => $will{showOldAnswers}
1098 ),
1099
1100 CGI::hidden(
1101 -name => "displayMode",
1102 -value => $self->{displayMode}
1103 );
1104 print( CGI::hidden(
1105 -name => 'editMode',
1106 -value => $self->{editMode},
1107 )
1108 ) if defined($self->{editMode}) and $self->{editMode} eq 'temporaryFile';
1109 print( CGI::hidden(
1110 -name => 'sourceFilePath',
1111 -value => $self->{problem}->{source_file}
1112 )) if defined($self->{problem}->{source_file});
1113
1114 print( CGI::hidden(
1115 -name => 'problemSeed',
1116 -value => $r->param("problemSeed")
1117 )) if defined($r->param("problemSeed"));
1118
1119 # end of main form
1120 print CGI::endform();
1121
1122 print CGI::start_div({class=>"problemFooter"});
1123
1124 ## arguments for answer inspection button
1125 #my $prof_url = $ce->{webworkURLs}->{oldProf};
1126 #my $webworkURL = $ce->{webworkURLs}->{root};
1127 #my $cgi_url = $prof_url;
1128 #$cgi_url=~ s|/[^/]*$||; # clip profLogin.pl
1129 #my $authen_args = $self->url_authen_args();
1130 #my $showPastAnswersURL = "$webworkURL/$courseName/instructor/show_answers/";
1131
1132 my $pastAnswersPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ShowAnswers",
1133 courseID => $courseName);
1134 my $showPastAnswersURL = $self->systemLink($pastAnswersPage, authen => 0); # no authen info for form action
1135
1136 # print answer inspection button
1137 if ($authz->hasPermissions($user, "view_answers")) {
1138 print "\n",
1139 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"WW_Info"),"\n",
1140 $self->hidden_authen_fields,"\n",
1141 CGI::hidden(-name => 'courseID', -value=>$courseName), "\n",
1142 CGI::hidden(-name => 'problemID', -value=>$problem->problem_id), "\n",
1143 CGI::hidden(-name => 'setID', -value=>$problem->set_id), "\n",
1144 CGI::hidden(-name => 'studentUser', -value=>$problem->user_id), "\n",
1145 CGI::p( {-align=>"left"},
1146 CGI::submit(-name => 'action', -value=>'Show Past Answers')
1147 ), "\n",
1148 CGI::endform();
1149 }
1150
1151 ## feedback form url
1152 #my $feedbackPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Feedback",
1153 # courseID => $courseName);
1154 #my $feedbackURL = $self->systemLink($feedbackPage, authen => 0); # no authen info for form action
1155 #
1156 ##print feedback form
1157 #print
1158 # CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
1159 # $self->hidden_authen_fields,"\n",
1160 # CGI::hidden("module", __PACKAGE__),"\n",
1161 # CGI::hidden("set", $set->set_id),"\n",
1162 # CGI::hidden("problem", $problem->problem_id),"\n",
1163 # CGI::hidden("displayMode", $self->{displayMode}),"\n",
1164 # CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
1165 # CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
1166 # CGI::hidden("showHints", $will{showHints}),"\n",
1167 # CGI::hidden("showSolutions", $will{showSolutions}),"\n",
1168 # CGI::p({-align=>"left"},
1169 # CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
1170 # ),
1171 # CGI::endform(),"\n";
1172
1173 print $self->feedbackMacro(
1174 module => __PACKAGE__,
1175 set => $self->{set}->set_id,
1176 problem => $problem->problem_id,
1177 displayMode => $self->{displayMode},
1178 showOldAnswers => $will{showOldAnswers},
1179 showCorrectAnswers => $will{showCorrectAnswers},
1180 showHints => $will{showHints},
1181 showSolutions => $will{showSolutions},
444 ); 1182 );
1183
445 print CGI::end_div(); 1184 print CGI::end_div();
446 print CGI::hr(), CGI::start_div({class=>"viewOptions"});
447 print
448 $self->viewOptions(),CGI::end_div(),
449 CGI::endform();
450
451 print CGI::start_div({class=>"problemFooter"});
452 # feedback form
453 my $ce = $self->{ce};
454 my $root = $ce->{webworkURLs}->{root};
455 my $courseName = $ce->{courseName};
456 my $feedbackURL = "$root/$courseName/feedback/";
457
458 # arguments for answer inspection button
459 my $prof_url = $ce->{webworkURLs}->{oldProf};
460 my $cgi_url = $prof_url;
461 $cgi_url=~ s|/[^/]*$||; # clip profLogin.pl
462 my $authen_args = $self->url_authen_args();
463 my $showPastAnswersURL = "$cgi_url/showPastAnswers.pl";
464
465 #print feedback form
466 print
467 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
468 $self->hidden_authen_fields,"\n",
469 CGI::hidden("module", __PACKAGE__),"\n",
470 CGI::hidden("set", $set->set_id),"\n",
471 CGI::hidden("problem", $problem->problem_id),"\n",
472 CGI::hidden("displayMode", $self->{displayMode}),"\n",
473 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
474 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
475 CGI::hidden("showHints", $will{showHints}),"\n",
476 CGI::hidden("showSolutions", $will{showSolutions}),"\n",
477 CGI::p({-align=>"right"},
478 CGI::submit(-name=>"feedbackForm", -label=>"Send Feedback")
479 ),
480 CGI::endform(),"\n";
481 # print answer inspection button
482 if ($self->{permissionLevel} >0) {
483
484
485 print "\n",
486 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
487 $self->hidden_authen_fields,"\n",
488 CGI::hidden(-name => 'course', -value=>$courseName), "\n",
489 CGI::hidden(-name => 'probNum', -value=>$problem->problem_id), "\n",
490 CGI::hidden(-name => 'setNum', -value=>$problem->set_id), "\n",
491 CGI::hidden(-name => 'User', -value=>$problem->user_id), "\n",
492 CGI::submit(-name => 'action', -value=>'Show Past Answers'), "\n",
493 CGI::endform();
494
495
496
497 }
498 # FIXME print editor link
499 if ($self->{permissionLevel}>=10 ) {
500 print CGI::a({-href=>"/webwork/$courseName/instructor/pgProblemEditor/".$set->set_id.
501 '/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
502 }
503 print CGI::end_div();
504
505 # end answer inspection button
506 # warning output
507 if ($pg->{warnings} ne "") {
508 print CGI::hr(), $self->warningOutput($pg->{warnings});
509 }
510 1185
511 # debugging stuff 1186 # debugging stuff
512 if (0) { 1187 if (0) {
513 print 1188 print
514 CGI::hr(), 1189 CGI::hr(),
… …
526 } 1201 }
527 1202
528 return ""; 1203 return "";
529} 1204}
530 1205
531##### output utilities #####
532
533sub attemptResults($$$$$$) {
534 my $self = shift;
535 my $pg = shift;
536 my $showAttemptAnswers = shift;
537 my $showCorrectAnswers = shift;
538 my $showAttemptResults = $showAttemptAnswers && shift;
539 my $showSummary = shift;
540 my $showAttemptPreview = shift || 0;
541 my $problemResult = $pg->{result}; # the overall result of the problem
542 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
543
544 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
545
546 my $header = CGI::th("Part");
547 $header .= $showAttemptAnswers ? CGI::th("Entered") : "";
548 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : "";
549 $header .= $showCorrectAnswers ? CGI::th("Correct") : "";
550 $header .= $showAttemptResults ? CGI::th("Result") : "";
551 $header .= $showMessages ? CGI::th("messages") : "";
552 my @tableRows = ( $header );
553 my $numCorrect;
554 foreach my $name (@answerNames) {
555 my $answerResult = $pg->{answers}->{$name};
556 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
557 my $preview = ($showAttemptPreview
558 ? $self->previewAnswer($answerResult)
559 : "");
560 my $correctAnswer = $answerResult->{correct_ans};
561 my $answerScore = $answerResult->{score};
562 my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
563
564 $numCorrect += $answerScore > 0;
565 my $resultString = $answerScore ? "correct" : "incorrect";
566
567 # get rid of the goofy prefix on the answer names (supposedly, the format
568 # of the answer names is changeable. this only fixes it for "AnSwEr"
569 $name =~ s/^AnSwEr//;
570
571 my $row = CGI::td($name);
572 $row .= $showAttemptAnswers ? CGI::td($studentAnswer) : "";
573 $row .= $showAttemptPreview ? CGI::td($preview) : "";
574 $row .= $showCorrectAnswers ? CGI::td($correctAnswer) : "";
575 $row .= $showAttemptResults ? CGI::td($resultString) : "";
576 $row .= $answerMessage ? CGI::td($answerMessage) : "";
577 push @tableRows, $row;
578 }
579
580 my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
581 my $scorePercent = int ($problemResult->{score} * 100) . "\%";
582 my $summary = "On this attempt, you answered $numCorrect out of "
583 . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
584 return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p($summary) : "");
585}
586
587sub viewOptions($) {
588 my $self = shift;
589 my $displayMode = $self->{displayMode};
590 my %must = %{ $self->{must} };
591 my %can = %{ $self->{can} };
592 my %will = %{ $self->{will} };
593
594 my $optionLine;
595 $can{showOldAnswers} and $optionLine .= join "",
596 "Show: &nbsp;",
597 CGI::checkbox(
598 -name => "showOldAnswers",
599 -checked => $will{showOldAnswers},
600 -label => "Saved answers",
601 ), "&nbsp;&nbsp;";
602 $can{showCorrectAnswers} and $optionLine .= join "",
603 CGI::checkbox(
604 -name => "showCorrectAnswers",
605 -checked => $will{showCorrectAnswers},
606 -label => "Correct answers",
607 ), "&nbsp;&nbsp;";
608 $can{showHints} and $optionLine .= join "",
609 CGI::checkbox(
610 -name => "showHints",
611 -checked => $will{showHints},
612 -label => "Hints",
613 ), "&nbsp;&nbsp;";
614 $can{showSolutions} and $optionLine .= join "",
615 CGI::checkbox(
616 -name => "showSolutions",
617 -checked => $will{showSolutions},
618 -label => "Solutions",
619 ), "&nbsp;&nbsp;";
620 $optionLine and $optionLine .= join "", CGI::br();
621
622 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex"},
623 "View equations as: &nbsp;",
624 CGI::radio_group(
625 -name => "displayMode",
626 -values => ['plainText', 'formattedText', 'images'],
627 -default => $displayMode,
628 -labels => {
629 plainText => "plain text",
630 formattedText => "formatted text",
631 images => "images",
632 }
633 ), CGI::br(),
634 $optionLine,
635 CGI::submit(-name=>"redisplay", -label=>"Redisplay Problem"),
636 );
637}
638
639sub previewAnswer($$) {
640 my ($self, $answerResult) = @_;
641 my $ce = $self->{ce};
642 my $effectiveUser = $self->{effectiveUser};
643 my $set = $self->{set};
644 my $problem = $self->{problem};
645 my $displayMode = $self->{displayMode};
646
647 # note: right now, we have to do things completely differently when we are
648 # rendering math from INSIDE the translator and from OUTSIDE the translator.
649 # so we'll just deal with each case explicitly here. there's some code
650 # duplication that can be dealt with later by abstracting out tth/dvipng/etc.
651
652 my $tex = $answerResult->{preview_latex_string};
653
654 return "" if $tex eq "";
655
656 if ($displayMode eq "plainText") {
657 return $tex;
658 } elsif ($displayMode eq "formattedText") {
659 my $tthCommand = $ce->{externalPrograms}->{tth}
660 . " -L -f5 -r 2> /dev/null <<END_OF_INPUT; echo > /dev/null\n"
661 . "\\(".$tex."\\)\n"
662 . "END_OF_INPUT\n";
663
664 # call tth
665 my $result = `$tthCommand`;
666 if ($?) {
667 return "<b>[tth failed: $? $@]</b>";
668 }
669 return $result;
670 } elsif ($displayMode eq "images") {
671 # how are we going to name this?
672 my $targetPathCommon = "/png/"
673 . $effectiveUser->id . "."
674 . $set->set_id . "."
675 . $problem->problem_id . "."
676 . $answerResult->{ans_name} . ".png";
677
678 # figure out where to put things
679 my $wd = tempdir("webwork-dvipng-XXXXXXXX", DIR => $ce->{courseDirs}->{html_temp});
680 my $latex = $ce->{externalPrograms}->{latex};
681 my $dvipng = $ce->{externalPrograms}->{dvipng};
682 my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
683 # should use surePathToTmpFile, but we have to
684 # isolate it from the problem enivronment first
685 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
686
687 # call dvipng to generate a preview
688 dvipng($wd, $latex, $dvipng, $tex, $targetPath);
689 if (-e $targetPath) {
690 return "<img src=\"$targetURL\" alt=\"$tex\" />";
691 } else {
692 return "<b>[math2img failed]</b>";
693 }
694 }
695}
696##### logging subroutine ####
697
698
699
700##### permission queries #####
701
702# this stuff should be abstracted out into the permissions system
703# however, the permission system only knows about things in the
704# course environment and the username. hmmm...
705
706# also, i should fix these so that they have a consistent calling
707# format -- perhaps:
708# canPERM($courseEnv, $user, $set, $problem, $permissionLevel)
709
710sub canShowCorrectAnswers($$) {
711 my ($permissionLevel, $answerDate) = @_;
712 return $permissionLevel > 0 || time > $answerDate;
713}
714
715sub canShowSolutions($$) {
716 my ($permissionLevel, $answerDate) = @_;
717 return canShowCorrectAnswers($permissionLevel, $answerDate);
718}
719
720sub canRecordAnswers($$$$$) {
721 my ($permissionLevel, $openDate, $dueDate, $maxAttempts, $attempts) = @_;
722 my $permHigh = $permissionLevel > 0;
723 my $timeOK = time >= $openDate && time <= $dueDate;
724 my $attemptsOK = $maxAttempts == -1 || $attempts <= $maxAttempts;
725 my $recordAnswers = $permHigh || ($timeOK && $attemptsOK);
726 return $recordAnswers;
727}
728
729sub canCheckAnswers($$) {
730 my ($permissionLevel, $answerDate) = @_;
731 my $permHigh = $permissionLevel > 0;
732 my $timeOK = time >= $answerDate;
733 my $recordAnswers = $permHigh || $timeOK;
734 return $recordAnswers;
735}
736
737sub mustRecordAnswers($) {
738 my ($permissionLevel) = @_;
739 return $permissionLevel == 0;
740}
741
7421; 12061;
Legend:
Removed from v.906  
changed lines
  Added in v.5605
aubreyja at gmail dot com
 ViewVC Help
Powered by ViewVC 1.0.9