[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 558 Revision 818
… …
2# WeBWorK mod_perl (c) 2000-2002 WeBWorK Project 2# WeBWorK mod_perl (c) 2000-2002 WeBWorK Project
3# $Id$ 3# $Id$
4################################################################################ 4################################################################################
5 5
6package WeBWorK::ContentGenerator::Problem; 6package WeBWorK::ContentGenerator::Problem;
7use base qw(WeBWorK::ContentGenerator);
7 8
8=head1 NAME 9=head1 NAME
9 10
10WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem. 11WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem.
11 12
12=cut 13=cut
13 14
14use strict; 15use strict;
15use warnings; 16use warnings;
16use base qw(WeBWorK::ContentGenerator);
17use CGI qw(); 17use CGI qw();
18use File::Temp qw(tempdir);
18use WeBWorK::Form; 19use WeBWorK::Form;
19use WeBWorK::PG; 20use WeBWorK::PG;
21use WeBWorK::PG::IO;
20use WeBWorK::Utils qw(ref2string encodeAnswers decodeAnswers); 22use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string);
21 23
22############################################################ 24############################################################
23# 25#
24# user 26# user
27# effectiveUser
25# key 28# key
26# 29#
27# displayMode 30# displayMode
28# showOldAnswers 31# showOldAnswers
29# showCorrectAnswers 32# showCorrectAnswers
… …
32# 35#
33# AnSwEr# - answer blanks in problem 36# AnSwEr# - answer blanks in problem
34# 37#
35# redisplay - name of the "Redisplay Problem" button 38# redisplay - name of the "Redisplay Problem" button
36# submitAnswers - name of "Submit Answers" button 39# submitAnswers - name of "Submit Answers" button
40# checkAnswers - name of the "Check Answers" button
41# previewAnswers - name of the "Preview Answers" button
37# 42#
38############################################################ 43############################################################
39 44
40sub pre_header_initialize { 45sub pre_header_initialize {
41 my ($self, $setName, $problemNumber) = @_; 46 my ($self, $setName, $problemNumber) = @_;
42 my $courseEnv = $self->{courseEnvironment};
43 my $r = $self->{r}; 47 my $r = $self->{r};
48 my $courseEnv = $self->{ce};
49 my $db = $self->{db};
44 my $userName = $r->param('user'); 50 my $userName = $r->param('user');
51 my $effectiveUserName = $r->param('effectiveUser');
45 52
46 ##### database setup #####
47
48 my $cldb = WeBWorK::DB::Classlist->new($courseEnv);
49 my $wwdb = WeBWorK::DB::WW->new($courseEnv);
50 my $authdb = WeBWorK::DB::Auth->new($courseEnv);
51
52 my $user = $cldb->getUser($userName); 53 my $user = $db->getUser($userName);
54 my $effectiveUser = $db->getUser($effectiveUserName);
53 my $set = $wwdb->getSet($userName, $setName); 55 my $set = $db->getGlobalUserSet($effectiveUserName, $setName);
54 my $problem = $wwdb->getProblem($userName, $setName, $problemNumber); 56 my $problem = $db->getGlobalUserProblem($effectiveUserName, $setName, $problemNumber);
55 my $psvn = $wwdb->getPSVN($userName, $setName); 57 my $psvn = $set->psvn();
56 my $permissionLevel = $authdb->getPermissions($userName); 58 my $permissionLevel = $db->getPermissionLevel($userName)->permission();
59
60 $self->{userName} = $userName;
61 $self->{user} = $user;
62 $self->{effectiveUser} = $effectiveUser;
63 $self->{set} = $set;
64 $self->{problem} = $problem;
65 $self->{permissionLevel} = $permissionLevel;
57 66
58 ##### form processing ##### 67 ##### form processing #####
59 68
60 # set options from form fields (see comment at top of file for names) 69 # set options from form fields (see comment at top of file for names)
61 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode}; 70 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode};
62 my $redisplay = $r->param("redisplay"); 71 my $redisplay = $r->param("redisplay");
63 my $submitAnswers = $r->param("submitAnswers"); 72 my $submitAnswers = $r->param("submitAnswers");
73 my $checkAnswers = $r->param("checkAnswers");
74 my $previewAnswers = $r->param("previewAnswers");
64 75
65 # coerce form fields into CGI::Vars format 76 # coerce form fields into CGI::Vars format
66 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars }; 77 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
67 78
79 $self->{displayMode} = $displayMode;
80 $self->{redisplay} = $redisplay;
81 $self->{submitAnswers} = $submitAnswers;
82 $self->{checkAnswers} = $checkAnswers;
83 $self->{previewAnswers} = $previewAnswers;
84 $self->{formFields} = $formFields;
85
68 ##### permissions ##### 86 ##### permissions #####
87
88 # are we allowed to view this problem?
89 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
90 return unless $self->{isOpen};
69 91
70 # what does the user want to do? 92 # what does the user want to do?
71 my %want = ( 93 my %want = (
72 showOldAnswers => $r->param("showOldAnswers") || $courseEnv->{pg}->{options}->{showOldAnswers}, 94 showOldAnswers => $r->param("showOldAnswers") || $courseEnv->{pg}->{options}->{showOldAnswers},
73 showCorrectAnswers => $r->param("showCorrectAnswers") || $courseEnv->{pg}->{options}->{showCorrectAnswers}, 95 showCorrectAnswers => $r->param("showCorrectAnswers") || $courseEnv->{pg}->{options}->{showCorrectAnswers},
74 showHints => $r->param("showHints") || $courseEnv->{pg}->{options}->{showHints}, 96 showHints => $r->param("showHints") || $courseEnv->{pg}->{options}->{showHints},
75 showSolutions => $r->param("showSolutions") || $courseEnv->{pg}->{options}->{showSolutions}, 97 showSolutions => $r->param("showSolutions") || $courseEnv->{pg}->{options}->{showSolutions},
76 recordAnswers => $r->param("recordAnswers") || 1, 98 recordAnswers => $submitAnswers,
99 checkAnswers => $checkAnswers,
77 ); 100 );
78 101
79 # are certain options enforced? 102 # are certain options enforced?
80 my %must = ( 103 my %must = (
81 showOldAnswers => 0, 104 showOldAnswers => 0,
82 showCorrectAnswers => 0, 105 showCorrectAnswers => 0,
83 showHints => 0, 106 showHints => 0,
84 showSolutions => 0, 107 showSolutions => 0,
85 recordAnswers => mustRecordAnswers($permissionLevel), 108 recordAnswers => mustRecordAnswers($permissionLevel),
109 checkAnswers => 0,
86 ); 110 );
87 111
88 # does the user have permission to use certain options? 112 # does the user have permission to use certain options?
89 my %can = ( 113 my %can = (
90 showOldAnswers => 1, 114 showOldAnswers => 1,
91 showCorrectAnswers => canShowCorrectAnswers($permissionLevel, $set->answer_date), 115 showCorrectAnswers => canShowCorrectAnswers($permissionLevel, $set->answer_date),
92 showHints => 1, 116 showHints => 1,
93 showSolutions => canShowSolutions($permissionLevel, $set->answer_date), 117 showSolutions => canShowSolutions($permissionLevel, $set->answer_date),
94 recordAnswers => canRecordAnswers($permissionLevel, $set->open_date, $set->due_date, 118 recordAnswers => canRecordAnswers($permissionLevel, $set->open_date, $set->due_date,
95 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1), 119 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1),
96 # num_correct+num_incorrect+1 -- as this happens before updating $problem 120 # attempts=num_correct+num_incorrect+1, as this happens before updating $problem
121 checkAnswers => canCheckAnswers($permissionLevel, $set->answer_date),
97 ); 122 );
98 123
99 # final values for options 124 # final values for options
100 my %will; 125 my %will;
101 foreach(keys %must) { 126 foreach (keys %must) {
102 $will{$_} = $can{$_} && ($want{$_} || $must{$_}); 127 $will{$_} = $can{$_} && ($want{$_} || $must{$_});
103 } 128 }
104 129
105 ##### sticky answers ##### 130 ##### sticky answers #####
106 131
… …
112 137
113 ##### translation ##### 138 ##### translation #####
114 139
115 my $pg = WeBWorK::PG->new( 140 my $pg = WeBWorK::PG->new(
116 $courseEnv, 141 $courseEnv,
117 $user, 142 $effectiveUser,
118 $r->param('key'), 143 $r->param('key'),
119 $set, 144 $set,
120 $problem, 145 $problem,
121 $psvn, 146 $psvn,
122 $formFields, 147 $formFields,
123 { # translation options 148 { # translation options
124 displayMode => $displayMode, 149 displayMode => $displayMode,
125 showHints => $will{showHints}, 150 showHints => $will{showHints},
126 showSolutions => $will{showSolutions}, 151 showSolutions => $will{showSolutions},
127 refreshMath2img => $will{showHints} || $will{showSolutions}, 152 refreshMath2img => $will{showHints} || $will{showSolutions},
128 # try leaving processAnswers on all the time? 153 processAnswers => 1,
129 processAnswers => 1, #$submitAnswers ? 1 : 0,
130 }, 154 },
131 ); 155 );
132 156
157 ##### fix hint/solution options #####
158
159 $can{showHints} &&= $pg->{flags}->{hintExists};
160 $can{showSolutions} &&= $pg->{flags}->{solutionExists};
161
133 ##### store fields ##### 162 ##### store fields #####
134
135 $self->{cldb} = $cldb;
136 $self->{wwdb} = $wwdb;
137 $self->{authdb} = $authdb;
138
139 $self->{user} = $user;
140 $self->{set} = $set;
141 $self->{problem} = $problem;
142 $self->{permissionLevel} = $permissionLevel;
143
144 $self->{displayMode} = $displayMode;
145 $self->{redisplay} = $redisplay;
146 $self->{submitAnswers} = $submitAnswers;
147 $self->{formFields} = $formFields;
148 163
149 $self->{want} = \%want; 164 $self->{want} = \%want;
150 $self->{must} = \%must; 165 $self->{must} = \%must;
151 $self->{can} = \%can; 166 $self->{can} = \%can;
152 $self->{will} = \%will; 167 $self->{will} = \%will;
… …
154 $self->{pg} = $pg; 169 $self->{pg} = $pg;
155} 170}
156 171
157sub if_warnings($$) { 172sub if_warnings($$) {
158 my ($self, $arg) = @_; 173 my ($self, $arg) = @_;
174 return 0 unless $self->{isOpen};
159 return $self->{pg}->{warnings} ne ""; 175 return $self->{pg}->{warnings} ne "";
160} 176}
161 177
162sub if_errors($$) { 178sub if_errors($$) {
163 my ($self, $arg) = @_; 179 my ($self, $arg) = @_;
180 return 0 unless $self->{isOpen};
164 return $self->{pg}->{flags}->{error_flag}; 181 return $self->{pg}->{flags}->{error_flag};
165} 182}
166 183
167sub header { 184sub head {
168 my $self = shift; 185 my $self = shift;
169 186 return "" unless $self->{isOpen};
170 return $self->{pg}->{head_text} if $self->{pg}->{head_text}; 187 return $self->{pg}->{head_text} if $self->{pg}->{head_text};
171} 188}
172 189
173sub path { 190sub path {
174 my $self = shift; 191 my $self = shift;
175 my $args = $_[-1]; 192 my $args = $_[-1];
176 my $setName = $self->{set}->id; 193 my $setName = $self->{set}->set_id;
177 my $problemNumber = $self->{problem}->id; 194 my $problemNumber = $self->{problem}->problem_id;
178 195
179 my $ce = $self->{courseEnvironment}; 196 my $ce = $self->{ce};
180 my $root = $ce->{webworkURLs}->{root}; 197 my $root = $ce->{webworkURLs}->{root};
181 my $courseName = $ce->{courseName}; 198 my $courseName = $ce->{courseName};
182 return $self->pathMacro($args, 199 return $self->pathMacro($args,
183 "Home" => "$root", 200 "Home" => "$root",
184 $courseName => "$root/$courseName", 201 $courseName => "$root/$courseName",
… …
187 ); 204 );
188} 205}
189 206
190sub siblings { 207sub siblings {
191 my $self = shift; 208 my $self = shift;
192 my $setName = $self->{set}->id; 209 my $setName = $self->{set}->set_id;
193 my $problemNumber = $self->{problem}->id; 210 my $problemNumber = $self->{problem}->problem_id;
194 211
195 my $ce = $self->{courseEnvironment}; 212 my $ce = $self->{ce};
213 my $db = $self->{db};
196 my $root = $ce->{webworkURLs}->{root}; 214 my $root = $ce->{webworkURLs}->{root};
197 my $courseName = $ce->{courseName}; 215 my $courseName = $ce->{courseName};
198 216
199 print CGI::strong("Problems"), CGI::br(); 217 print CGI::strong("Problems"), CGI::br();
200 218
201 my $wwdb = $self->{wwdb};
202 my $user = $self->{r}->param("user"); 219 my $effectiveUser = $self->{r}->param("effectiveUser");
203 my @problems; 220 my @problems;
204 push @problems, $wwdb->getProblem($user, $setName, $_) 221 push @problems, $db->getGlobalUserProblem($effectiveUser, $setName, $_)
205 foreach ($wwdb->getProblems($user, $setName)); 222 foreach ($db->listUserProblems($effectiveUser, $setName));
206 foreach my $problem (sort { $a->id <=> $b->id } @problems) { 223 foreach my $problem (sort { $a->problem_id <=> $b->problem_id } @problems) {
207 print CGI::a({-href=>"$root/$courseName/$setName/".$problem->id."/?" 224 print CGI::a({-href=>"$root/$courseName/$setName/".$problem->problem_id."/?"
208 . $self->url_authen_args}, "Problem ".$problem->id), CGI::br(); 225 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}},
226 "Problem ".$problem->problem_id), CGI::br();
209 } 227 }
210} 228}
211 229
212sub nav { 230sub nav {
213 my $self = shift; 231 my $self = shift;
214 my $args = $_[-1]; 232 my $args = $_[-1];
215 my $setName = $self->{set}->id; 233 my $setName = $self->{set}->set_id;
216 my $problemNumber = $self->{problem}->id; 234 my $problemNumber = $self->{problem}->problem_id;
217 235
218 my $ce = $self->{courseEnvironment}; 236 my $ce = $self->{ce};
237 my $db = $self->{db};
219 my $root = $ce->{webworkURLs}->{root}; 238 my $root = $ce->{webworkURLs}->{root};
220 my $courseName = $ce->{courseName}; 239 my $courseName = $ce->{courseName};
221 240
222 my $wwdb = $self->{wwdb}; 241 my $wwdb = $self->{wwdb};
223 my $user = $self->{r}->param("user"); 242 my $effectiveUser = $self->{r}->param("effectiveUser");
243 my $tail = "&displayMode=".$self->{displayMode};
224 244
225 my @links = ("Problem List" => "$root/$courseName/$setName"); 245 my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList");
226 246
227 my $prevProblem = $wwdb->getProblem($user, $setName, $problemNumber-1); 247 my $prevProblem = $db->getGlobalUserProblem($effectiveUser, $setName, $problemNumber-1);
228 my $nextProblem = $wwdb->getProblem($user, $setName, $problemNumber+1); 248 my $nextProblem = $db->getGlobalUserProblem($effectiveUser, $setName, $problemNumber+1);
229 unshift @links, "Previous Problem" => $prevProblem 249 unshift @links, "Previous Problem" , ($prevProblem
230 ? "$root/$courseName/$setName/".$prevProblem->id 250 ? "$root/$courseName/$setName/".$prevProblem->problem_id
231 : ""; 251 : "") , "navPrev";
232 push @links, "Next Problem" => $nextProblem 252 push @links, "Next Problem" , ($nextProblem
233 ? "$root/$courseName/$setName/".$nextProblem->id 253 ? "$root/$courseName/$setName/".$nextProblem->problem_id
234 : ""; 254 : "") , "navNext";
235 255
236 return $self->navMacro($args, @links); 256 return $self->navMacro($args, $tail, @links);
237} 257}
238 258
239sub title { 259sub title {
240 my $self = shift; 260 my $self = shift;
241 my $setName = $self->{set}->id; 261 my $setName = $self->{set}->set_id;
242 my $problemNumber = $self->{problem}->id; 262 my $problemNumber = $self->{problem}->problem_id;
243 263
244 return "$setName : Problem $problemNumber"; 264 return "$setName : Problem $problemNumber";
245} 265}
246 266
247sub body { 267sub body {
248 my $self = shift; 268 my $self = shift;
249 269
250 #$self->prepare(@_); 270 return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the problem set that contains it is not yet open."))
271 unless $self->{isOpen};
251 272
252 # unpack some useful variables 273 # unpack some useful variables
253 my $r = $self->{r}; 274 my $r = $self->{r};
254 my $wwdb = $self->{wwdb}; 275 my $db = $self->{db};
255 my $set = $self->{set}; 276 my $set = $self->{set};
256 my $problem = $self->{problem}; 277 my $problem = $self->{problem};
257 my $permissionLevel = $self->{permissionLevel}; 278 my $permissionLevel = $self->{permissionLevel};
258 my $submitAnswers = $self->{submitAnswers}; 279 my $submitAnswers = $self->{submitAnswers};
280 my $checkAnswers = $self->{checkAnswers};
281 my $previewAnswers = $self->{previewAnswers};
282 my %want = %{ $self->{want} };
283 my %can = %{ $self->{can} };
284 my %must = %{ $self->{must} };
259 my %will = %{ $self->{will} }; 285 my %will = %{ $self->{will} };
260 my $pg = $self->{pg}; 286 my $pg = $self->{pg};
261 287
262 ##### translation errors? ##### 288 ##### translation errors? #####
263 289
264 if ($pg->{flags}->{error_flag}) { 290 if ($pg->{flags}->{error_flag}) {
265 return translationError($pg->{errors}, $pg->{body_text}); 291 return $self->errorOutput($pg->{errors}, $pg->{body_text});
266 } 292 }
267 293
268 ##### answer processing ##### 294 ##### answer processing #####
269 295
270 # if answers were submitted: 296 # if answers were submitted:
271 if ($submitAnswers) { 297 if ($submitAnswers) {
298 # get a "pure" (unmerged) UserProblem to modify
299 my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id);
272 # store answers in DB for sticky answers 300 # store answers in DB for sticky answers
273 my %answersToStore; 301 my %answersToStore;
274 my %answerHash = %{ $pg->{answers} }; 302 my %answerHash = %{ $pg->{answers} };
275 $answersToStore{$_} = $answerHash{$_}->{original_student_ans} 303 $answersToStore{$_} = $answerHash{$_}->{original_student_ans}
276 foreach (keys %answerHash); 304 foreach (keys %answerHash);
277 my $answerString = encodeAnswers(%answersToStore, 305 my $answerString = encodeAnswers(%answersToStore,
278 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }); 306 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} });
307 $pureProblem->last_answer($answerString);
279 $problem->last_answer($answerString); 308 $problem->last_answer($answerString);
280 $wwdb->setProblem($problem); 309 $db->putUserProblem($pureProblem);
281 310
282 # store state in DB if it makes sense 311 # store state in DB if it makes sense
283 if ($will{recordAnswers}) { 312 if ($will{recordAnswers}) {
313 $problem->status($pg->{state}->{recorded_score});
284 $problem->attempted(1); 314 $problem->attempted(1);
285 $problem->status($pg->{state}->{recorded_score});
286 $problem->num_correct($pg->{state}->{num_of_correct_ans}); 315 $problem->num_correct($pg->{state}->{num_of_correct_ans});
287 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans}); 316 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
317 $pureProblem->status($pg->{state}->{recorded_score});
318 $pureProblem->attempted(1);
319 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
320 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
288 $wwdb->setProblem($problem); 321 $db->putUserProblem($pureProblem);
322 # write to the transaction log, just to make sure
323 writeLog($self->{ce}, "transaction",
324 $problem->problem_id."\t".
325 $problem->set_id."\t".
326 $problem->user_id."\t".
327 $problem->source_file."\t".
328 $problem->value."\t".
329 $problem->max_attempts."\t".
330 $problem->problem_seed."\t".
331 $pureProblem->status."\t".
332 $pureProblem->attempted."\t".
333 $pureProblem->last_answer."\t".
334 $pureProblem->num_correct."\t".
335 $pureProblem->num_incorrect
336 );
289 } 337 }
290 } 338 }
339 # logging student answers
340 my $pastAnswerLog = undef;
341 if (defined( $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'} )) {
342
343 $pastAnswerLog = $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'};
344
345 if ($submitAnswers and defined($pastAnswerLog) ) {
346 my $answerString = "";
347 my %answerHash = %{ $pg->{answers} };
348 $answerString = $answerString . $answerHash{$_}->{original_student_ans}."\t"
349 foreach (sort keys %answerHash);
350 writeLog($self->{ce}, "pastAnswerList",
351 '|'.$problem->user_id.
352 '|'.$problem->set_id.
353 '|'.$problem->problem_id.'|'."\t".
354 time()."\t".
355 $answerString,
356
357 );
358
359 }
360
361 }
362 # end logging student answers
291 363
292 ##### output ##### 364 ##### output #####
293 365 print CGI::start_div({class=>"problemHeader"});
294 # attempt summary 366 # attempt summary
295 if ($submitAnswers or $will{showCorrectAnswers}) { 367 if ($submitAnswers or $will{showCorrectAnswers}) {
296 # print this if user submitted answers OR requested correct answers 368 # print this if user submitted answers OR requested correct answers
297 print attemptResults($pg, $submitAnswers, $will{showCorrectAnswers}, 369 print $self->attemptResults($pg, $submitAnswers,
370 $will{showCorrectAnswers},
298 $pg->{flags}->{showPartialCorrectAnswers}); 371 $pg->{flags}->{showPartialCorrectAnswers}, 1, 0);
372 } elsif ($checkAnswers) {
373 # print this if user previewed answers
374 print $self->attemptResults($pg, 1, 0, 1, 1, 0);
375 # show attempt answers
376 # don't show correct answers
377 # show attempt results (correctness)
378 # don't show attempt previews
379 } elsif ($previewAnswers) {
380 # print this if user previewed answers
381 print $self->attemptResults($pg, 1, 0, 0, 0, 1);
382 # show attempt answers
383 # don't show correct answers
384 # don't show attempt results (correctness)
385 # show attempt previews
299 } 386 }
300 387
388 print CGI::end_div();
389
390 print CGI::start_div({class=>"problem"});
391 #print CGI::hr();
392 # main form
393 print
394 CGI::startform("POST", $r->uri),
395 $self->hidden_authen_fields,
396 CGI::p($pg->{body_text}),
397 CGI::p($pg->{result}->{msg} ? CGI::b("Note: ") : "", CGI::i($pg->{result}->{msg})),
398 CGI::p(
399 ($can{recordAnswers}
400 ? CGI::submit(-name=>"submitAnswers",
401 -label=>"Submit Answers")
402 : ""),
403 ($can{checkAnswers}
404 ? CGI::submit(-name=>"checkAnswers",
405 -label=>"Check Answers")
406 : ""),
407 CGI::submit(-name=>"previewAnswers",
408 -label=>"Preview Answers"),
409 );
410 print CGI::end_div();
411
412 print CGI::start_div({class=>"scoreSummary"});
301 # score summary 413 # score summary
302 my $attempts = $problem->num_correct + $problem->num_incorrect; 414 my $attempts = $problem->num_correct + $problem->num_incorrect;
303 my $attemptsNoun = $attempts != 1 ? "times" : "time"; 415 my $attemptsNoun = $attempts != 1 ? "times" : "time";
304 my $lastScore = int ($problem->status * 100) . "%"; 416 my $lastScore = int ($problem->status * 100) . "%";
305 my ($attemptsLeft, $attemptsLeftNoun); 417 my ($attemptsLeft, $attemptsLeftNoun);
… …
309 $attemptsLeftNoun = "attempts"; 421 $attemptsLeftNoun = "attempts";
310 } else { 422 } else {
311 $attemptsLeft = $problem->max_attempts - $attempts; 423 $attemptsLeft = $problem->max_attempts - $attempts;
312 $attemptsLeftNoun = $attemptsLeft == 1 ? "attempt" : "attempts"; 424 $attemptsLeftNoun = $attemptsLeft == 1 ? "attempt" : "attempts";
313 } 425 }
426
427 my $setClosed = 0;
314 my $setClosedMessage; 428 my $setClosedMessage;
315 if (time < $set->open_date or time > $set->due_date) { 429 if (time < $set->open_date or time > $set->due_date) {
430 $setClosed = 1;
316 $setClosedMessage = "This problem set is closed."; 431 $setClosedMessage = "This problem set is closed.";
317 if ($permissionLevel > 0) { 432 if ($permissionLevel > 0) {
318 $setClosedMessage .= " Since you are a privileged user, additional attempts will be recorded."; 433 $setClosedMessage .= " Since you are a privileged user, additional attempts will be recorded.";
319 } else { 434 } else {
320 $setClosedMessage .= " Additional attempts will not be recorded."; 435 $setClosedMessage .= " Additional attempts will not be recorded.";
… …
323 print CGI::p( 438 print CGI::p(
324 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(), 439 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(),
325 $problem->attempted 440 $problem->attempted
326 ? "Your recorded score is $lastScore." . CGI::br() 441 ? "Your recorded score is $lastScore." . CGI::br()
327 : "", 442 : "",
328 "You have $attemptsLeft $attemptsLeftNoun remaining.", CGI::br(), 443 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining."
329 $setClosedMessage,
330 ); 444 );
331
332 # BY THE WAY..........
333 # we have to figure out some way to tell the student if their NEW answer,
334 # on THIS attempt, has been recorded. however, this is decided in part by
335 # the grader, so is there any way for us to know? we can rule out several
336 # cases where the answer is NOT being recorded, because of things decided
337 # in &canRecordAnswers...
338
339 print CGI::hr(); 445 print CGI::end_div();
340 446 print CGI::hr(), CGI::start_div({class=>"viewOptions"});
341 # main form
342 print 447 print
343 CGI::startform("POST", $r->uri), 448 $self->viewOptions(),CGI::end_div(),
344 $self->hidden_authen_fields,
345 $self->viewOptions,
346 CGI::p(CGI::i($pg->{result}->{msg})),
347 CGI::p($pg->{body_text}),
348 CGI::p(CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers")),
349 CGI::endform(); 449 CGI::endform();
450
451 print CGI::start_div({class=>"problemFooter"});
452 # feedback form
453 my $ce = $self->{ce};
454 my $root = $ce->{webworkURLs}->{root};
455 my $courseName = $ce->{courseName};
456 my $feedbackURL = "$root/$courseName/feedback/";
350 457
458 # arguments for answer inspection button
459 my $prof_url = $ce->{webworkURLs}->{oldProf};
460 my $cgi_url = $prof_url;
461 $cgi_url=~ s|/[^/]*$||; # clip profLogin.pl
462 my $authen_args = $self->url_authen_args();
463 my $showPastAnswersURL = "$cgi_url/showPastAnswers.pl";
464
465 #print feedback form
466 print
467 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
468 $self->hidden_authen_fields,"\n",
469 CGI::hidden("module", __PACKAGE__),"\n",
470 CGI::hidden("set", $set->set_id),"\n",
471 CGI::hidden("problem", $problem->problem_id),"\n",
472 CGI::hidden("displayMode", $self->{displayMode}),"\n",
473 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
474 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
475 CGI::hidden("showHints", $will{showHints}),"\n",
476 CGI::hidden("showSolutions", $will{showSolutions}),"\n",
477 CGI::p({-align=>"right"},
478 CGI::submit(-name=>"feedbackForm", -label=>"Send Feedback")
479 ),
480 CGI::endform(),"\n";
481 # print answer inspection button
482 if ($self->{permissionLevel} >0) {
483
484
485 print "\n",
486 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
487 $self->hidden_authen_fields,"\n",
488 CGI::hidden(-name => 'course', -value=>$courseName), "\n",
489 CGI::hidden(-name => 'probNum', -value=>$problem->problem_id), "\n",
490 CGI::hidden(-name => 'setNum', -value=>$problem->set_id), "\n",
491 CGI::hidden(-name => 'User', -value=>$problem->user_id), "\n",
492 CGI::submit(-name => 'action', -value=>'Show Past Answers'), "\n",
493 CGI::endform();
494
495
496
497 }
498 print CGI::end_div();
499 # end answer inspection button
351 # warning output 500 # warning output
352 if ($pg->{warnings} ne "") { 501 if ($pg->{warnings} ne "") {
353 print CGI::hr(), warningOutput($pg->{warnings}); 502 print CGI::hr(), $self->warningOutput($pg->{warnings});
354 } 503 }
355 504
356 # debugging stuff 505 # debugging stuff
506 if (0) {
357 #print 507 print
358 # hr(), 508 CGI::hr(),
359 # h2("debugging information"), 509 CGI::h2("debugging information"),
360 # h3("form fields"), 510 CGI::h3("form fields"),
361 # ref2string($formFields), 511 ref2string($self->{formFields}),
362 # h3("user object"), 512 CGI::h3("user object"),
363 # ref2string($user), 513 ref2string($self->{user}),
364 # h3("set object"), 514 CGI::h3("set object"),
365 # ref2string($set), 515 ref2string($set),
366 # h3("problem object"), 516 CGI::h3("problem object"),
367 # ref2string($problem), 517 ref2string($problem),
368 # h3("PG object"), 518 CGI::h3("PG object"),
369 # ref2string($pg, {'WeBWorK::PG::Translator' => 1}); 519 ref2string($pg, {'WeBWorK::PG::Translator' => 1});
520 }
370 521
371 return ""; 522 return "";
372} 523}
373 524
374##### output utilities ##### 525##### output utilities #####
375 526
376# this is used by ProblemSet.pm too, so don't fuck it up
377sub translationError($$) {
378 my ($error, $details) = @_;
379 return
380 CGI::h2("Software Error"),
381 CGI::p(<<EOF),
382WeBWorK has encountered a software error while attempting to process this problem.
383It is likely that there is an error in the problem itself.
384If you are a student, contact your professor to have the error corrected.
385If you are a professor, please consut the error output below for more informaiton.
386EOF
387 CGI::h3("Error messages"), CGI::blockquote(CGI::pre($error)),
388 CGI::h3("Error context"), CGI::blockquote(CGI::pre($details));
389}
390
391# this is used by ProblemSet.pm too, so don't fuck it up
392sub warningOutput($) {
393 my $warnings = shift;
394
395 return
396 CGI::h2("Software Warnings"),
397 CGI::p(<<EOF),
398WeBWorK has encountered warnings while attempting to process this problem.
399It is likely that this indicates an error or ambiguity in the problem itself.
400If you are a student, contact your professor to have the problem corrected.
401If you are a professor, please consut the error output below for more informaiton.
402EOF
403 CGI::h3("Warning messages"),
404 CGI::blockquote(CGI::pre($warnings)),
405 ;
406}
407
408sub attemptResults($$$) { 527sub attemptResults($$$$$$) {
528 my $self = shift;
409 my $pg = shift; 529 my $pg = shift;
410 my $showAttemptAnswers = shift; 530 my $showAttemptAnswers = shift;
411 my $showCorrectAnswers = shift; 531 my $showCorrectAnswers = shift;
412 my $showAttemptResults = $showAttemptAnswers && shift; 532 my $showAttemptResults = $showAttemptAnswers && shift;
533 my $showSummary = shift;
534 my $showAttemptPreview = shift || 0;
413 my $problemResult = $pg->{result}; # the overall result of the problem 535 my $problemResult = $pg->{result}; # the overall result of the problem
414 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }; 536 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
415 537
538 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
539
416 my $header = CGI::th("answer"); 540 my $header = CGI::th("Part");
417 $header .= $showAttemptAnswers ? CGI::th("attempt") : ""; 541 $header .= $showAttemptAnswers ? CGI::th("Entered") : "";
542 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : "";
418 $header .= $showCorrectAnswers ? CGI::th("correct") : ""; 543 $header .= $showCorrectAnswers ? CGI::th("Correct") : "";
419 $header .= $showAttemptResults ? CGI::th("result") : ""; 544 $header .= $showAttemptResults ? CGI::th("Result") : "";
420 $header .= $showAttemptAnswers ? CGI::th("messages") : ""; 545 $header .= $showMessages ? CGI::th("messages") : "";
421 my @tableRows = ( $header ); 546 my @tableRows = ( $header );
422 my $numCorrect; 547 my $numCorrect;
423 foreach my $name (@answerNames) { 548 foreach my $name (@answerNames) {
424 my $answerResult = $pg->{answers}->{$name}; 549 my $answerResult = $pg->{answers}->{$name};
425 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans 550 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
551 my $preview = ($showAttemptPreview
552 ? $self->previewAnswer($answerResult)
553 : "");
426 my $correctAnswer = $answerResult->{correct_ans}; 554 my $correctAnswer = $answerResult->{correct_ans};
427 my $answerScore = $answerResult->{score}; 555 my $answerScore = $answerResult->{score};
428 my $answerMessage = $showAttemptAnswers ? $answerResult->{ans_message} : ""; 556 my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
429 557
430 $numCorrect += $answerScore > 0; 558 $numCorrect += $answerScore > 0;
431 my $resultString = $answerScore ? "correct" : "incorrect"; 559 my $resultString = $answerScore ? "correct" : "incorrect";
432 560
433 # get rid of the goofy prefix on the answer names (supposedly, the format 561 # get rid of the goofy prefix on the answer names (supposedly, the format
434 # of the answer names is changeable. this only fixes 562 # of the answer names is changeable. this only fixes it for "AnSwEr"
435 $name =~ s/^AnSwEr//; 563 $name =~ s/^AnSwEr//;
436 564
437 my $row = CGI::td($name); 565 my $row = CGI::td($name);
438 $row .= $showAttemptAnswers ? CGI::td($studentAnswer) : ""; 566 $row .= $showAttemptAnswers ? CGI::td($studentAnswer) : "";
567 $row .= $showAttemptPreview ? CGI::td($preview) : "";
439 $row .= $showCorrectAnswers ? CGI::td($correctAnswer) : ""; 568 $row .= $showCorrectAnswers ? CGI::td($correctAnswer) : "";
440 $row .= $showAttemptResults ? CGI::td($resultString) : ""; 569 $row .= $showAttemptResults ? CGI::td($resultString) : "";
441 $row .= $answerMessage ? CGI::td($answerMessage) : ""; 570 $row .= $answerMessage ? CGI::td($answerMessage) : "";
442 push @tableRows, $row; 571 push @tableRows, $row;
443 } 572 }
444 573
445 my $numCorrectNoun = $numCorrect == 1 ? "question" : "questions"; 574 my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
446 my $scorePercent = int ($problemResult->{score} * 100) . "\%"; 575 my $scorePercent = int ($problemResult->{score} * 100) . "\%";
447 my $summary = "On this attempt, you answered $numCorrect $numCorrectNoun out of " 576 my $summary = "On this attempt, you answered $numCorrect out of "
448 . scalar @answerNames . " correct, for a score of $scorePercent."; 577 . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
449 return CGI::table({-border=>1}, CGI::Tr(\@tableRows)) . CGI::p($summary); 578 return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p($summary) : "");
450} 579}
451 580
452sub viewOptions($) { 581sub viewOptions($) {
453 my $self = shift; 582 my $self = shift;
454 my $displayMode = $self->{displayMode}; 583 my $displayMode = $self->{displayMode};
… …
499 $optionLine, 628 $optionLine,
500 CGI::submit(-name=>"redisplay", -label=>"Redisplay Problem"), 629 CGI::submit(-name=>"redisplay", -label=>"Redisplay Problem"),
501 ); 630 );
502} 631}
503 632
633sub previewAnswer($$) {
634 my ($self, $answerResult) = @_;
635 my $ce = $self->{ce};
636 my $effectiveUser = $self->{effectiveUser};
637 my $set = $self->{set};
638 my $problem = $self->{problem};
639 my $displayMode = $self->{displayMode};
640
641 # note: right now, we have to do things completely differently when we are
642 # rendering math from INSIDE the translator and from OUTSIDE the translator.
643 # so we'll just deal with each case explicitly here. there's some code
644 # duplication that can be dealt with later by abstracting out tth/dvipng/etc.
645
646 my $tex = $answerResult->{preview_latex_string};
647
648 return "" if $tex eq "";
649
650 if ($displayMode eq "plainText") {
651 return $tex;
652 } elsif ($displayMode eq "formattedText") {
653 my $tthCommand = $ce->{externalPrograms}->{tth}
654 . " -L -f5 -r 2> /dev/null <<END_OF_INPUT; echo > /dev/null\n"
655 . "\\(".$tex."\\)\n"
656 . "END_OF_INPUT\n";
657
658 # call tth
659 my $result = `$tthCommand`;
660 if ($?) {
661 return "<b>[tth failed: $? $@]</b>";
662 }
663 return $result;
664 } elsif ($displayMode eq "images") {
665 # how are we going to name this?
666 my $targetPathCommon = "/png/"
667 . $effectiveUser->id . "."
668 . $set->set_id . "."
669 . $problem->problem_id . "."
670 . $answerResult->{ans_name} . ".png";
671
672 # figure out where to put things
673 my $wd = tempdir("webwork-dvipng-XXXXXXXX", DIR => $ce->{courseDirs}->{html_temp});
674 my $latex = $ce->{externalPrograms}->{latex};
675 my $dvipng = $ce->{externalPrograms}->{dvipng};
676 my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
677 # should use surePathToTmpFile, but we have to
678 # isolate it from the problem enivronment first
679 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
680
681 # call dvipng to generate a preview
682 dvipng($wd, $latex, $dvipng, $tex, $targetPath);
683 if (-e $targetPath) {
684 return "<img src=\"$targetURL\" alt=\"$tex\" />";
685 } else {
686 return "<b>[math2img failed]</b>";
687 }
688 }
689}
690##### logging subroutine ####
691
692
693
504##### permission queries ##### 694##### permission queries #####
505 695
506# this stuff should be abstracted out into the permissions system 696# this stuff should be abstracted out into the permissions system
507# however, the permission system only knows about things in the 697# however, the permission system only knows about things in the
508# course environment and the username. hmmm... 698# course environment and the username. hmmm...
… …
523 713
524sub canRecordAnswers($$$$$) { 714sub canRecordAnswers($$$$$) {
525 my ($permissionLevel, $openDate, $dueDate, $maxAttempts, $attempts) = @_; 715 my ($permissionLevel, $openDate, $dueDate, $maxAttempts, $attempts) = @_;
526 my $permHigh = $permissionLevel > 0; 716 my $permHigh = $permissionLevel > 0;
527 my $timeOK = time >= $openDate && time <= $dueDate; 717 my $timeOK = time >= $openDate && time <= $dueDate;
528 my $attemptsOK = $attempts <= $maxAttempts; 718 my $attemptsOK = $maxAttempts == -1 || $attempts <= $maxAttempts;
529 return $permHigh || ($timeOK && $attemptsOK); 719 my $recordAnswers = $permHigh || ($timeOK && $attemptsOK);
720 return $recordAnswers;
721}
722
723sub canCheckAnswers($$) {
724 my ($permissionLevel, $answerDate) = @_;
725 my $permHigh = $permissionLevel > 0;
726 my $timeOK = time >= $answerDate;
727 my $recordAnswers = $permHigh || $timeOK;
728 return $recordAnswers;
530} 729}
531 730
532sub mustRecordAnswers($) { 731sub mustRecordAnswers($) {
533 my ($permissionLevel) = @_; 732 my ($permissionLevel) = @_;
534 return $permissionLevel == 0; 733 return $permissionLevel == 0;
Legend:
Removed from v.558  
changed lines
  Added in v.818
aubreyja at gmail dot com
 ViewVC Help
Powered by ViewVC 1.0.9