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