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