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

Diff of /trunk/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm

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

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