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