[system] / trunk / webwork-modperl / lib / WeBWorK / ContentGenerator / Problem.pm Repository:
ViewVC logotype

Diff of /trunk/webwork-modperl/lib/WeBWorK/ContentGenerator/Problem.pm

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

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