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