[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 756 Revision 1096
… …
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::Path qw(rmtree);
18use File::Temp qw(tempdir); 19use File::Temp qw(tempdir);
19use WeBWorK::Form; 20use WeBWorK::Form;
20use WeBWorK::PG; 21use WeBWorK::PG;
21use WeBWorK::PG::IO; 22use WeBWorK::PG::IO;
22use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string); 23use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string);
24use WeBWorK::DB::Utils qw(global2user user2global findDefaults);
23 25
24############################################################ 26############################################################
25# 27#
26# user 28# user
27# effectiveUser 29# effectiveUser
… …
35# 37#
36# AnSwEr# - answer blanks in problem 38# AnSwEr# - answer blanks in problem
37# 39#
38# redisplay - name of the "Redisplay Problem" button 40# redisplay - name of the "Redisplay Problem" button
39# submitAnswers - name of "Submit Answers" button 41# submitAnswers - name of "Submit Answers" button
42# checkAnswers - name of the "Check Answers" button
43# previewAnswers - name of the "Preview Answers" button
40# 44#
41############################################################ 45############################################################
42 46
43sub pre_header_initialize { 47sub pre_header_initialize {
44 my ($self, $setName, $problemNumber) = @_; 48 my ($self, $setName, $problemNumber) = @_;
45 my $courseEnv = $self->{courseEnvironment}; 49 my $r = $self->{r};
46 my $r = $self->{r}; 50 my $courseEnv = $self->{ce};
51 my $db = $self->{db};
47 my $userName = $r->param('user'); 52 my $userName = $r->param('user');
48 my $effectiveUserName = $r->param('effectiveUser'); 53 my $effectiveUserName = $r->param('effectiveUser');
49 54 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); 55 my $user = $db->getUser($userName);
57 my $effectiveUser = $cldb->getUser($effectiveUserName); 56 my $effectiveUser = $db->getUser($effectiveUserName);
57
58 # obtain the effective user set, or if that is not yet defined obtain global set
58 my $set = $wwdb->getSet($effectiveUserName, $setName); 59 my $set = $db->getMergedSet($effectiveUserName, $setName);
60 unless (defined $set) {
61 my $userSetClass = $courseEnv->{dbLayout}->{set_user}->{record};
62 $set = global2user($userSetClass, $db->getGlobalSet($setName));
63 $set->psvn('000');
64 }
65 my $psvn = $set->psvn();
66
67 # obtain the effective user problem, or if that is not yet defined obtain global problem
59 my $problem = $wwdb->getProblem($effectiveUserName, $setName, $problemNumber); 68 my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber);
60 my $psvn = $wwdb->getPSVN($effectiveUserName, $setName); 69 unless (defined $problem) {
70 my $userProblemClass = $courseEnv->{dbLayout}->{problem_user}->{record};
71 $problem = global2user($userProblemClass, $db->getGlobalProblem($setName,$problemNumber));
72
73# $problem->max_attempts(-1); # default is infinite number of attempts
74# $problem->value;
75# $problem->problem_seed;
76# $problem->source_file;
77 $problem->user_id($userName); # is this the right value for this unassigned problem? FIXME
78 $problem->status(0);
79 $problem->attempted(0);
80 $problem->num_correct(0);
81 $problem->num_incorrect(0);
82 $problem->last_answer(' ');
83 }
84 #$problem = $db->getGlobalProblem($setName, $problemNumber) unless defined($problem);
85 # FIXME
86 # a better solution at this point would be to take set and problem, convert them to global_user type
87 # so that they have the right methods.
88 # Stuff the local copy of $set and $problem with default data where it won't have been defined
89 # Make sure that nothing bad is stored back in the database.
90 # It would be nice to store lastAnswer somewhere -- perhaps that could be done as a special case.
91
92
93 # This supplies a psvn if $set doesn't have it. Unfortunately the problem is called on to provide
94 # data in many places and it might not even have methods defined.
95
96 # global sets will not have a defined psvn
97# my $psvn;
98# if ($set->can('psvn') ) {
99# $psvn = $set->psvn();
100# } else { # we are viewing an unassigned problem set, psvn's are irrelevant
101# $psvn = '0000';
102# }
103
61 my $permissionLevel = $authdb->getPermissions($userName); 104 my $permissionLevel = $db->getPermissionLevel($userName)->permission();
62
63 $self->{cldb} = $cldb;
64 $self->{wwdb} = $wwdb;
65 $self->{authdb} = $authdb;
66 105
67 $self->{userName} = $userName; 106 $self->{userName} = $userName;
68 $self->{user} = $user; 107 $self->{user} = $user;
69 $self->{effectiveUser} = $effectiveUser; 108 $self->{effectiveUser} = $effectiveUser;
70 $self->{set} = $set; 109 $self->{set} = $set;
… …
78 my $redisplay = $r->param("redisplay"); 117 my $redisplay = $r->param("redisplay");
79 my $submitAnswers = $r->param("submitAnswers"); 118 my $submitAnswers = $r->param("submitAnswers");
80 my $checkAnswers = $r->param("checkAnswers"); 119 my $checkAnswers = $r->param("checkAnswers");
81 my $previewAnswers = $r->param("previewAnswers"); 120 my $previewAnswers = $r->param("previewAnswers");
82 121
122 # fields which may be defined when using Problem Editor
123 my $override_seed = ($permissionLevel>=10) ? $r->param('problemSeed') : undef;
124 my $override_problem_source = ($permissionLevel>=10) ? $r->param('sourceFilePath') : undef;
125 my $editMode = undef;
126 my $submit_button = $r->param('submit_button');
127 if ( defined($submit_button ) ) {
128 $editMode = "temporaryFile" if $submit_button eq 'Refresh';
129 $editMode = 'savedFile' if $submit_button eq 'Save';
130 }
131
132 #override using the source file data from the form field
133 $problem->source_file($override_problem_source) if defined($override_problem_source);
134 $problem->problem_seed($override_seed) if defined($override_seed);
135
136 # store path to source file for title.
137 $self->{problem_source_name} = $problem->source_file;
138 $self->{edit_mode} = $editMode;
139# $self->{current_problem_source} = (defined($override_problem_source) ) ?
140# $override_problem_source :
141# $problem->source_file;
83 # coerce form fields into CGI::Vars format 142 # coerce form fields into CGI::Vars format
84 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars }; 143 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
85 144
86 $self->{displayMode} = $displayMode; 145 $self->{displayMode} = $displayMode;
87 $self->{redisplay} = $redisplay; 146 $self->{redisplay} = $redisplay;
88 $self->{submitAnswers} = $submitAnswers; 147 $self->{submitAnswers} = $submitAnswers;
89 $self->{checkAnswers} = $checkAnswers; 148 $self->{checkAnswers} = $checkAnswers;
90 $self->{previewAnswers} = $previewAnswers; 149 $self->{previewAnswers} = $previewAnswers;
91 $self->{formFields} = $formFields; 150 $self->{formFields} = $formFields;
92 151
152
93 ##### permissions ##### 153 ##### permissions #####
94 154
95 # are we allowed to view this problem? 155 # are we allowed to view this problem?
96 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0; 156 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
97 return unless $self->{isOpen}; 157 return unless $self->{isOpen};
… …
145 ##### translation ##### 205 ##### translation #####
146 206
147 my $pg = WeBWorK::PG->new( 207 my $pg = WeBWorK::PG->new(
148 $courseEnv, 208 $courseEnv,
149 $effectiveUser, 209 $effectiveUser,
150 $r->param('key'), 210 $key,
151 $set, 211 $set,
152 $problem, 212 $problem,
153 $psvn, 213 $psvn,
154 $formFields, 214 $formFields,
155 { # translation options 215 { # translation options
156 displayMode => $displayMode, 216 displayMode => $displayMode,
217 override_seed => $override_seed,
218 override_problem_source =>$override_problem_source,
157 showHints => $will{showHints}, 219 showHints => $will{showHints},
158 showSolutions => $will{showSolutions}, 220 showSolutions => $will{showSolutions},
159 refreshMath2img => $will{showHints} || $will{showSolutions}, 221 refreshMath2img => $will{showHints} || $will{showSolutions},
160 processAnswers => 1, 222 processAnswers => 1,
161 }, 223 },
… …
195} 257}
196 258
197sub path { 259sub path {
198 my $self = shift; 260 my $self = shift;
199 my $args = $_[-1]; 261 my $args = $_[-1];
200 my $setName = $self->{set}->id; 262 my $setName = $self->{set}->set_id;
201 my $problemNumber = $self->{problem}->id; 263 my $problemNumber = $self->{problem}->problem_id;
202 264
203 my $ce = $self->{courseEnvironment}; 265 my $ce = $self->{ce};
204 my $root = $ce->{webworkURLs}->{root}; 266 my $root = $ce->{webworkURLs}->{root};
205 my $courseName = $ce->{courseName}; 267 my $courseName = $ce->{courseName};
206 return $self->pathMacro($args, 268 return $self->pathMacro($args,
207 "Home" => "$root", 269 "Home" => "$root",
208 $courseName => "$root/$courseName", 270 $courseName => "$root/$courseName",
… …
211 ); 273 );
212} 274}
213 275
214sub siblings { 276sub siblings {
215 my $self = shift; 277 my $self = shift;
216 my $setName = $self->{set}->id; 278 my $setName = $self->{set}->set_id;
217 my $problemNumber = $self->{problem}->id; 279 my $problemNumber = $self->{problem}->problem_id;
218 280
219 my $ce = $self->{courseEnvironment}; 281 my $ce = $self->{ce};
282 my $db = $self->{db};
220 my $root = $ce->{webworkURLs}->{root}; 283 my $root = $ce->{webworkURLs}->{root};
221 my $courseName = $ce->{courseName}; 284 my $courseName = $ce->{courseName};
222 285
223 print CGI::strong("Problems"), CGI::br(); 286 print CGI::strong("Problems"), CGI::br();
224 287
225 my $wwdb = $self->{wwdb};
226 my $effectiveUser = $self->{r}->param("effectiveUser"); 288 my $effectiveUser = $self->{r}->param("effectiveUser");
227 my @problems; 289 my @problems;
228 push @problems, $wwdb->getProblem($effectiveUser, $setName, $_) 290 push @problems, $db->getMergedProblem($effectiveUser, $setName, $_)
229 foreach ($wwdb->getProblems($effectiveUser, $setName)); 291 foreach ($db->listUserProblems($effectiveUser, $setName));
230 foreach my $problem (sort { $a->id <=> $b->id } @problems) { 292 foreach my $problem (sort { $a->problem_id <=> $b->problem_id } @problems) {
231 print CGI::a({-href=>"$root/$courseName/$setName/".$problem->id."/?" 293 print CGI::a({-href=>"$root/$courseName/$setName/".$problem->problem_id."/?"
232 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}}, 294 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}},
233 "Problem ".$problem->id), CGI::br(); 295 "Problem ".$problem->problem_id), CGI::br();
234 } 296 }
235} 297}
236 298
237sub nav { 299sub nav {
238 my $self = shift; 300 my $self = shift;
239 my $args = $_[-1]; 301 my $args = $_[-1];
240 my $setName = $self->{set}->id; 302 my $setName = $self->{set}->set_id;
241 my $problemNumber = $self->{problem}->id; 303 my $problemNumber = $self->{problem}->problem_id;
242 304
243 my $ce = $self->{courseEnvironment}; 305 my $ce = $self->{ce};
306 my $db = $self->{db};
244 my $root = $ce->{webworkURLs}->{root}; 307 my $root = $ce->{webworkURLs}->{root};
245 my $courseName = $ce->{courseName}; 308 my $courseName = $ce->{courseName};
246 309
247 my $wwdb = $self->{wwdb}; 310 my $wwdb = $self->{wwdb};
248 my $effectiveUser = $self->{r}->param("effectiveUser"); 311 my $effectiveUser = $self->{r}->param("effectiveUser");
249 my $tail = "&displayMode=".$self->{displayMode}; 312 my $tail = "&displayMode=".$self->{displayMode};
250 313
251 my @links = ("Problem List" , "$root/$courseName/$setName", "ProbList"); 314 my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList");
252 315
253 my $prevProblem = $wwdb->getProblem($effectiveUser, $setName, $problemNumber-1); 316 my $prevProblem = $db->getMergedProblem($effectiveUser, $setName, $problemNumber-1);
254 my $nextProblem = $wwdb->getProblem($effectiveUser, $setName, $problemNumber+1); 317 my $nextProblem = $db->getMergedProblem($effectiveUser, $setName, $problemNumber+1);
255 unshift @links, "Previous Problem" , ($prevProblem 318 unshift @links, "Previous Problem" , ($prevProblem
256 ? "$root/$courseName/$setName/".$prevProblem->id 319 ? "$root/$courseName/$setName/".$prevProblem->problem_id
257 : "") , "Prev"; 320 : "") , "navPrev";
258 push @links, "Next Problem" , ($nextProblem 321 push @links, "Next Problem" , ($nextProblem
259 ? "$root/$courseName/$setName/".$nextProblem->id 322 ? "$root/$courseName/$setName/".$nextProblem->problem_id
260 : "") , "Next"; 323 : "") , "navNext";
261 324
262 return $self->navMacro($args, $tail, @links); 325 return $self->navMacro($args, $tail, @links);
263} 326}
264 327
265sub title { 328sub title {
266 my $self = shift; 329 my $self = shift;
267 my $setName = $self->{set}->id; 330 my $setName = $self->{set}->set_id;
268 my $problemNumber = $self->{problem}->id; 331
332 my $file_action;
333 my $edit_mode = $self->{edit_mode};
334 if ( not defined($edit_mode) ) {
335 $file_action = '';
336 } elsif ( $edit_mode eq 'temporaryFile') {
337 $file_action .= 'Editing temporary file : '. CGI::br() . $self->{problem_source_name};
338 } elsif ( $edit_mode eq 'savedFile' ){
339 $file_action .= 'Problem saved to : '. CGI::br() . $self->{problem_source_name};
340 }
341 my $problemNumber = $self->{problem}->problem_id . " : " . $file_action;
269 342
270 return "$setName : Problem $problemNumber"; 343 return "$setName : Problem $problemNumber";
271} 344}
272 345
273sub body { 346sub body {
… …
276 return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the problem set that contains it is not yet open.")) 349 return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the problem set that contains it is not yet open."))
277 unless $self->{isOpen}; 350 unless $self->{isOpen};
278 351
279 # unpack some useful variables 352 # unpack some useful variables
280 my $r = $self->{r}; 353 my $r = $self->{r};
281 my $wwdb = $self->{wwdb}; 354 my $db = $self->{db};
282 my $set = $self->{set}; 355 my $set = $self->{set};
283 my $problem = $self->{problem}; 356 my $problem = $self->{problem};
284 my $permissionLevel = $self->{permissionLevel}; 357 my $permissionLevel = $self->{permissionLevel};
285 my $submitAnswers = $self->{submitAnswers}; 358 my $submitAnswers = $self->{submitAnswers};
286 my $checkAnswers = $self->{checkAnswers}; 359 my $checkAnswers = $self->{checkAnswers};
… …
299 372
300 ##### answer processing ##### 373 ##### answer processing #####
301 374
302 # if answers were submitted: 375 # if answers were submitted:
303 if ($submitAnswers) { 376 if ($submitAnswers) {
377 # get a "pure" (unmerged) UserProblem to modify
378 # this will be undefined if the problem has not been assigned to this user
379 my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id);
304 # store answers in DB for sticky answers 380 # store answers in DB for sticky answers
305 my %answersToStore; 381 my %answersToStore;
306 my %answerHash = %{ $pg->{answers} }; 382 my %answerHash = %{ $pg->{answers} };
307 $answersToStore{$_} = $answerHash{$_}->{original_student_ans} 383 $answersToStore{$_} = $answerHash{$_}->{original_student_ans}
308 foreach (keys %answerHash); 384 foreach (keys %answerHash);
309 my $answerString = encodeAnswers(%answersToStore, 385 my $answerString = encodeAnswers(%answersToStore,
310 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }); 386 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} });
387
311 $problem->last_answer($answerString); 388 $problem->last_answer($answerString);
389 # if $pureProblem is defined ( there is a user ) then record the last answer.
390 # FIXME (we're assuming that not being able to get a pure problem is enough to determine
391 # whether or not the problem database needs to be updated. This should be thought through
392 # more carefully to be sure.
393 if ( defined($pureProblem) ) {
394 $pureProblem->last_answer($answerString);
312 $wwdb->setProblem($problem); 395 $db->putUserProblem($pureProblem);
396 #die "pureProblem = ", defined($pureProblem);
313 397
398
314 # store state in DB if it makes sense 399 # store state in DB if it makes sense
315 if ($will{recordAnswers}) { 400 if ($will{recordAnswers}) {
316 $problem->attempted(1);
317 $problem->status($pg->{state}->{recorded_score}); 401 $problem->status($pg->{state}->{recorded_score});
402 $problem->attempted(1);
318 $problem->num_correct($pg->{state}->{num_of_correct_ans}); 403 $problem->num_correct($pg->{state}->{num_of_correct_ans});
319 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans}); 404 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
405 $pureProblem->status($pg->{state}->{recorded_score});
406 $pureProblem->attempted(1);
407 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
408 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
320 $wwdb->setProblem($problem); 409 $db->putUserProblem($pureProblem);
321 # write to the transaction log, just to make sure 410 # write to the transaction log, just to make sure
322 writeLog($self->{courseEnvironment}, "transaction", 411 writeLog($self->{ce}, "transaction",
323 $problem->id."\t". 412 $problem->problem_id."\t".
324 $problem->set_id."\t". 413 $problem->set_id."\t".
325 $problem->login_id."\t". 414 $problem->user_id."\t".
326 $problem->source_file."\t". 415 $problem->source_file."\t".
327 $problem->value."\t". 416 $problem->value."\t".
328 $problem->max_attempts."\t". 417 $problem->max_attempts."\t".
329 $problem->problem_seed."\t". 418 $problem->problem_seed."\t".
330 $problem->status."\t". 419 $pureProblem->status."\t".
331 $problem->attempted."\t". 420 $pureProblem->attempted."\t".
332 $problem->last_answer."\t". 421 $pureProblem->last_answer."\t".
333 $problem->num_correct."\t". 422 $pureProblem->num_correct."\t".
334 $problem->num_incorrect 423 $pureProblem->num_incorrect
335 ); 424 );
425 }
336 } 426 }
337 } 427 }
428 # logging student answers
429 my $pastAnswerLog = undef;
430 if (defined( $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'} )) {
431
432 $pastAnswerLog = $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'};
433
434 if ($submitAnswers and defined($pastAnswerLog) ) {
435 my $answerString = "";
436 my %answerHash = %{ $pg->{answers} };
437 $answerString = $answerString . $answerHash{$_}->{original_student_ans}."\t"
438 foreach (sort keys %answerHash);
439 $answerString = '' unless defined($answerString); # insure string is defined.
440 writeLog($self->{ce}, "pastAnswerList",
441 '|'.$problem->user_id.
442 '|'.$problem->set_id.
443 '|'.$problem->problem_id.'|'."\t".
444 time()."\t".
445 $answerString,
446
447 );
448
449 }
450
451 }
452 # end logging student answers
338 453
339 ##### output ##### 454 ##### output #####
340 print CGI::start_div({class=>"problemHeader"}); 455 print CGI::start_div({class=>"problemHeader"});
341 # attempt summary 456 # attempt summary
342 if ($submitAnswers or $will{showCorrectAnswers}) { 457 if ($submitAnswers or $will{showCorrectAnswers}) {
343 # print this if user submitted answers OR requested correct answers 458 # print this if user submitted answers OR requested correct answers
344 print $self->attemptResults($pg, $submitAnswers, 459 print $self->attemptResults($pg, $submitAnswers,
345 $will{showCorrectAnswers}, 460 $will{showCorrectAnswers},
346 $pg->{flags}->{showPartialCorrectAnswers}, 1, 0); 461 $pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
347 } elsif ($checkAnswers) { 462 } elsif ($checkAnswers) {
348 # print this if user previewed answers 463 # print this if user previewed answers
349 print $self->attemptResults($pg, 1, 0, 1, 1, 0); 464 print $self->attemptResults($pg, 1, 0, 1, 1, 1);
350 # show attempt answers 465 # show attempt answers
351 # don't show correct answers 466 # don't show correct answers
352 # show attempt results (correctness) 467 # show attempt results (correctness)
353 # don't show attempt previews 468 # don't show attempt previews
354 } elsif ($previewAnswers) { 469 } elsif ($previewAnswers) {
… …
380 -label=>"Check Answers") 495 -label=>"Check Answers")
381 : ""), 496 : ""),
382 CGI::submit(-name=>"previewAnswers", 497 CGI::submit(-name=>"previewAnswers",
383 -label=>"Preview Answers"), 498 -label=>"Preview Answers"),
384 ); 499 );
500 print CGI::end_div();
501
502 print CGI::start_div({class=>"scoreSummary"});
385 # score summary 503 # score summary
386 my $attempts = $problem->num_correct + $problem->num_incorrect; 504 my $attempts = $problem->num_correct + $problem->num_incorrect;
387 my $attemptsNoun = $attempts != 1 ? "times" : "time"; 505 my $attemptsNoun = $attempts != 1 ? "times" : "time";
388 my $lastScore = int ($problem->status * 100) . "%"; 506 my $lastScore = sprintf("%.0f%%", $problem->status * 100); # Round to whole number
389 my ($attemptsLeft, $attemptsLeftNoun); 507 my ($attemptsLeft, $attemptsLeftNoun);
390 if ($problem->max_attempts == -1) { 508 if ($problem->max_attempts == -1) {
391 # unlimited attempts 509 # unlimited attempts
392 $attemptsLeft = "unlimited"; 510 $attemptsLeft = "unlimited";
393 $attemptsLeftNoun = "attempts"; 511 $attemptsLeftNoun = "attempts";
… …
412 $problem->attempted 530 $problem->attempted
413 ? "Your recorded score is $lastScore." . CGI::br() 531 ? "Your recorded score is $lastScore." . CGI::br()
414 : "", 532 : "",
415 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining." 533 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining."
416 ); 534 );
417
418 print
419 $self->viewOptions(),
420 CGI::endform();
421
422 print CGI::end_div(); 535 print CGI::end_div();
536# print CGI::hr(), CGI::start_div({class=>"viewOptions"});
537# print $self->viewOptions(),CGI::end_div(),
538# save state for viewOptions
539 print CGI::hidden(-name => "showOldAnswers",
540 -value => $will{showOldAnswers},
541 ),
542 CGI::hidden(-name => "showCorrectAnswers",
543 -value => $will{showCorrectAnswers},
544 ),
545 CGI::hidden(-name => "showHints",
546 -value => $will{showHints},
547 ),
548 CGI::hidden(-name => "showSolutions",
549 -value => $will{showSolutions},
550 ),
551 CGI::hidden(-name => "displayMode",
552 -value => $self->{displayMode}
553 );
554 print CGI::endform();
555
556 print CGI::start_div({class=>"problemFooter"});
423 # feedback form 557 # feedback form
424 my $ce = $self->{courseEnvironment}; 558 my $ce = $self->{ce};
425 my $root = $ce->{webworkURLs}->{root}; 559 my $root = $ce->{webworkURLs}->{root};
426 my $courseName = $ce->{courseName}; 560 my $courseName = $ce->{courseName};
427 my $feedbackURL = "$root/$courseName/feedback/"; 561 my $feedbackURL = "$root/$courseName/feedback/";
562
563 # arguments for answer inspection button
564 my $prof_url = $ce->{webworkURLs}->{oldProf};
565 my $cgi_url = $prof_url;
566 $cgi_url=~ s|/[^/]*$||; # clip profLogin.pl
567 my $authen_args = $self->url_authen_args();
568 my $showPastAnswersURL = "$cgi_url/showPastAnswers.pl";
569
570
571 print CGI::end_div();
572 print CGI::start_div();
573 # print answer inspection button
574 if ($self->{permissionLevel} >0) {
575
576
577 print "\n",
578 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
579 $self->hidden_authen_fields,"\n",
580 CGI::hidden(-name => 'course', -value=>$courseName), "\n",
581 CGI::hidden(-name => 'probNum', -value=>$problem->problem_id), "\n",
582 CGI::hidden(-name => 'setNum', -value=>$problem->set_id), "\n",
583 CGI::hidden(-name => 'User', -value=>$problem->user_id), "\n",
584 CGI::p( {-align=>"left"},
585 CGI::submit(-name => 'action', -value=>'Show Past Answers')
586 ), "\n",
587 CGI::endform();
588
589
590
591 } #print feedback form
592
593
428 print 594 print
429 CGI::startform("POST", $feedbackURL), 595 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
430 $self->hidden_authen_fields, 596 $self->hidden_authen_fields,"\n",
431 CGI::hidden("module", __PACKAGE__), 597 CGI::hidden("module", __PACKAGE__),"\n",
432 CGI::hidden("set", $set->id), 598 CGI::hidden("set", $set->set_id),"\n",
433 CGI::hidden("problem", $problem->id), 599 CGI::hidden("problem", $problem->problem_id),"\n",
434 CGI::hidden("displayMode", $self->{displayMode}), 600 CGI::hidden("displayMode", $self->{displayMode}),"\n",
435 CGI::hidden("showOldAnswers", $will{showOldAnswers}), 601 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
436 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}), 602 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
437 CGI::hidden("showHints", $will{showHints}), 603 CGI::hidden("showHints", $will{showHints}),"\n",
438 CGI::hidden("showSolutions", $will{showSolutions}), 604 CGI::hidden("showSolutions", $will{showSolutions}),"\n",
439 CGI::p({-align=>"right"}, 605 CGI::p({-align=>"left"},
440 CGI::submit(-name=>"feedbackForm", -label=>"Send Feedback") 606 CGI::submit(-name=>"feedbackForm", -label=>"Contact instructor")
441 ), 607 ),
442 CGI::endform(); 608 CGI::endform(),"\n";
609
610 # FIXME print editor link
611 # print editor link if the user is an instructor AND the file is not in temporary editing mode
612 if ($self->{permissionLevel}>=10 and ( (not defined($self->{edit_mode})) or $self->{edit_mode} eq 'savedFile') ) {
613 print CGI::a({-href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".$set->set_id.
614 '/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
615 }
443 616
617 print CGI::end_div();
618
619 # end answer inspection button
444 # warning output 620 # warning output
445 if ($pg->{warnings} ne "") { 621 if ($pg->{warnings} ne "") {
446 print CGI::hr(), $self->warningOutput($pg->{warnings}); 622 print CGI::hr(), $self->warningOutput($pg->{warnings});
447 } 623 }
448 624
… …
514 $row .= $answerMessage ? CGI::td($answerMessage) : ""; 690 $row .= $answerMessage ? CGI::td($answerMessage) : "";
515 push @tableRows, $row; 691 push @tableRows, $row;
516 } 692 }
517 693
518 my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions"; 694 my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
519 my $scorePercent = int ($problemResult->{score} * 100) . "\%"; 695 my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
520 my $summary = "On this attempt, you answered $numCorrect out of " 696 my $summary = "On this attempt, you answered $numCorrect out of "
521 . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent."; 697 . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
522 return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p($summary) : ""); 698 return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p($summary) : "");
523} 699}
524 700
… …
529 my %can = %{ $self->{can} }; 705 my %can = %{ $self->{can} };
530 my %will = %{ $self->{will} }; 706 my %will = %{ $self->{will} };
531 707
532 my $optionLine; 708 my $optionLine;
533 $can{showOldAnswers} and $optionLine .= join "", 709 $can{showOldAnswers} and $optionLine .= join "",
534 "Show: &nbsp;", 710 "Show: &nbsp;".CGI::br(),
535 CGI::checkbox( 711 CGI::checkbox(
536 -name => "showOldAnswers", 712 -name => "showOldAnswers",
537 -checked => $will{showOldAnswers}, 713 -checked => $will{showOldAnswers},
538 -label => "Saved answers", 714 -label => "Saved answers",
539 ), "&nbsp;&nbsp;"; 715 ), "&nbsp;&nbsp;".CGI::br();
540 $can{showCorrectAnswers} and $optionLine .= join "", 716 $can{showCorrectAnswers} and $optionLine .= join "",
541 CGI::checkbox( 717 CGI::checkbox(
542 -name => "showCorrectAnswers", 718 -name => "showCorrectAnswers",
543 -checked => $will{showCorrectAnswers}, 719 -checked => $will{showCorrectAnswers},
544 -label => "Correct answers", 720 -label => "Correct answers",
545 ), "&nbsp;&nbsp;"; 721 ), "&nbsp;&nbsp;".CGI::br();
546 $can{showHints} and $optionLine .= join "", 722 $can{showHints} and $optionLine .= join "",
547 CGI::checkbox( 723 CGI::checkbox(
548 -name => "showHints", 724 -name => "showHints",
549 -checked => $will{showHints}, 725 -checked => $will{showHints},
550 -label => "Hints", 726 -label => "Hints",
551 ), "&nbsp;&nbsp;"; 727 ), "&nbsp;&nbsp;".CGI::br();
552 $can{showSolutions} and $optionLine .= join "", 728 $can{showSolutions} and $optionLine .= join "",
553 CGI::checkbox( 729 CGI::checkbox(
554 -name => "showSolutions", 730 -name => "showSolutions",
555 -checked => $will{showSolutions}, 731 -checked => $will{showSolutions},
556 -label => "Solutions", 732 -label => "Solutions",
557 ), "&nbsp;&nbsp;"; 733 ), "&nbsp;&nbsp;".CGI::br();
558 $optionLine and $optionLine .= join "", CGI::br(); 734 $optionLine and $optionLine .= join "", CGI::br();
559 735
560 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex"}, 736 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex align: left"},
561 "View equations as: &nbsp;", 737 "View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;".CGI::br(),
562 CGI::radio_group( 738 CGI::radio_group(
563 -name => "displayMode", 739 -name => "displayMode",
564 -values => ['plainText', 'formattedText', 'images'], 740 -values => ['plainText', 'formattedText', 'images'],
565 -default => $displayMode, 741 -default => $displayMode,
742 -linebreak=>'true',
566 -labels => { 743 -labels => {
567 plainText => "plain text", 744 plainText => "plain",
568 formattedText => "formatted text", 745 formattedText => "formatted",
569 images => "images", 746 images => "images",
570 } 747 }
571 ), CGI::br(), 748 ), CGI::br(),CGI::hr(),
572 $optionLine, 749 $optionLine,
573 CGI::submit(-name=>"redisplay", -label=>"Redisplay Problem"), 750 CGI::submit(-name=>"redisplay", -label=>"Save Options"),
574 ); 751 );
575} 752}
576 753
577sub previewAnswer($$) { 754sub previewAnswer($$) {
578 my ($self, $answerResult) = @_; 755 my ($self, $answerResult) = @_;
579 my $ce = $self->{courseEnvironment}; 756 my $ce = $self->{ce};
580 my $effectiveUser = $self->{effectiveUser}; 757 my $effectiveUser = $self->{effectiveUser};
581 my $set = $self->{set}; 758 my $set = $self->{set};
582 my $problem = $self->{problem}; 759 my $problem = $self->{problem};
583 my $displayMode = $self->{displayMode}; 760 my $displayMode = $self->{displayMode};
584 761
… …
587 # so we'll just deal with each case explicitly here. there's some code 764 # so we'll just deal with each case explicitly here. there's some code
588 # duplication that can be dealt with later by abstracting out tth/dvipng/etc. 765 # duplication that can be dealt with later by abstracting out tth/dvipng/etc.
589 766
590 my $tex = $answerResult->{preview_latex_string}; 767 my $tex = $answerResult->{preview_latex_string};
591 768
592 return "" unless $tex; 769 return "" if $tex eq "";
593 770
594 if ($displayMode eq "plainText") { 771 if ($displayMode eq "plainText") {
595 return $tex; 772 return $tex;
596 } elsif ($displayMode eq "formattedText") { 773 } elsif ($displayMode eq "formattedText") {
597 my $tthCommand = $ce->{externalPrograms}->{tth} 774 my $tthCommand = $ce->{externalPrograms}->{tth}
… …
605 return "<b>[tth failed: $? $@]</b>"; 782 return "<b>[tth failed: $? $@]</b>";
606 } 783 }
607 return $result; 784 return $result;
608 } elsif ($displayMode eq "images") { 785 } elsif ($displayMode eq "images") {
609 # how are we going to name this? 786 # how are we going to name this?
610 my $targetPathCommon = "/png/" 787 my $targetPathCommon = "/m2i/"
611 . $effectiveUser->id . "." 788 . $effectiveUser->user_id . "."
612 . $set->id . "." 789 . $set->set_id . "."
613 . $problem->id . "." 790 . $problem->problem_id . "."
614 . $answerResult->{ans_name} . ".png"; 791 . $answerResult->{ans_name} . ".png";
615 792
616 # figure out where to put things 793 # figure out where to put things
617 my $wd = tempdir("webwork-dvipng-XXXXXXXX", DIR => $ce->{courseDirs}->{html_temp}); 794 my $wd = tempdir("webwork-dvipng-XXXXXXXX", DIR => $ce->{courseDirs}->{html_temp});
618 my $latex = $ce->{externalPrograms}->{latex}; 795 my $latex = $ce->{externalPrograms}->{latex};
… …
621 # should use surePathToTmpFile, but we have to 798 # should use surePathToTmpFile, but we have to
622 # isolate it from the problem enivronment first 799 # isolate it from the problem enivronment first
623 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon; 800 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
624 801
625 # call dvipng to generate a preview 802 # call dvipng to generate a preview
626 warn $tex;
627 dvipng($wd, $latex, $dvipng, $tex, $targetPath); 803 dvipng($wd, $latex, $dvipng, $tex, $targetPath);
804 rmtree($wd, 0, 0);
628 if (-e $targetPath) { 805 if (-e $targetPath) {
629 return "<img src=\"$targetURL\" alt=\"$tex\" />"; 806 return "<img src=\"$targetURL\" alt=\"$tex\" />";
630 } else { 807 } else {
631 return "<b>[math2img failed]</b>"; 808 return "<b>[math2img failed]</b>";
632 } 809 }
633 } 810 }
634} 811}
812
813sub options {
814 my $self=shift;
815 my $out;
816 $out .=join("",
817 CGI::start_form("POST", $self->{r}->uri),
818 $self->hidden_authen_fields,
819 CGI::hr(),
820 CGI::start_div({class=>"viewOptions"}),
821 $self->viewOptions(),CGI::end_div(),
822 CGI::end_form()
823 );
824return $out;
825
826}
827##### logging subroutine ####
828
829
635 830
636##### permission queries ##### 831##### permission queries #####
637 832
638# this stuff should be abstracted out into the permissions system 833# this stuff should be abstracted out into the permissions system
639# however, the permission system only knows about things in the 834# however, the permission system only knows about things in the
Legend:
Removed from v.756  
changed lines
  Added in v.1096
aubreyja at gmail dot com
 ViewVC Help
Powered by ViewVC 1.0.9