[system] / trunk / webwork-modperl / lib / WeBWorK / ContentGenerator / Problem.pm Repository:
ViewVC logotype

Diff of /trunk/webwork-modperl/lib/WeBWorK/ContentGenerator/Problem.pm

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

Revision 928 Revision 1841
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: webwork-modperl/lib/WeBWorK/ContentGenerator/Problem.pm,v 1.115 2004/03/04 04:36:08 gage Exp $
5#
6# This program is free software; you can redistribute it and/or modify it under
7# the terms of either: (a) the GNU General Public License as published by the
8# Free Software Foundation; either version 2, or (at your option) any later
9# version, or (b) the "Artistic License" which comes with this package.
10#
11# This program is distributed in the hope that it will be useful, but WITHOUT
12# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
13# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the
14# Artistic License for more details.
4################################################################################ 15################################################################################
5 16
6package WeBWorK::ContentGenerator::Problem; 17package WeBWorK::ContentGenerator::Problem;
7use base qw(WeBWorK::ContentGenerator); 18use base qw(WeBWorK::ContentGenerator);
8 19
9=head1 NAME 20=head1 NAME
10 21
11WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem. 22WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem.
12 23
13=cut 24=cut
14 25
15use strict; 26use strict;
16use warnings; 27use warnings;
17use CGI qw(); 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);
35use WeBWorK::DB::Utils qw(global2user user2global findDefaults);
36use WeBWorK::Timing;
37
24 38
25############################################################ 39############################################################
26# 40#
27# user 41# user
28# effectiveUser 42# effectiveUser
… …
38# 52#
39# redisplay - name of the "Redisplay Problem" button 53# redisplay - name of the "Redisplay Problem" button
40# submitAnswers - name of "Submit Answers" button 54# submitAnswers - name of "Submit Answers" button
41# checkAnswers - name of the "Check Answers" button 55# checkAnswers - name of the "Check Answers" button
42# previewAnswers - name of the "Preview Answers" button 56# previewAnswers - name of the "Preview Answers" button
57#
58# FIXME: this table is heinously out of date
43# 59#
44############################################################ 60############################################################
45 61
62# FIXME: what is this?
63sub templateName {
64 "problem";
65}
66
46sub pre_header_initialize { 67sub pre_header_initialize {
47 my ($self, $setName, $problemNumber) = @_; 68 my ($self) = @_;
48 my $r = $self->{r}; 69 my $r = $self->{r};
70 my $setName = $r->urlpath->arg("setID");
71 my $problemNumber = $r->urlpath->arg("problemID");
49 my $courseEnv = $self->{ce}; 72 my $courseEnv = $self->{ce};
50 my $db = $self->{db}; 73 my $db = $self->{db};
51 my $userName = $r->param('user'); 74 my $userName = $r->param('user');
52 my $effectiveUserName = $r->param('effectiveUser'); 75 my $effectiveUserName = $r->param('effectiveUser');
76 my $key = $r->param('key');
53 77
54 my $user = $db->getUser($userName); 78 my $user = $db->getUser($userName); # checked
79 die "record for user $userName (real user) does not exist."
80 unless defined $user;
81
55 my $effectiveUser = $db->getUser($effectiveUserName); 82 my $effectiveUser = $db->getUser($effectiveUserName); # checked
83 die "record for user $effectiveUserName (effective user) does not exist."
84 unless defined $effectiveUser;
85
86 my $PermissionLevel = $db->getPermissionLevel($userName); # checked
87 die "permission level record for user $userName does not exist (but the user does? odd...)"
88 unless defined $PermissionLevel;
89 my $permissionLevel = $PermissionLevel->permission;
90
91 # obtain the merged set for $effectiveUser
56 my $set = $db->getGlobalUserSet($effectiveUserName, $setName); 92 my $set = $db->getMergedSet($effectiveUserName, $setName); # checked
93
94 # obtain the merged problem for $effectiveUser
57 my $problem = $db->getGlobalUserProblem($effectiveUserName, $setName, $problemNumber); 95 my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber); # checked
58 my $psvn = $set->psvn();
59 my $permissionLevel = $db->getPermissionLevel($userName)->permission();
60 96
97 my $editMode = $r->param("editMode");
98
99 if ($permissionLevel > 0 and defined $editMode) {
100 # professors are allowed to fabricate sets and problems not
101 # assigned to them (or anyone). this allows them to use the
102 # editor to
103
104 # if that is not yet defined obtain the global set, convert
105 # it to a user set, and add fake user data
106 unless (defined $set) {
107 my $userSetClass = $db->{set_user}->{record};
108 my $globalSet = $db->getGlobalSet($setName); # checked
109 # if the global set doesn't exist either, bail!
110 die "Set $setName does not exist"
111 unless defined $set;
112 $set = global2user($userSetClass, $globalSet);
113 $set->psvn(0);
114 }
115
116 # if that is not yet defined obtain the global problem,
117 # convert it to a user problem, and add fake user data
118 unless (defined $problem) {
119 my $userProblemClass = $db->{problem_user}->{record};
120 my $globalProblem = $db->getGlobalProblem($setName, $problemNumber); # checked
121 # if the global problem doesn't exist either, bail!
122 die "Problem $problemNumber in set $setName does not exist"
123 unless defined $problem;
124 $problem = global2user($userProblemClass, $globalProblem);
125 $problem->user_id($effectiveUserName);
126 $problem->problem_seed(0);
127 $problem->status(0);
128 $problem->attempted(0);
129 $problem->last_answer("");
130 $problem->num_correct(0);
131 $problem->num_incorrect(0);
132 }
133
134 # now we're sure we have valid UserSet and UserProblem objects
135 # yay!
136
137 # now deal with possible editor overrides:
138
139 # if the caller is asking to override the source file, and
140 # editMode calls for a temporary file, do so
141 my $sourceFilePath = $r->param("sourceFilePath");
142 if (defined $sourceFilePath and $editMode eq "temporaryFile") {
143 $problem->source_file($sourceFilePath);
144 }
145
146 # if the caller is asking to override the problem seed, do so
147 my $problemSeed = $r->param("problemSeed");
148 if (defined $problemSeed) {
149 $problem->problem_seed($problemSeed);
150 }
151 } else {
152 # students can't view problems not assigned to them
153 die "Set $setName is not assigned to $effectiveUserName"
154 unless defined $set;
155 die "Problem $problemNumber in set $setName is not assigned to $effectiveUserName"
156 unless defined $problem;
157 }
158
61 $self->{userName} = $userName; 159 $self->{userName} = $userName;
160 $self->{effectiveUserName} = $effectiveUserName;
62 $self->{user} = $user; 161 $self->{user} = $user;
63 $self->{effectiveUser} = $effectiveUser; 162 $self->{effectiveUser} = $effectiveUser;
64 $self->{set} = $set;
65 $self->{problem} = $problem;
66 $self->{permissionLevel} = $permissionLevel; 163 $self->{permissionLevel} = $permissionLevel;
164 $self->{set} = $set;
165 $self->{problem} = $problem;
166 $self->{editMode} = $editMode;
67 167
68 ##### form processing ##### 168 ##### form processing #####
69 169
70 # set options from form fields (see comment at top of file for names) 170 # set options from form fields (see comment at top of file for names)
71 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode}; 171 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode};
72 my $redisplay = $r->param("redisplay"); 172 my $redisplay = $r->param("redisplay");
73 my $submitAnswers = $r->param("submitAnswers"); 173 my $submitAnswers = $r->param("submitAnswers");
74 my $checkAnswers = $r->param("checkAnswers"); 174 my $checkAnswers = $r->param("checkAnswers");
75 my $previewAnswers = $r->param("previewAnswers"); 175 my $previewAnswers = $r->param("previewAnswers");
76 176
77 # fields which may be defined when using Problem Editor 177
78 my $override_seed = ($permissionLevel>=10) ? $r->param('problemSeed') : undef;
79 my $override_problem_source = ($permissionLevel>=10) ? $r->param('sourceFilePath') : undef;
80 my $editMode = undef;
81 my $submit_button = $r->param('submit_button');
82 if ( defined($submit_button ) ) {
83 $editMode = "temporaryFile" if $submit_button eq 'Refresh';
84 $editMode = 'savedFile' if $submit_button eq 'Save';
85 }
86 # coerce form fields into CGI::Vars format
87 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars }; 178 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
179
88 180
89 $self->{displayMode} = $displayMode; 181 $self->{displayMode} = $displayMode;
90 $self->{redisplay} = $redisplay; 182 $self->{redisplay} = $redisplay;
91 $self->{submitAnswers} = $submitAnswers; 183 $self->{submitAnswers} = $submitAnswers;
92 $self->{checkAnswers} = $checkAnswers; 184 $self->{checkAnswers} = $checkAnswers;
93 $self->{previewAnswers} = $previewAnswers; 185 $self->{previewAnswers} = $previewAnswers;
94 $self->{formFields} = $formFields; 186 $self->{formFields} = $formFields;
95 187
96 $self->{current_problem_source} = (defined($override_problem_source) ) ?
97 $override_problem_source :
98 $problem->source_file;
99 $self->{edit_mode} = $editMode;
100 ##### permissions ##### 188 ##### permissions #####
101 189
102 # are we allowed to view this problem? 190 # are we allowed to view this problem?
103 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0; 191 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
104 return unless $self->{isOpen}; 192 return unless $self->{isOpen};
… …
132 recordAnswers => canRecordAnswers($permissionLevel, $set->open_date, $set->due_date, 220 recordAnswers => canRecordAnswers($permissionLevel, $set->open_date, $set->due_date,
133 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1), 221 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1),
134 # attempts=num_correct+num_incorrect+1, as this happens before updating $problem 222 # attempts=num_correct+num_incorrect+1, as this happens before updating $problem
135 checkAnswers => canCheckAnswers($permissionLevel, $set->answer_date), 223 checkAnswers => canCheckAnswers($permissionLevel, $set->answer_date),
136 ); 224 );
225 #########################################################
226 # more complicated logic for showing check answer button:
227 #########################################################
228 # checkAnswers button shows up after due date -- once a student can't record anymore
229 # checkAnswers button always shows up when an instructor or TA is acting
230 # as someone else (the $user and $effectiveUserName aren't the same).
231 $can{checkAnswers} = ($can{checkAnswers} && not $can{recordAnswers} ) ||
232 ( defined($userName) and defined($effectiveUserName) and
233 ($userName ne $effectiveUserName)
234 );
235 #########################################################
236 # more complicated logif for showing "submit answer" button
237 #########################################################
238 # We hide the submit answer button if someone is acting as a student
239 # This prevents errors where you accidently submit the answer for a student
240 # Not sure whether this a feature or a bug
137 241
242 $can{recordAnswers} = ($can{recordAnswers} and not
243 ( defined($userName) and defined($effectiveUserName) and
244 ($userName ne $effectiveUserName)
245 )
246 );
138 # final values for options 247 # final values for options
139 my %will; 248 my %will;
140 foreach (keys %must) { 249 foreach (keys %must) {
141 $will{$_} = $can{$_} && ($want{$_} || $must{$_}); 250 $will{$_} = $can{$_} && ($want{$_} || $must{$_});
142 } 251 }
143 252
144 ##### sticky answers ##### 253 ##### sticky answers #####
145 254
146 if (not $submitAnswers and $will{showOldAnswers}) { 255 if (not ($submitAnswers or $previewAnswers or $checkAnswers) and $will{showOldAnswers}) {
147 # do this only if new answers are NOT being submitted 256 # do this only if new answers are NOT being submitted
148 my %oldAnswers = decodeAnswers($problem->last_answer); 257 my %oldAnswers = decodeAnswers($problem->last_answer);
149 $formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers; 258 $formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers;
150 } 259 }
151 260
152 ##### translation ##### 261 ##### translation #####
153 262
263 $WeBWorK::timer->continue("begin pg processing") if defined($WeBWorK::timer);
154 my $pg = WeBWorK::PG->new( 264 my $pg = WeBWorK::PG->new(
155 $courseEnv, 265 $courseEnv,
156 $effectiveUser, 266 $effectiveUser,
157 $r->param('key'), 267 $key,
158 $set, 268 $set,
159 $problem, 269 $problem,
160 $psvn, 270 $set->psvn, # FIXME: this field should be removed
161 $formFields, 271 $formFields,
162 { # translation options 272 { # translation options
163 displayMode => $displayMode, 273 displayMode => $displayMode,
164 override_seed => $override_seed,
165 override_problem_source =>$override_problem_source,
166 showHints => $will{showHints}, 274 showHints => $will{showHints},
167 showSolutions => $will{showSolutions}, 275 showSolutions => $will{showSolutions},
168 refreshMath2img => $will{showHints} || $will{showSolutions}, 276 refreshMath2img => $will{showHints} || $will{showSolutions},
169 processAnswers => 1, 277 processAnswers => 1,
170 }, 278 },
171 ); 279 );
172 280
281 $WeBWorK::timer->continue("end pg processing") if defined($WeBWorK::timer);
173 ##### fix hint/solution options ##### 282 ##### fix hint/solution options #####
174 283
175 $can{showHints} &&= $pg->{flags}->{hintExists}; 284 $can{showHints} &&= $pg->{flags}->{hintExists}
285 &&= $pg->{flags}->{showHintLimit}<=$pg->{state}->{num_of_incorrect_ans};
176 $can{showSolutions} &&= $pg->{flags}->{solutionExists}; 286 $can{showSolutions} &&= $pg->{flags}->{solutionExists};
177 287
178 ##### store fields ##### 288 ##### store fields #####
179 289
180 $self->{want} = \%want; 290 $self->{want} = \%want;
181 $self->{must} = \%must; 291 $self->{must} = \%must;
182 $self->{can} = \%can; 292 $self->{can} = \%can;
183 $self->{will} = \%will; 293 $self->{will} = \%will;
184
185 $self->{pg} = $pg; 294 $self->{pg} = $pg;
186} 295}
187 296
188sub if_warnings($$) { 297#sub if_warnings($$) {
189 my ($self, $arg) = @_; 298# my ($self, $arg) = @_;
190 return 0 unless $self->{isOpen}; 299# return 0 unless $self->{isOpen};
191 return $self->{pg}->{warnings} ne ""; 300# return $self->{pg}->{warnings} ne "";
192} 301#}
193 302
194sub if_errors($$) { 303sub if_errors($$) {
195 my ($self, $arg) = @_; 304 my ($self, $arg) = @_;
196 return 0 unless $self->{isOpen}; 305 return 0 unless $self->{isOpen};
197 return $self->{pg}->{flags}->{error_flag}; 306 return $self->{pg}->{flags}->{error_flag};
… …
199 308
200sub head { 309sub head {
201 my $self = shift; 310 my $self = shift;
202 return "" unless $self->{isOpen}; 311 return "" unless $self->{isOpen};
203 return $self->{pg}->{head_text} if $self->{pg}->{head_text}; 312 return $self->{pg}->{head_text} if $self->{pg}->{head_text};
313}
314
315sub options {
316 my $self = shift;
317 return join("",
318 CGI::start_form("POST", $self->{r}->uri),
319 $self->hidden_authen_fields,
320 CGI::hr(),
321 CGI::start_div({class=>"viewOptions"}),
322 $self->viewOptions(),
323 CGI::end_div(),
324 CGI::end_form()
325 );
204} 326}
205 327
206sub path { 328sub path {
207 my $self = shift; 329 my $self = shift;
208 my $args = $_[-1]; 330 my $args = $_[-1];
… …
227 349
228 my $ce = $self->{ce}; 350 my $ce = $self->{ce};
229 my $db = $self->{db}; 351 my $db = $self->{db};
230 my $root = $ce->{webworkURLs}->{root}; 352 my $root = $ce->{webworkURLs}->{root};
231 my $courseName = $ce->{courseName}; 353 my $courseName = $ce->{courseName};
232
233 print CGI::strong("Problems"), CGI::br(); 354 print CGI::strong("Problems"), CGI::br();
234 355
235 my $effectiveUser = $self->{r}->param("effectiveUser"); 356 my $effectiveUser = $self->{r}->param("effectiveUser");
236 my @problems;
237 push @problems, $db->getGlobalUserProblem($effectiveUser, $setName, $_)
238 foreach ($db->listUserProblems($effectiveUser, $setName)); 357 my @problemIDs = $db->listUserProblems($effectiveUser, $setName);
239 foreach my $problem (sort { $a->problem_id <=> $b->problem_id } @problems) { 358 foreach my $problem (sort { $a <=> $b } @problemIDs) {
240 print CGI::a({-href=>"$root/$courseName/$setName/".$problem->problem_id."/?" 359 print '&nbsp;&nbsp;'.CGI::a({-href=>"$root/$courseName/$setName/".$problem."/?"
241 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}}, 360 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}},
242 "Problem ".$problem->problem_id), CGI::br(); 361 "Problem ".$problem), CGI::br();
243 } 362 }
363
364 return "";
244} 365}
245 366
246sub nav { 367sub nav {
368 $WeBWorK::timer->continue("begin nav subroutine") if defined($WeBWorK::timer);
247 my $self = shift; 369 my $self = shift;
248 my $args = $_[-1]; 370 my $args = $_[-1];
249 my $setName = $self->{set}->set_id; 371 my $setName = $self->{set}->set_id;
250 my $problemNumber = $self->{problem}->problem_id; 372 my $problemNumber = $self->{problem}->problem_id;
251 373
… …
258 my $effectiveUser = $self->{r}->param("effectiveUser"); 380 my $effectiveUser = $self->{r}->param("effectiveUser");
259 my $tail = "&displayMode=".$self->{displayMode}; 381 my $tail = "&displayMode=".$self->{displayMode};
260 382
261 my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList"); 383 my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList");
262 384
263 my $prevProblem = $db->getGlobalUserProblem($effectiveUser, $setName, $problemNumber-1); 385 my @problemIDs = $db->listUserProblems($effectiveUser, $setName);
264 my $nextProblem = $db->getGlobalUserProblem($effectiveUser, $setName, $problemNumber+1); 386 my ($prevID, $nextID);
387 foreach my $id (@problemIDs) {
388 $prevID = $id if $id < $problemNumber
389 and (not defined $prevID or $id > $prevID);
390 $nextID = $id if $id > $problemNumber
391 and (not defined $nextID or $id < $nextID);
392 }
265 unshift @links, "Previous Problem" , ($prevProblem 393 unshift @links, "Previous Problem" , ($prevID
266 ? "$root/$courseName/$setName/".$prevProblem->problem_id 394 ? "$root/$courseName/$setName/".$prevID
267 : "") , "navPrev"; 395 : "") , "navPrev";
268 push @links, "Next Problem" , ($nextProblem 396 push @links, "Next Problem" , ($nextID
269 ? "$root/$courseName/$setName/".$nextProblem->problem_id 397 ? "$root/$courseName/$setName/".$nextID
270 : "") , "navNext"; 398 : "") , "navNext";
271 399
272 return $self->navMacro($args, $tail, @links); 400 my $result = $self->navMacro($args, $tail, @links);
401 $WeBWorK::timer->continue("end nav subroutine") if defined($WeBWorK::timer);
402 return $result;
273} 403}
274 404
275sub title { 405sub title {
276 my $self = shift; 406 my $self = shift;
277 my $setName = $self->{set}->set_id; 407 my $setName = $self->{set}->set_id;
278
279 my $file_action;
280 my $edit_mode = $self->{edit_mode};
281 if ( not defined($edit_mode) ) {
282 $file_action = '';
283 } elsif ( $edit_mode eq 'temporaryFile') {
284 $file_action .= 'Editing temporary file : '. CGI::br() . $self->{current_problem_source};
285 } elsif ( $edit_mode eq 'savedFile' ){
286 $file_action .= 'Problem saved to : '. CGI::br() . $self->{current_problem_source};
287 }
288 my $problemNumber = $self->{problem}->problem_id . " : " . $file_action; 408 my $problemNumber = $self->{problem}->problem_id;
289 409
290 return "$setName : Problem $problemNumber"; 410 return "$setName : Problem $problemNumber";
291} 411}
292 412
293sub body { 413sub body {
… …
297 unless $self->{isOpen}; 417 unless $self->{isOpen};
298 418
299 # unpack some useful variables 419 # unpack some useful variables
300 my $r = $self->{r}; 420 my $r = $self->{r};
301 my $db = $self->{db}; 421 my $db = $self->{db};
422 my $ce = $self->{ce};
423 my $root = $ce->{webworkURLs}->{root};
424 my $courseName = $ce->{courseName};
302 my $set = $self->{set}; 425 my $set = $self->{set};
303 my $problem = $self->{problem}; 426 my $problem = $self->{problem};
427 my $editMode = $self->{editMode};
304 my $permissionLevel = $self->{permissionLevel}; 428 my $permissionLevel = $self->{permissionLevel};
305 my $submitAnswers = $self->{submitAnswers}; 429 my $submitAnswers = $self->{submitAnswers};
306 my $checkAnswers = $self->{checkAnswers}; 430 my $checkAnswers = $self->{checkAnswers};
307 my $previewAnswers = $self->{previewAnswers}; 431 my $previewAnswers = $self->{previewAnswers};
308 my %want = %{ $self->{want} }; 432 my %want = %{ $self->{want} };
309 my %can = %{ $self->{can} }; 433 my %can = %{ $self->{can} };
310 my %must = %{ $self->{must} }; 434 my %must = %{ $self->{must} };
311 my %will = %{ $self->{will} }; 435 my %will = %{ $self->{will} };
312 my $pg = $self->{pg}; 436 my $pg = $self->{pg};
313 437
438
439
440 #####create Editor link #####
441 # print editor link if the user is an instructor AND the file is not in temporary editing mode
442 my $editorLinkMessage = '';
443 # and ( (not defined($self->{editMode})) or $self->{editMode} eq 'savedFile') # FIXME is this needed?
444 if ($self->{permissionLevel}>=10 ) {
445 $editorLinkMessage = CGI::a({-href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".
446 $set->set_id.'/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
447 }
314 ##### translation errors? ##### 448 ##### translation errors? #####
315 449
316 if ($pg->{flags}->{error_flag}) { 450 if ($pg->{flags}->{error_flag}) {
317 return $self->errorOutput($pg->{errors}, $pg->{body_text}); 451 return $self->errorOutput($pg->{errors}, $pg->{body_text}.CGI::p($editorLinkMessage));
318 } 452 }
319 453
320 ##### answer processing ##### 454 ##### answer processing #####
321 455 $WeBWorK::timer->continue("begin answer processing") if defined($WeBWorK::timer);
322 # if answers were submitted: 456 # if answers were submitted:
457 my $scoreRecordedMessage;
323 if ($submitAnswers) { 458 if ($submitAnswers) {
324 # get a "pure" (unmerged) UserProblem to modify 459 # get a "pure" (unmerged) UserProblem to modify
460 # this will be undefined if the problem has not been assigned to this user
325 my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); 461 my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); # checked
462 if (defined $pureProblem) {
326 # store answers in DB for sticky answers 463 # store answers in DB for sticky answers
327 my %answersToStore; 464 my %answersToStore;
328 my %answerHash = %{ $pg->{answers} }; 465 my %answerHash = %{ $pg->{answers} };
329 $answersToStore{$_} = $answerHash{$_}->{original_student_ans} 466 $answersToStore{$_} = $self->{formFields}->{$_} #$answerHash{$_}->{original_student_ans} -- this may have been modified for fields with multiple values. Don't use it!!
330 foreach (keys %answerHash); 467 foreach (keys %answerHash);
468 # There may be some more answers to store -- one which are auxiliary entries to a primary answer. Evaluating
469 # matrices works in this way, only the first answer triggers an answer evaluator, the rest are just inputs
470 # however we need to store them. Fortunately they are still in the input form.
471 my @extra_answer_names = @{ $pg->{flags}->{KEPT_EXTRA_ANSWERS}};
472
473 $answersToStore{$_} = $self->{formFields}->{$_} foreach (@extra_answer_names);
474
475 # Now let's encode these answers to store them -- append the extra answers to the end of answer entry order
476 my @answer_order = (@{$pg->{flags}->{ANSWER_ENTRY_ORDER}}, @extra_answer_names);
331 my $answerString = encodeAnswers(%answersToStore, 477 my $answerString = encodeAnswers(%answersToStore,
332 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }); 478 @answer_order);
479
480 # store last answer to database
481 $problem->last_answer($answerString);
333 $pureProblem->last_answer($answerString); 482 $pureProblem->last_answer($answerString);
334 $problem->last_answer($answerString);
335 $db->putUserProblem($pureProblem);
336
337 # store state in DB if it makes sense
338 if ($will{recordAnswers}) {
339 $problem->status($pg->{state}->{recorded_score});
340 $problem->attempted(1);
341 $problem->num_correct($pg->{state}->{num_of_correct_ans});
342 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
343 $pureProblem->status($pg->{state}->{recorded_score});
344 $pureProblem->attempted(1);
345 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
346 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
347 $db->putUserProblem($pureProblem); 483 $db->putUserProblem($pureProblem);
484
485 # store state in DB if it makes sense
486 if ($will{recordAnswers}) {
487 $problem->status($pg->{state}->{recorded_score});
488 $problem->attempted(1);
489 $problem->num_correct($pg->{state}->{num_of_correct_ans});
490 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
491 $pureProblem->status($pg->{state}->{recorded_score});
492 $pureProblem->attempted(1);
493 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
494 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
495 if ($db->putUserProblem($pureProblem)) {
496 $scoreRecordedMessage = "Your score was recorded.";
497 } else {
498 $scoreRecordedMessage = "Your score was not recorded because there was a failure in storing the problem record to the database.";
499 }
348 # write to the transaction log, just to make sure 500 # write to the transaction log, just to make sure
349 writeLog($self->{ce}, "transaction", 501 writeLog($self->{ce}, "transaction",
350 $problem->problem_id."\t". 502 $problem->problem_id."\t".
351 $problem->set_id."\t". 503 $problem->set_id."\t".
352 $problem->user_id."\t". 504 $problem->user_id."\t".
353 $problem->source_file."\t". 505 $problem->source_file."\t".
354 $problem->value."\t". 506 $problem->value."\t".
355 $problem->max_attempts."\t". 507 $problem->max_attempts."\t".
356 $problem->problem_seed."\t". 508 $problem->problem_seed."\t".
357 $pureProblem->status."\t". 509 $pureProblem->status."\t".
358 $pureProblem->attempted."\t". 510 $pureProblem->attempted."\t".
359 $pureProblem->last_answer."\t". 511 $pureProblem->last_answer."\t".
360 $pureProblem->num_correct."\t". 512 $pureProblem->num_correct."\t".
361 $pureProblem->num_incorrect 513 $pureProblem->num_incorrect
362 ); 514 );
515 } else {
516 if (time < $set->open_date or time > $set->due_date) {
517 $scoreRecordedMessage = "Your score was not recorded because this problem set is closed.";
518 } else {
519 $scoreRecordedMessage = "Your score was not recorded.";
520 }
521 }
522 } else {
523 $scoreRecordedMessage = "Your score was not recorded because this problem has not been built for you.";
363 } 524 }
364 } 525 }
526
365 # logging student answers 527 # logging student answers
366 my $pastAnswerLog = undef; 528
367 if (defined( $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'} )) { 529 my $answer_log = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
368 530 if ( defined($answer_log )) {
369 $pastAnswerLog = $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'}; 531 if ($submitAnswers ) {
370
371 if ($submitAnswers and defined($pastAnswerLog) ) {
372 my $answerString = ""; 532 my $answerString = "";
373 my %answerHash = %{ $pg->{answers} }; 533 my %answerHash = %{ $pg->{answers} };
374 $answerString = $answerString . $answerHash{$_}->{original_student_ans}."\t" 534 # FIXME this is the line 552 error. make sure original student ans is defined.
535 # The fact that it is not defined is probably due to an error in some answer evaluator.
536 # But I think it is useful to suppress this error message in the log.
375 foreach (sort keys %answerHash); 537 foreach (sort keys %answerHash) {
538 my $student_ans = $answerHash{$_}->{original_student_ans} ||'';
539 $answerString .= $student_ans."\t"
540 }
541 $answerString = '' unless defined($answerString); # insure string is defined.
376 writeLog($self->{ce}, "pastAnswerList", 542 writeCourseLog($self->{ce}, "answer_log",
543 join("",
377 '|'.$problem->user_id. 544 '|', $problem->user_id,
378 '|'.$problem->set_id. 545 '|', $problem->set_id,
379 '|'.$problem->problem_id.'|'."\t". 546 '|', $problem->problem_id,
547 '|',"\t",
380 time()."\t". 548 time(),"\t",
381 $answerString, 549 $answerString,
382 550 ),
383 ); 551 );
384 552
385 } 553 }
386
387 } 554 }
388 # end logging student answers 555
556 $WeBWorK::timer->continue("end answer processing") if defined($WeBWorK::timer);
389 557
390 ##### output ##### 558 ##### output #####
559
391 print CGI::start_div({class=>"problemHeader"}); 560 print CGI::start_div({class=>"problemHeader"});
561
562 # custom message for editor
563 if ($permissionLevel >= 10 and defined $editMode) {
564 if ($editMode eq "temporaryFile") {
565 print CGI::p(CGI::i("Editing temporary file: ", $problem->source_file));
566 } elsif ($editMode eq "savedFile") {
567 print CGI::p(CGI::i("Problem saved to: ", $problem->source_file));
568 }
569 }
570
392 # attempt summary 571 # attempt summary
393 if ($submitAnswers or $will{showCorrectAnswers}) { 572 #FIXME -- the following is a kludge: if showPartialCorrectAnswers is negative don't show anything.
573 # until after the due date
574 # do I need to check $wills{howCorrectAnswers} to make preflight work??
575 if (($pg->{flags}->{showPartialCorrectAnswers}>= 0 and $submitAnswers) ) {
394 # print this if user submitted answers OR requested correct answers 576 # print this if user submitted answers OR requested correct answers
577
395 print $self->attemptResults($pg, $submitAnswers, 578 print $self->attemptResults($pg, 1,
396 $will{showCorrectAnswers}, 579 $will{showCorrectAnswers},
397 $pg->{flags}->{showPartialCorrectAnswers}, 1, 0); 580 $pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
398 } elsif ($checkAnswers) { 581 } elsif ($checkAnswers) {
399 # print this if user previewed answers 582 # print this if user previewed answers
583 print "ANSWERS ONLY CHECKED -- ",CGI::br(),"ANSWERS NOT RECORDED", CGI::br();
400 print $self->attemptResults($pg, 1, 0, 1, 1, 0); 584 print $self->attemptResults($pg, 1, $will{showCorrectAnswers}, 1, 1, 1);
401 # show attempt answers 585 # show attempt answers
402 # don't show correct answers 586 # show correct answers if asked
403 # show attempt results (correctness) 587 # show attempt results (correctness)
404 # don't show attempt previews 588 # show attempt previews
405 } elsif ($previewAnswers) { 589 } elsif ($previewAnswers) {
406 # print this if user previewed answers 590 # print this if user previewed answers
407 print $self->attemptResults($pg, 1, 0, 0, 0, 1); 591 print "PREVIEW ONLY -- NOT RECORDED",CGI::br(),$self->attemptResults($pg, 1, 0, 0, 0, 1);
408 # show attempt answers 592 # show attempt answers
409 # don't show correct answers 593 # don't show correct answers
410 # don't show attempt results (correctness) 594 # don't show attempt results (correctness)
411 # show attempt previews 595 # show attempt previews
412 } 596 }
413 597
414 print CGI::end_div(); 598 print CGI::end_div();
415 599
416 print CGI::start_div({class=>"problem"}); 600 print CGI::start_div({class=>"problem"});
417 #print CGI::hr(); 601
418 # main form 602 # main form
419 print 603 print
420 CGI::startform("POST", $r->uri), 604 CGI::startform("POST", $r->uri),
421 $self->hidden_authen_fields, 605 $self->hidden_authen_fields,
422 CGI::p($pg->{body_text}), 606 CGI::p($pg->{body_text}),
423 CGI::p($pg->{result}->{msg} ? CGI::b("Note: ") : "", CGI::i($pg->{result}->{msg})), 607 CGI::p($pg->{result}->{msg} ? CGI::b("Note: ") : "", CGI::i($pg->{result}->{msg})),
424 CGI::p( 608 CGI::p(
609 ($can{showCorrectAnswers}
610 ? CGI::checkbox(
611 -name => "showCorrectAnswers",
612 -checked => $will{showCorrectAnswers},
613 -label => "Show correct answers",
614 ) ." "
615 : "" ),
616 ($can{showHints}
617 ? '<div style="color:red">'. CGI::checkbox(
618 -name => "showHints",
619 -checked => $will{showHints},
620 -label => "Show Hints",
621 ) . "</div> "
622 : " " ),
623 ($can{showSolutions}
624 ? CGI::checkbox(
625 -name => "showSolutions",
626 -checked => $will{showSolutions},
627 -label => "Show Solutions",
628 ) . " "
629 : " " ),CGI::br(),
630 CGI::submit(-name=>"previewAnswers",
631 -label=>"Preview Answers"),
425 ($can{recordAnswers} 632 ($can{recordAnswers}
426 ? CGI::submit(-name=>"submitAnswers", 633 ? CGI::submit(-name=>"submitAnswers",
427 -label=>"Submit Answers") 634 -label=>"Submit Answers")
428 : ""), 635 : ""),
429 ($can{checkAnswers} 636 ( $can{checkAnswers}
430 ? CGI::submit(-name=>"checkAnswers", 637 ? CGI::submit(-name=>"checkAnswers",
431 -label=>"Check Answers") 638 -label=>"Check Answers")
432 : ""), 639 : ""),
433 CGI::submit(-name=>"previewAnswers",
434 -label=>"Preview Answers"),
435 ); 640 );
436 print CGI::end_div(); 641 print CGI::end_div();
437 642
438 print CGI::start_div({class=>"scoreSummary"}); 643 print CGI::start_div({class=>"scoreSummary"});
644
439 # score summary 645 # score summary
440 my $attempts = $problem->num_correct + $problem->num_incorrect; 646 my $attempts = $problem->num_correct + $problem->num_incorrect;
441 my $attemptsNoun = $attempts != 1 ? "times" : "time"; 647 my $attemptsNoun = $attempts != 1 ? "times" : "time";
442 my $lastScore = int ($problem->status * 100) . "%"; 648 my $lastScore = sprintf("%.0f%%", $problem->status * 100); # Round to whole number
443 my ($attemptsLeft, $attemptsLeftNoun); 649 my ($attemptsLeft, $attemptsLeftNoun);
444 if ($problem->max_attempts == -1) { 650 if ($problem->max_attempts == -1) {
445 # unlimited attempts 651 # unlimited attempts
446 $attemptsLeft = "unlimited"; 652 $attemptsLeft = "unlimited";
447 $attemptsLeftNoun = "attempts"; 653 $attemptsLeftNoun = "attempts";
… …
454 my $setClosedMessage; 660 my $setClosedMessage;
455 if (time < $set->open_date or time > $set->due_date) { 661 if (time < $set->open_date or time > $set->due_date) {
456 $setClosed = 1; 662 $setClosed = 1;
457 $setClosedMessage = "This problem set is closed."; 663 $setClosedMessage = "This problem set is closed.";
458 if ($permissionLevel > 0) { 664 if ($permissionLevel > 0) {
459 $setClosedMessage .= " Since you are a privileged user, additional attempts will be recorded."; 665 $setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
460 } else { 666 } else {
461 $setClosedMessage .= " Additional attempts will not be recorded."; 667 $setClosedMessage .= " Additional attempts will not be recorded.";
462 } 668 }
463 } 669 }
464 print CGI::p( 670 print CGI::p(
671 $submitAnswers ? $scoreRecordedMessage . CGI::br() : "",
465 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(), 672 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(),
466 $problem->attempted 673 $problem->attempted
467 ? "Your recorded score is $lastScore." . CGI::br() 674 ? "Your recorded score is $lastScore." . CGI::br()
468 : "", 675 : "",
469 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining." 676 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining."
470 ); 677 );
471 print CGI::end_div(); 678 print CGI::end_div();
472 print CGI::hr(), CGI::start_div({class=>"viewOptions"}); 679
473 print 680 # save state for viewOptions
474 $self->viewOptions(),CGI::end_div(), 681 print CGI::hidden(
682 -name => "showOldAnswers",
683 -value => $will{showOldAnswers}
684 ),
685
686 CGI::hidden(
687 -name => "displayMode",
688 -value => $self->{displayMode}
689 );
690 print( CGI::hidden(
691 -name => 'editMode',
692 -value => $self->{editMode},
693 )
694 ) if defined($self->{editMode}) and $self->{editMode} eq 'temporaryFile';
695 print( CGI::hidden(
696 -name => 'sourceFilePath',
697 -value => $self->{problem}->{source_file}
698 )) if defined($self->{problem}->{source_file});
699
700 # end of main form
475 CGI::endform(); 701 print CGI::endform();
476 702
703
477 print CGI::start_div({class=>"problemFooter"}); 704 print CGI::start_div({class=>"problemFooter"});
478 # feedback form
479 my $ce = $self->{ce};
480 my $root = $ce->{webworkURLs}->{root};
481 my $courseName = $ce->{courseName};
482 my $feedbackURL = "$root/$courseName/feedback/";
483 705
484 # arguments for answer inspection button 706 # arguments for answer inspection button
485 my $prof_url = $ce->{webworkURLs}->{oldProf}; 707 my $prof_url = $ce->{webworkURLs}->{oldProf};
708 my $webworkURL = $ce->{webworkURLs}->{root};
486 my $cgi_url = $prof_url; 709 my $cgi_url = $prof_url;
487 $cgi_url=~ s|/[^/]*$||; # clip profLogin.pl 710 $cgi_url=~ s|/[^/]*$||; # clip profLogin.pl
488 my $authen_args = $self->url_authen_args(); 711 my $authen_args = $self->url_authen_args();
489 my $showPastAnswersURL = "$cgi_url/showPastAnswers.pl"; 712 my $showPastAnswersURL = "$webworkURL/$courseName/instructor/show_answers/";
713
714 # print answer inspection button
715 if ($self->{permissionLevel} > 0) {
716 print "\n",
717 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
718 $self->hidden_authen_fields,"\n",
719 CGI::hidden(-name => 'course', -value=>$courseName), "\n",
720 CGI::hidden(-name => 'problemNumber', -value=>$problem->problem_id), "\n",
721 CGI::hidden(-name => 'setName', -value=>$problem->set_id), "\n",
722 CGI::hidden(-name => 'studentUser', -value=>$problem->user_id), "\n",
723 CGI::p( {-align=>"left"},
724 CGI::submit(-name => 'action', -value=>'Show Past Answers')
725 ), "\n",
726 CGI::endform();
727 }
728
729 #print CGI::end_div();
730 #
731 #print CGI::start_div();
732
733 # arguments for feedback form
734 my $feedbackURL = "$root/$courseName/feedback/";
490 735
491 #print feedback form 736 #print feedback form
492 print 737 print
493 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n", 738 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
494 $self->hidden_authen_fields,"\n", 739 $self->hidden_authen_fields,"\n",
… …
498 CGI::hidden("displayMode", $self->{displayMode}),"\n", 743 CGI::hidden("displayMode", $self->{displayMode}),"\n",
499 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n", 744 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
500 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n", 745 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
501 CGI::hidden("showHints", $will{showHints}),"\n", 746 CGI::hidden("showHints", $will{showHints}),"\n",
502 CGI::hidden("showSolutions", $will{showSolutions}),"\n", 747 CGI::hidden("showSolutions", $will{showSolutions}),"\n",
503 CGI::p({-align=>"right"}, 748 CGI::p({-align=>"left"},
504 CGI::submit(-name=>"feedbackForm", -label=>"Send Feedback") 749 CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
505 ), 750 ),
506 CGI::endform(),"\n"; 751 CGI::endform(),"\n";
507 # print answer inspection button 752
508 if ($self->{permissionLevel} >0) {
509
510
511 print "\n",
512 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
513 $self->hidden_authen_fields,"\n",
514 CGI::hidden(-name => 'course', -value=>$courseName), "\n",
515 CGI::hidden(-name => 'probNum', -value=>$problem->problem_id), "\n",
516 CGI::hidden(-name => 'setNum', -value=>$problem->set_id), "\n",
517 CGI::hidden(-name => 'User', -value=>$problem->user_id), "\n",
518 CGI::submit(-name => 'action', -value=>'Show Past Answers'), "\n",
519 CGI::endform();
520
521
522
523 }
524 # FIXME print editor link 753 # FIXME print editor link
525 # print editor link if the user is an instructor AND the file is not in temporary editing mode 754 print $editorLinkMessage; #empty unless it is appropriate to have an editor link.
526 if ($self->{permissionLevel}>=10 and ( (not defined($self->{edit_mode})) or $self->{edit_mode} eq 'savedFile') ) { 755
527 print CGI::a({-href=>"/webwork/$courseName/instructor/pgProblemEditor/".$set->set_id.
528 '/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
529 }
530 print CGI::end_div(); 756 print CGI::end_div();
531 757
532 # end answer inspection button
533 # warning output 758 # warning output
534 if ($pg->{warnings} ne "") { 759 #if ($pg->{warnings} ne "") {
535 print CGI::hr(), $self->warningOutput($pg->{warnings}); 760 # print CGI::hr(), $self->warningOutput($pg->{warnings});
536 } 761 #}
537 762
538 # debugging stuff 763 # debugging stuff
539 if (0) { 764 if (0) {
540 print 765 print
541 CGI::hr(), 766 CGI::hr(),
… …
563 my $showAttemptAnswers = shift; 788 my $showAttemptAnswers = shift;
564 my $showCorrectAnswers = shift; 789 my $showCorrectAnswers = shift;
565 my $showAttemptResults = $showAttemptAnswers && shift; 790 my $showAttemptResults = $showAttemptAnswers && shift;
566 my $showSummary = shift; 791 my $showSummary = shift;
567 my $showAttemptPreview = shift || 0; 792 my $showAttemptPreview = shift || 0;
793 my $ce = $self->{ce};
568 my $problemResult = $pg->{result}; # the overall result of the problem 794 my $problemResult = $pg->{result}; # the overall result of the problem
569 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }; 795 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
570 796
571 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames; 797 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
572 798
799 my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview";
800 my $imgGen = WeBWorK::PG::ImageGenerator->new(
801 tempDir => $ce->{webworkDirs}->{tmp},
802 latex => $ce->{externalPrograms}->{latex},
803 dvipng => $ce->{externalPrograms}->{dvipng},
804 useCache => 1,
805 cacheDir => $ce->{webworkDirs}->{equationCache},
806 cacheURL => $ce->{webworkURLs}->{equationCache},
807 cacheDB => $ce->{webworkFiles}->{equationCacheDB},
808 );
809
810 my $header;
573 my $header = CGI::th("Part"); 811 #$header .= CGI::th("Part");
574 $header .= $showAttemptAnswers ? CGI::th("Entered") : ""; 812 $header .= $showAttemptAnswers ? CGI::th("Entered") : "";
575 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : ""; 813 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : "";
576 $header .= $showCorrectAnswers ? CGI::th("Correct") : ""; 814 $header .= $showCorrectAnswers ? CGI::th("Correct") : "";
577 $header .= $showAttemptResults ? CGI::th("Result") : ""; 815 $header .= $showAttemptResults ? CGI::th("Result") : "";
578 $header .= $showMessages ? CGI::th("messages") : ""; 816 $header .= $showMessages ? CGI::th("messages") : "";
… …
580 my $numCorrect; 818 my $numCorrect;
581 foreach my $name (@answerNames) { 819 foreach my $name (@answerNames) {
582 my $answerResult = $pg->{answers}->{$name}; 820 my $answerResult = $pg->{answers}->{$name};
583 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans 821 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
584 my $preview = ($showAttemptPreview 822 my $preview = ($showAttemptPreview
585 ? $self->previewAnswer($answerResult) 823 ? $self->previewAnswer($answerResult, $imgGen)
586 : ""); 824 : "");
587 my $correctAnswer = $answerResult->{correct_ans}; 825 my $correctAnswer = $answerResult->{correct_ans};
588 my $answerScore = $answerResult->{score}; 826 my $answerScore = $answerResult->{score};
589 my $answerMessage = $showMessages ? $answerResult->{ans_message} : ""; 827 my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
590 828 #FIXME --Can we be sure that $answerScore is an integer-- could the problem give partial credit?
591 $numCorrect += $answerScore > 0; 829 $numCorrect += $answerScore > 0;
592 my $resultString = $answerScore ? "correct" : "incorrect"; 830 my $resultString = $answerScore == 1 ? "correct" : "incorrect";
593 831
594 # get rid of the goofy prefix on the answer names (supposedly, the format 832 # get rid of the goofy prefix on the answer names (supposedly, the format
595 # of the answer names is changeable. this only fixes it for "AnSwEr" 833 # of the answer names is changeable. this only fixes it for "AnSwEr"
596 $name =~ s/^AnSwEr//; 834 #$name =~ s/^AnSwEr//;
597 835
836 my $row;
598 my $row = CGI::td($name); 837 #$row .= CGI::td($name);
599 $row .= $showAttemptAnswers ? CGI::td($studentAnswer) : ""; 838 $row .= $showAttemptAnswers ? CGI::td(nbsp($studentAnswer)) : "";
600 $row .= $showAttemptPreview ? CGI::td($preview) : ""; 839 $row .= $showAttemptPreview ? CGI::td(nbsp($preview)) : "";
601 $row .= $showCorrectAnswers ? CGI::td($correctAnswer) : ""; 840 $row .= $showCorrectAnswers ? CGI::td(nbsp($correctAnswer)) : "";
602 $row .= $showAttemptResults ? CGI::td($resultString) : ""; 841 $row .= $showAttemptResults ? CGI::td(nbsp($resultString)) : "";
603 $row .= $answerMessage ? CGI::td($answerMessage) : ""; 842 $row .= $showMessages ? CGI::td(nbsp($answerMessage)) : "";
604 push @tableRows, $row; 843 push @tableRows, $row;
605 } 844 }
606 845
846 # render equation images
847 $imgGen->render(refresh => 1);
848
607 my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions"; 849# my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
608 my $scorePercent = int ($problemResult->{score} * 100) . "\%"; 850 my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
851# FIXME -- I left the old code in in case we have to back out.
609 my $summary = "On this attempt, you answered $numCorrect out of " 852# my $summary = "On this attempt, you answered $numCorrect out of "
610 . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent."; 853# . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
854 my $summary = "";
855 if (scalar @answerNames == 1) {
856 if ($numCorrect == scalar @answerNames) {
857 $summary .= "The above answer is correct.";
858 } else {
859 $summary .= "The above answer is NOT correct.";
860 }
861 } else {
862 if ($numCorrect == scalar @answerNames) {
863 $summary .= "All of the above answers are correct.";
864 } else {
865 $summary .= "At least one of the above answers is NOT correct.";
866 }
867 }
868 #FIXME there must be a better way to force refresh.
869 #my $refresh_warning = 'Hold down shift and click "refresh" or "reload" to update answer preview images.';
611 return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p($summary) : ""); 870 #return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) .
871 #CGI::div({style=>'color:red; font-size:10pt'},$refresh_warning) .
872 #($showSummary ? CGI::p({class=>'emphasis'},$summary) : "");
873 # ... this has been fixed by equation caching.
874 return
875 CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows))
876 . ($showSummary ? CGI::p({class=>'emphasis'},$summary) : "");
612} 877}
613 878sub nbsp {
879 my $str = shift;
880 ($str =~/\S/) ? $str : '&nbsp;' ; # returns non-breaking space for empty strings
881 # tricky cases: $str =0;
882 # $str is a complex number
883}
614sub viewOptions($) { 884sub viewOptions($) {
615 my $self = shift; 885 my $self = shift;
616 my $displayMode = $self->{displayMode}; 886 my $displayMode = $self->{displayMode};
617 my %must = %{ $self->{must} }; 887 my %must = %{ $self->{must} };
618 my %can = %{ $self->{can} }; 888 my %can = %{ $self->{can} };
619 my %will = %{ $self->{will} }; 889 my %will = %{ $self->{will} };
620 890
621 my $optionLine; 891 my $optionLine;
622 $can{showOldAnswers} and $optionLine .= join "", 892 $can{showOldAnswers} and $optionLine .= join "",
623 "Show: &nbsp;", 893 "Show: &nbsp;".CGI::br(),
624 CGI::checkbox( 894 CGI::checkbox(
625 -name => "showOldAnswers", 895 -name => "showOldAnswers",
626 -checked => $will{showOldAnswers}, 896 -checked => $will{showOldAnswers},
627 -label => "Saved answers", 897 -label => "Saved answers",
628 ), "&nbsp;&nbsp;"; 898 ), "&nbsp;&nbsp;".CGI::br();
629 $can{showCorrectAnswers} and $optionLine .= join "", 899
630 CGI::checkbox(
631 -name => "showCorrectAnswers",
632 -checked => $will{showCorrectAnswers},
633 -label => "Correct answers",
634 ), "&nbsp;&nbsp;";
635 $can{showHints} and $optionLine .= join "",
636 CGI::checkbox(
637 -name => "showHints",
638 -checked => $will{showHints},
639 -label => "Hints",
640 ), "&nbsp;&nbsp;";
641 $can{showSolutions} and $optionLine .= join "",
642 CGI::checkbox(
643 -name => "showSolutions",
644 -checked => $will{showSolutions},
645 -label => "Solutions",
646 ), "&nbsp;&nbsp;";
647 $optionLine and $optionLine .= join "", CGI::br(); 900 $optionLine and $optionLine .= join "", CGI::br();
648 901
649 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex"}, 902 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex align: left"},
650 "View equations as: &nbsp;", 903 "View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;".CGI::br(),
651 CGI::radio_group( 904 CGI::radio_group(
652 -name => "displayMode", 905 -name => "displayMode",
653 -values => ['plainText', 'formattedText', 'images'], 906 -values => ['plainText', 'formattedText', 'images'],
654 -default => $displayMode, 907 -default => $displayMode,
908 -linebreak=>'true',
655 -labels => { 909 -labels => {
656 plainText => "plain text", 910 plainText => "plain",
657 formattedText => "formatted text", 911 formattedText => "formatted",
658 images => "images", 912 images => "images",
659 } 913 }
660 ), CGI::br(), 914 ), CGI::br(),CGI::hr(),
661 $optionLine, 915 $optionLine,
662 CGI::submit(-name=>"redisplay", -label=>"Redisplay Problem"), 916 CGI::submit(-name=>"redisplay", -label=>"Save Options"),
663 ); 917 );
664} 918}
665 919
666sub previewAnswer($$) { 920sub previewAnswer($$) {
667 my ($self, $answerResult) = @_; 921 my ($self, $answerResult, $imgGen) = @_;
668 my $ce = $self->{ce}; 922 my $ce = $self->{ce};
669 my $effectiveUser = $self->{effectiveUser}; 923 my $effectiveUser = $self->{effectiveUser};
670 my $set = $self->{set}; 924 my $set = $self->{set};
671 my $problem = $self->{problem}; 925 my $problem = $self->{problem};
672 my $displayMode = $self->{displayMode}; 926 my $displayMode = $self->{displayMode};
… …
676 # so we'll just deal with each case explicitly here. there's some code 930 # so we'll just deal with each case explicitly here. there's some code
677 # duplication that can be dealt with later by abstracting out tth/dvipng/etc. 931 # duplication that can be dealt with later by abstracting out tth/dvipng/etc.
678 932
679 my $tex = $answerResult->{preview_latex_string}; 933 my $tex = $answerResult->{preview_latex_string};
680 934
681 return "" if $tex eq ""; 935 return "" unless defined $tex and $tex ne "";
682 936
683 if ($displayMode eq "plainText") { 937 if ($displayMode eq "plainText") {
684 return $tex; 938 return $tex;
685 } elsif ($displayMode eq "formattedText") { 939 } elsif ($displayMode eq "formattedText") {
686 my $tthCommand = $ce->{externalPrograms}->{tth} 940 my $tthCommand = $ce->{externalPrograms}->{tth}
… …
693 if ($?) { 947 if ($?) {
694 return "<b>[tth failed: $? $@]</b>"; 948 return "<b>[tth failed: $? $@]</b>";
695 } 949 }
696 return $result; 950 return $result;
697 } elsif ($displayMode eq "images") { 951 } elsif ($displayMode eq "images") {
698 # how are we going to name this? 952 ## how are we going to name this?
699 my $targetPathCommon = "/png/" 953 #my $targetPathCommon = "/m2i/"
700 . $effectiveUser->user_id . "." 954 # . $effectiveUser->user_id . "."
701 . $set->set_id . "." 955 # . $set->set_id . "."
702 . $problem->problem_id . "." 956 # . $problem->problem_id . "."
703 . $answerResult->{ans_name} . ".png"; 957 # . $answerResult->{ans_name} . ".png";
704 958 #
705 # figure out where to put things 959 ## figure out where to put things
706 my $wd = tempdir("webwork-dvipng-XXXXXXXX", DIR => $ce->{courseDirs}->{html_temp}); 960 #my $wd = makeTempDirectory($ce->{courseDirs}->{html_temp}, "webwork-dvipng");
707 my $latex = $ce->{externalPrograms}->{latex}; 961 #my $latex = $ce->{externalPrograms}->{latex};
708 my $dvipng = $ce->{externalPrograms}->{dvipng}; 962 #my $dvipng = $ce->{externalPrograms}->{dvipng};
709 my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon; 963 #my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
710 # should use surePathToTmpFile, but we have to 964 # # should use surePathToTmpFile, but we have to
711 # isolate it from the problem enivronment first 965 # # isolate it from the problem enivronment first
712 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon; 966 #my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
713 967 #
714 # call dvipng to generate a preview 968 ## call dvipng to generate a preview
715 dvipng($wd, $latex, $dvipng, $tex, $targetPath); 969 #dvipng($wd, $latex, $dvipng, $tex, $targetPath);
716 rmtree($wd, 0, 0); 970 #rmtree($wd, 0, 0);
717 if (-e $targetPath) { 971 #if (-e $targetPath) {
718 return "<img src=\"$targetURL\" alt=\"$tex\" />"; 972 # return "<img src=\"$targetURL\" alt=\"$tex\" />";
719 } else { 973 #} else {
720 return "<b>[math2img failed]</b>"; 974 # return "<b>[math2img failed]</b>";
721 } 975 #}
976 $imgGen->add($answerResult->{preview_latex_string});
977
722 } 978 }
723} 979}
980
724##### logging subroutine #### 981##### logging subroutine ####
725 982
726 983
727 984
728##### permission queries ##### 985##### permission queries #####
Legend:
Removed from v.928  
changed lines
  Added in v.1841
aubreyja at gmail dot com
 ViewVC Help
Powered by ViewVC 1.0.9