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