[system] / branches / rel-2-1-a1 / webwork-modperl / lib / WeBWorK / ContentGenerator / Problem.pm Repository:
ViewVC logotype

Diff of /branches/rel-2-1-a1/webwork-modperl/lib/WeBWorK/ContentGenerator/Problem.pm

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

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