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