[system] / branches / rel-2-2-dev / webwork2 / lib / WeBWorK / ContentGenerator / Problem.pm Repository:
ViewVC logotype

Diff of /branches/rel-2-2-dev/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm

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

Revision 1016 Revision 2251
1################################################################################ 1################################################################################
2# WeBWorK mod_perl (c) 2000-2002 WeBWorK Project 2# WeBWorK Online Homework Delivery System
3# $Id$ 3# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
4# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Problem.pm,v 1.140 2004/06/02 20:27:22 toenail Exp $
5#
6# This program is free software; you can redistribute it and/or modify it under
7# the terms of either: (a) the GNU General Public License as published by the
8# Free Software Foundation; either version 2, or (at your option) any later
9# version, or (b) the "Artistic License" which comes with this package.
10#
11# This program is distributed in the hope that it will be useful, but WITHOUT
12# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
13# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the
14# Artistic License for more details.
4################################################################################ 15################################################################################
5 16
6package WeBWorK::ContentGenerator::Problem; 17package WeBWorK::ContentGenerator::Problem;
7use base qw(WeBWorK::ContentGenerator); 18use base qw(WeBWorK::ContentGenerator);
8 19
9=head1 NAME 20=head1 NAME
10 21
11WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem. 22WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem.
12 23
13=cut 24=cut
14 25
15use strict; 26use strict;
16use warnings; 27use warnings;
17use CGI qw(); 28use CGI qw();
18use File::Path qw(rmtree); 29use File::Path qw(rmtree);
19use File::Temp qw(tempdir);
20use WeBWorK::Form; 30use WeBWorK::Form;
21use WeBWorK::PG; 31use WeBWorK::PG;
32use WeBWorK::PG::ImageGenerator;
22use WeBWorK::PG::IO; 33use WeBWorK::PG::IO;
23use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string); 34use WeBWorK::Utils qw(writeLog writeCourseLog encodeAnswers decodeAnswers ref2string makeTempDirectory);
24use WeBWorK::DB::Utils qw(global2user user2global findDefaults); 35use WeBWorK::DB::Utils qw(global2user user2global findDefaults);
36use WeBWorK::Timing;
37
38use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
25 39
26############################################################ 40############################################################
27# 41#
28# user 42# user
29# effectiveUser 43# effectiveUser
… …
39# 53#
40# redisplay - name of the "Redisplay Problem" button 54# redisplay - name of the "Redisplay Problem" button
41# submitAnswers - name of "Submit Answers" button 55# submitAnswers - name of "Submit Answers" button
42# checkAnswers - name of the "Check Answers" button 56# checkAnswers - name of the "Check Answers" button
43# previewAnswers - name of the "Preview Answers" button 57# previewAnswers - name of the "Preview Answers" button
58#
59# FIXME: this table is heinously out of date
44# 60#
45############################################################ 61############################################################
46 62
63# FIXME: what is this?
64sub templateName {
65 "problem";
66}
67
47sub pre_header_initialize { 68sub pre_header_initialize {
48 my ($self, $setName, $problemNumber) = @_; 69 my ($self) = @_;
49 my $r = $self->{r}; 70 my $r = $self->r;
50 my $courseEnv = $self->{ce}; 71 my $ce = $r->ce;
51 my $db = $self->{db}; 72 my $db = $r->db;
73 my $urlpath = $r->urlpath;
74
75 my $setName = $urlpath->arg("setID");
76 my $problemNumber = $r->urlpath->arg("problemID");
52 my $userName = $r->param('user'); 77 my $userName = $r->param('user');
53 my $effectiveUserName = $r->param('effectiveUser'); 78 my $effectiveUserName = $r->param('effectiveUser');
79 my $key = $r->param('key');
54 80
55 my $user = $db->getUser($userName); 81 my $user = $db->getUser($userName); # checked
82 die "record for user $userName (real user) does not exist."
83 unless defined $user;
84
56 my $effectiveUser = $db->getUser($effectiveUserName); 85 my $effectiveUser = $db->getUser($effectiveUserName); # checked
86 die "record for user $effectiveUserName (effective user) does not exist."
87 unless defined $effectiveUser;
88
89 my $PermissionLevel = $db->getPermissionLevel($userName); # checked
90 die "permission level record for user $userName does not exist (but the user does? odd...)"
91 unless defined $PermissionLevel;
92 my $permissionLevel = $PermissionLevel->permission;
93
94 # obtain the merged set for $effectiveUser
95 my $set = $db->getMergedSet($effectiveUserName, $setName); # checked
96
97 # obtain the merged problem for $effectiveUser
98 my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber); # checked
57 99
58 # obtain the effective user set, or if that is not yet defined obtain global set 100 my $editMode = $r->param("editMode");
59 my $set = $db->getGlobalUserSet($effectiveUserName, $setName); 101
102 if ($permissionLevel > 0) {
103 # professors are allowed to fabricate sets and problems not
104 # assigned to them (or anyone). this allows them to use the
105 # editor to
106
107 # if that is not yet defined obtain the global set, convert
108 # it to a user set, and add fake user data
60 unless (defined $set) { 109 unless (defined $set) {
61 my $userSetClass = $courseEnv->{dbLayout}->{set_user}->{record}; 110 my $userSetClass = $db->{set_user}->{record};
62 $set = global2user($userSetClass, $db->getGlobalSet($setName)); 111 my $globalSet = $db->getGlobalSet($setName); # checked
112 # if the global set doesn't exist either, bail!
113 if(not defined $globalSet) {
114 $set = fake_set($db);
115 } else {
116 $set = global2user($userSetClass, $globalSet);
63 $set->psvn('000'); 117 $set->psvn(0);
118
119 # FIXME: This is a temporary fix to fill in the database
120 # We want the published field to contain either 1 or 0 so if it has not been set to 0, default to 1
121 # this will fill in all the empty fields but not change anything that has been specifically set to 1 or 0
122 $globalSet->published("1") unless $globalSet->published eq "0";
123 $db->putGlobalSet($globalSet);
124 }
64 } 125 }
65 my $psvn = $set->psvn(); 126
66 127 # if that is not yet defined obtain the global problem,
67 # obtain the effective user problem, or if that is not yet defined obtain global problem 128 # convert it to a user problem, and add fake user data
68 my $problem = $db->getGlobalUserProblem($effectiveUserName, $setName, $problemNumber);
69 unless (defined $problem) { 129 unless (defined $problem) {
70 my $userProblemClass = $courseEnv->{dbLayout}->{problem_user}->{record}; 130 my $userProblemClass = $db->{problem_user}->{record};
71 $problem = global2user($userProblemClass, $db->getGlobalProblem($setName,$problemNumber)); 131 my $globalProblem = $db->getGlobalProblem($setName, $problemNumber); # checked
72 132 # if the global problem doesn't exist either, bail!
73# $problem->max_attempts(-1); # default is infinite number of attempts 133 if(not defined $globalProblem) {
74# $problem->value; 134 my $sourceFilePath = $r->param("sourceFilePath");
135 die "Problem $problemNumber in set $setName does not exist"
136 unless defined $sourceFilePath;
137 $problem = fake_problem($db);
138 $problem->problem_id(1);
139 $problem->source_file($sourceFilePath);
140 $problem->user_id($effectiveUserName);
141 } else {
142 $problem = global2user($userProblemClass, $globalProblem);
143 $problem->user_id($effectiveUserName);
75# $problem->problem_seed; 144 $problem->problem_seed(0);
76# $problem->source_file;
77 $problem->user_id($userName); # is this the right value for this unassigned problem? FIXME
78 $problem->status(0); 145 $problem->status(0);
79 $problem->attempted(0); 146 $problem->attempted(0);
147 $problem->last_answer("");
80 $problem->num_correct(0); 148 $problem->num_correct(0);
81 $problem->num_incorrect(0); 149 $problem->num_incorrect(0);
82 $problem->last_answer(' '); 150 }
83 } 151 }
84 #$problem = $db->getGlobalProblem($setName, $problemNumber) unless defined($problem); 152
85 # FIXME 153 # now we're sure we have valid UserSet and UserProblem objects
86 # a better solution at this point would be to take set and problem, convert them to global_user type 154 # yay!
87 # so that they have the right methods. 155
88 # Stuff the local copy of $set and $problem with default data where it won't have been defined 156 # now deal with possible editor overrides:
89 # Make sure that nothing bad is stored back in the database. 157
90 # It would be nice to store lastAnswer somewhere -- perhaps that could be done as a special case. 158 # if the caller is asking to override the source file, and
159 # editMode calls for a temporary file, do so
160 my $sourceFilePath = $r->param("sourceFilePath");
161 if (defined $sourceFilePath and
162 (not defined $editMode or $editMode eq "temporaryFile")) {
163 $problem->source_file($sourceFilePath);
164 }
165
166 # if the caller is asking to override the problem seed, do so
167 my $problemSeed = $r->param("problemSeed");
168 if (defined $problemSeed) {
169 $problem->problem_seed($problemSeed);
170 }
171
172 my $publishedClass = ($set->published) ? "Published" : "Unpublished";
173 my $publishedText = ($set->published) ? "visable to students." : "hidden from students.";
174 $self->addmessage(CGI::p("This set is " . CGI::font({class=>$publishedClass}, $publishedText)));
175 } else {
91 176
177 $self->addmessage(CGI::div({class=>"ResultsWithError"}, CGI::p("This problem will not count towards your grade."))) unless $problem->value;;
178 # students can't view problems not assigned to them
179
180 # A set is valid if it exists and if it is either published or the user is privileged.
181 $self->{invalidSet} = (grep /$setName/, $db->listUserSets($effectiveUserName)) == 0 || !($set->published || $permissionLevel->permission > 0); # this is redundant because of the above if
182 $self->{invalidProblem} = (grep /$problemNumber/, $db->listUserProblems($effectiveUserName, $setName)) == 0 || !($set->published || $permissionLevel->permission > 0);;
183
184 }
92 185
93 # This supplies a psvn if $set doesn't have it. Unfortunately the problem is called on to provide
94 # data in many places and it might not even have methods defined.
95
96 # global sets will not have a defined psvn
97# my $psvn;
98# if ($set->can('psvn') ) {
99# $psvn = $set->psvn();
100# } else { # we are viewing an unassigned problem set, psvn's are irrelevant
101# $psvn = '0000';
102# }
103
104 my $permissionLevel = $db->getPermissionLevel($userName)->permission();
105
106 $self->{userName} = $userName; 186 $self->{userName} = $userName;
187 $self->{effectiveUserName} = $effectiveUserName;
107 $self->{user} = $user; 188 $self->{user} = $user;
108 $self->{effectiveUser} = $effectiveUser; 189 $self->{effectiveUser} = $effectiveUser;
109 $self->{set} = $set;
110 $self->{problem} = $problem;
111 $self->{permissionLevel} = $permissionLevel; 190 $self->{permissionLevel} = $permissionLevel;
191 $self->{set} = $set;
192 $self->{problem} = $problem;
193 $self->{editMode} = $editMode;
112 194
113 ##### form processing ##### 195 ##### form processing #####
114 196
115 # set options from form fields (see comment at top of file for names) 197 # set options from form fields (see comment at top of file for names)
116 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode}; 198 my $displayMode = $r->param("displayMode") || $ce->{pg}->{options}->{displayMode};
117 my $redisplay = $r->param("redisplay"); 199 my $redisplay = $r->param("redisplay");
118 my $submitAnswers = $r->param("submitAnswers"); 200 my $submitAnswers = $r->param("submitAnswers");
119 my $checkAnswers = $r->param("checkAnswers"); 201 my $checkAnswers = $r->param("checkAnswers");
120 my $previewAnswers = $r->param("previewAnswers"); 202 my $previewAnswers = $r->param("previewAnswers");
121 203
122 # fields which may be defined when using Problem Editor
123 my $override_seed = ($permissionLevel>=10) ? $r->param('problemSeed') : undef;
124 my $override_problem_source = ($permissionLevel>=10) ? $r->param('sourceFilePath') : undef;
125 my $editMode = undef;
126 my $submit_button = $r->param('submit_button');
127 if ( defined($submit_button ) ) {
128 $editMode = "temporaryFile" if $submit_button eq 'Refresh';
129 $editMode = 'savedFile' if $submit_button eq 'Save';
130 }
131
132 #override using the source file data from the form field
133 $problem->source_file($override_problem_source) if defined($override_problem_source);
134 $problem->problem_seed($override_seed) if defined($override_seed);
135
136 # store path to source file for title.
137 $self->{problem_source_name} = $problem->source_file;
138 $self->{edit_mode} = $editMode;
139# $self->{current_problem_source} = (defined($override_problem_source) ) ?
140# $override_problem_source :
141# $problem->source_file;
142 # coerce form fields into CGI::Vars format
143 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars }; 204 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
144 205
145 $self->{displayMode} = $displayMode; 206 $self->{displayMode} = $displayMode;
146 $self->{redisplay} = $redisplay; 207 $self->{redisplay} = $redisplay;
147 $self->{submitAnswers} = $submitAnswers; 208 $self->{submitAnswers} = $submitAnswers;
148 $self->{checkAnswers} = $checkAnswers; 209 $self->{checkAnswers} = $checkAnswers;
149 $self->{previewAnswers} = $previewAnswers; 210 $self->{previewAnswers} = $previewAnswers;
150 $self->{formFields} = $formFields; 211 $self->{formFields} = $formFields;
151
152 212
213 # get result and send to message
214 my $success = $r->param("sucess");
215 my $failure = $r->param("failure");
216 $self->addmessage(CGI::div({class=>"ResultsWithError"}, CGI::p($failure))) if $failure;
217 $self->addmessage(CGI::div({class=>"ResultsWithoutError"}, CGI::p($success))) if $success;
218
219 # now that we've set all the necessary variables quit out if the set or problem is invalid
220 return if $self->{invalidSet} || $self->{invalidProblem};
221
153 ##### permissions ##### 222 ##### permissions #####
154 223
155 # are we allowed to view this problem? 224 # are we allowed to view this problem?
156 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0; 225 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
157 return unless $self->{isOpen}; 226 return unless $self->{isOpen};
158 227
159 # what does the user want to do? 228 # what does the user want to do?
160 my %want = ( 229 my %want = (
161 showOldAnswers => $r->param("showOldAnswers") || $courseEnv->{pg}->{options}->{showOldAnswers}, 230 showOldAnswers => $r->param("showOldAnswers") || $ce->{pg}->{options}->{showOldAnswers},
162 showCorrectAnswers => $r->param("showCorrectAnswers") || $courseEnv->{pg}->{options}->{showCorrectAnswers}, 231 showCorrectAnswers => $r->param("showCorrectAnswers") || $ce->{pg}->{options}->{showCorrectAnswers},
163 showHints => $r->param("showHints") || $courseEnv->{pg}->{options}->{showHints}, 232 showHints => $r->param("showHints") || $ce->{pg}->{options}->{showHints},
164 showSolutions => $r->param("showSolutions") || $courseEnv->{pg}->{options}->{showSolutions}, 233 showSolutions => $r->param("showSolutions") || $ce->{pg}->{options}->{showSolutions},
165 recordAnswers => $submitAnswers, 234 recordAnswers => $submitAnswers,
166 checkAnswers => $checkAnswers, 235 checkAnswers => $checkAnswers,
167 ); 236 );
168 237
169 # are certain options enforced? 238 # are certain options enforced?
… …
186 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1), 255 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1),
187 # attempts=num_correct+num_incorrect+1, as this happens before updating $problem 256 # attempts=num_correct+num_incorrect+1, as this happens before updating $problem
188 checkAnswers => canCheckAnswers($permissionLevel, $set->answer_date), 257 checkAnswers => canCheckAnswers($permissionLevel, $set->answer_date),
189 ); 258 );
190 259
260 # more complicated logic for showing check answer button:
261 # checkAnswers button shows up after due date -- once a student can't record anymore
262 # checkAnswers button always shows up when an instructor or TA is acting
263 # as someone else (the $user and $effectiveUserName aren't the same).
264 $can{checkAnswers} = (
265 # $can{recordAnswers} will be false if the due date has passed OR the
266 # student has used up all of her attempts
267 ($can{checkAnswers} and not $can{recordAnswers})
268 or
269 (
270 # FIXME: this is not the right way to check for this.
271 # also, canCheckAnswers() will show this button if the permission
272 # level is positive, which is always true when an instructor is
273 # acting as a student
274 defined($userName)
275 and
276 defined($effectiveUserName)
277 and
278 ($userName ne $effectiveUserName)
279 )
280 );
281
282 # more complicated logif for showing "submit answer" button:
283 # We hide the submit answer button if someone is acting as a student
284 # This prevents errors where you accidently submit the answer for a student
285 # Not sure whether this a feature or a bug
286 $can{recordAnswers} = (
287 $can{recordAnswers}
288 and not
289 (
290 # FIXME: this is not the right way to check for this.
291 defined($userName)
292 and
293 defined($effectiveUserName)
294 and
295 ($userName ne $effectiveUserName)
296 )
297 );
298
191 # final values for options 299 # final values for options
192 my %will; 300 my %will;
193 foreach (keys %must) { 301 foreach (keys %must) {
194 $will{$_} = $can{$_} && ($want{$_} || $must{$_}); 302 $will{$_} = $can{$_} && ($want{$_} || $must{$_});
195 } 303 }
196 304
197 ##### sticky answers ##### 305 ##### sticky answers #####
198 306
199 if (not $submitAnswers and $will{showOldAnswers}) { 307 if (not ($submitAnswers or $previewAnswers or $checkAnswers) and $will{showOldAnswers}) {
200 # do this only if new answers are NOT being submitted 308 # do this only if new answers are NOT being submitted
201 my %oldAnswers = decodeAnswers($problem->last_answer); 309 my %oldAnswers = decodeAnswers($problem->last_answer);
202 $formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers; 310 $formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers;
203 } 311 }
204 312
205 ##### translation ##### 313 ##### translation #####
206 314
315 $WeBWorK::timer->continue("begin pg processing") if defined($WeBWorK::timer);
207 my $pg = WeBWorK::PG->new( 316 my $pg = WeBWorK::PG->new(
208 $courseEnv, 317 $ce,
209 $effectiveUser, 318 $effectiveUser,
210 $r->param('key'), 319 $key,
211 $set, 320 $set,
212 $problem, 321 $problem,
213 $psvn, 322 $set->psvn, # FIXME: this field should be removed
214 $formFields, 323 $formFields,
215 { # translation options 324 { # translation options
216 displayMode => $displayMode, 325 displayMode => $displayMode,
217 override_seed => $override_seed,
218 override_problem_source =>$override_problem_source,
219 showHints => $will{showHints}, 326 showHints => $will{showHints},
220 showSolutions => $will{showSolutions}, 327 showSolutions => $will{showSolutions},
221 refreshMath2img => $will{showHints} || $will{showSolutions}, 328 refreshMath2img => $will{showHints} || $will{showSolutions},
222 processAnswers => 1, 329 processAnswers => 1,
223 }, 330 },
224 ); 331 );
225 332
333 $WeBWorK::timer->continue("end pg processing") if defined($WeBWorK::timer);
226 ##### fix hint/solution options ##### 334 ##### fix hint/solution options #####
227 335
228 $can{showHints} &&= $pg->{flags}->{hintExists}; 336 $can{showHints} &&= $pg->{flags}->{hintExists}
337 &&= $pg->{flags}->{showHintLimit}<=$pg->{state}->{num_of_incorrect_ans};
229 $can{showSolutions} &&= $pg->{flags}->{solutionExists}; 338 $can{showSolutions} &&= $pg->{flags}->{solutionExists};
230 339
231 ##### store fields ##### 340 ##### store fields #####
232 341
233 $self->{want} = \%want; 342 $self->{want} = \%want;
234 $self->{must} = \%must; 343 $self->{must} = \%must;
235 $self->{can} = \%can; 344 $self->{can} = \%can;
236 $self->{will} = \%will; 345 $self->{will} = \%will;
237
238 $self->{pg} = $pg; 346 $self->{pg} = $pg;
239}
240
241sub if_warnings($$) {
242 my ($self, $arg) = @_;
243 return 0 unless $self->{isOpen};
244 return $self->{pg}->{warnings} ne "";
245} 347}
246 348
247sub if_errors($$) { 349sub if_errors($$) {
248 my ($self, $arg) = @_; 350 my ($self, $arg) = @_;
249 return 0 unless $self->{isOpen}; 351
352 if ($self->{isOpen}) {
250 return $self->{pg}->{flags}->{error_flag}; 353 return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
354 } else {
355 return !$arg;
356 }
251} 357}
252 358
253sub head { 359sub head {
254 my $self = shift; 360 my ($self) = @_;
361
255 return "" unless $self->{isOpen}; 362 return "" unless $self->{isOpen};
256 return $self->{pg}->{head_text} if $self->{pg}->{head_text}; 363 return $self->{pg}->{head_text} if $self->{pg}->{head_text};
257} 364}
258 365
259sub path { 366sub options {
260 my $self = shift; 367 my ($self) = @_;
261 my $args = $_[-1];
262 my $setName = $self->{set}->set_id;
263 my $problemNumber = $self->{problem}->problem_id;
264 368
265 my $ce = $self->{ce}; 369 return "" if $self->{invalidProblem};
266 my $root = $ce->{webworkURLs}->{root}; 370 my $sourceFilePathfield = '';
267 my $courseName = $ce->{courseName}; 371 if($self->r->param("sourceFilePath")) {
268 return $self->pathMacro($args, 372 $sourceFilePathfield = CGI::hidden(-name => "sourceFilePath",
269 "Home" => "$root", 373 -value => $self->r->param("sourceFilePath"));
270 $courseName => "$root/$courseName", 374 }
271 $setName => "$root/$courseName/$setName", 375
272 "Problem $problemNumber" => "", 376 return join("",
377 CGI::start_form("POST", $self->{r}->uri),
378 $self->hidden_authen_fields,
379 $sourceFilePathfield,
380 CGI::hr(),
381 CGI::start_div({class=>"viewOptions"}),
382 $self->viewOptions(),
383 CGI::end_div(),
384 CGI::end_form()
273 ); 385 );
274} 386}
275 387
388#sub path {
389# my $self = shift;
390# my $args = $_[-1];
391# my $setName = $self->{set}->set_id;
392# my $problemNumber = $self->{problem}->problem_id;
393#
394# my $ce = $self->{ce};
395# my $root = $ce->{webworkURLs}->{root};
396# my $courseName = $ce->{courseName};
397# return $self->pathMacro($args,
398# "Home" => "$root",
399# $courseName => "$root/$courseName",
400# $setName => "$root/$courseName/$setName",
401# "Problem $problemNumber" => "",
402# );
403#}
404
276sub siblings { 405sub siblings {
277 my $self = shift; 406 my ($self) = @_;
407 my $r = $self->r;
408 my $db = $r->db;
409 my $urlpath = $r->urlpath;
410
411 # can't show sibling problems if the set is invalid
412 return "" if $self->{invalidSet};
413
414 my $courseID = $urlpath->arg("courseID");
278 my $setName = $self->{set}->set_id; 415 my $setID = $self->{set}->set_id;
279 my $problemNumber = $self->{problem}->problem_id;
280
281 my $ce = $self->{ce};
282 my $db = $self->{db};
283 my $root = $ce->{webworkURLs}->{root};
284 my $courseName = $ce->{courseName};
285
286 print CGI::strong("Problems"), CGI::br();
287
288 my $effectiveUser = $self->{r}->param("effectiveUser"); 416 my $eUserID = $r->param("effectiveUser");
289 my @problems; 417 my @problemIDs = sort { $a <=> $b } $db->listUserProblems($eUserID, $setID);
290 push @problems, $db->getGlobalUserProblem($effectiveUser, $setName, $_) 418
291 foreach ($db->listUserProblems($effectiveUser, $setName)); 419 print CGI::start_ul({class=>"LinksMenu"});
292 foreach my $problem (sort { $a->problem_id <=> $b->problem_id } @problems) { 420 print CGI::start_li();
293 print CGI::a({-href=>"$root/$courseName/$setName/".$problem->problem_id."/?" 421 print CGI::span({style=>"font-size:larger"}, "Problems");
294 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}}, 422 print CGI::start_ul();
295 "Problem ".$problem->problem_id), CGI::br(); 423
424 foreach my $problemID (@problemIDs) {
425 my $problemPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",
426 courseID => $courseID, setID => $setID, problemID => $problemID);
427 print CGI::li(CGI::a({href=>$self->systemLink($problemPage, params=>{displayMode => $self->{displayMode}})}, "Problem $problemID"));
296 } 428 }
429
430 print CGI::end_ul();
431 print CGI::end_li();
432 print CGI::end_ul();
433
434 return "";
297} 435}
298 436
299sub nav { 437sub nav {
300 my $self = shift; 438 my ($self, $args) = @_;
301 my $args = $_[-1];
302 my $setName = $self->{set}->set_id;
303 my $problemNumber = $self->{problem}->problem_id;
304
305 my $ce = $self->{ce}; 439 my $r = $self->r;
306 my $db = $self->{db}; 440 my $db = $r->db;
307 my $root = $ce->{webworkURLs}->{root}; 441 my $urlpath = $r->urlpath;
308 my $courseName = $ce->{courseName};
309 442
310 my $wwdb = $self->{wwdb}; 443 my $courseID = $urlpath->arg("courseID");
444 my $setID = $self->{set}->set_id if !($self->{invalidSet});
445 my $problemID = $self->{problem}->problem_id if !($self->{invalidProblem});
311 my $effectiveUser = $self->{r}->param("effectiveUser"); 446 my $eUserID = $r->param("effectiveUser");
447
448 my ($prevID, $nextID);
449
450 if (!$self->{invalidProblem}) {
451 my @problemIDs = $db->listUserProblems($eUserID, $setID);
452 foreach my $id (@problemIDs) {
453 $prevID = $id if $id < $problemID
454 and (not defined $prevID or $id > $prevID);
455 $nextID = $id if $id > $problemID
456 and (not defined $nextID or $id < $nextID);
457 }
458 }
459
460 my @links;
461
462 if ($prevID) {
463 my $prevPage = $urlpath->newFromModule(__PACKAGE__,
464 courseID => $courseID, setID => $setID, problemID => $prevID);
465 push @links, "Previous Problem", $r->location . $prevPage->path, "navPrev";
466 } else {
467 push @links, "Previous Problem", "", "navPrev";
468 }
469
470 push @links, "Problem List", $r->location . $urlpath->parent->path, "navProbList";
471
472 if ($nextID) {
473 my $nextPage = $urlpath->newFromModule(__PACKAGE__,
474 courseID => $courseID, setID => $setID, problemID => $nextID);
475 push @links, "Next Problem", $r->location . $nextPage->path, "navNext";
476 } else {
477 push @links, "Next Problem", "", "navNext";
478 }
479
312 my $tail = "&displayMode=".$self->{displayMode}; 480 my $tail = "&displayMode=".$self->{displayMode};
313
314 my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList");
315
316 my $prevProblem = $db->getGlobalUserProblem($effectiveUser, $setName, $problemNumber-1);
317 my $nextProblem = $db->getGlobalUserProblem($effectiveUser, $setName, $problemNumber+1);
318 unshift @links, "Previous Problem" , ($prevProblem
319 ? "$root/$courseName/$setName/".$prevProblem->problem_id
320 : "") , "navPrev";
321 push @links, "Next Problem" , ($nextProblem
322 ? "$root/$courseName/$setName/".$nextProblem->problem_id
323 : "") , "navNext";
324
325 return $self->navMacro($args, $tail, @links); 481 return $self->navMacro($args, $tail, @links);
326} 482}
327 483
328sub title { 484sub title {
329 my $self = shift; 485 my ($self) = @_;
486
487 # using the url arguments won't break if the set/problem are invalid
488 my $setID = $self->r->urlpath->arg("setID");
489 my $problemID = $self->r->urlpath->arg("problemID");
490
330 my $setName = $self->{set}->set_id; 491 #my $setID = $self->{set}->set_id;
492 #my $problemID = $self->{problem}->problem_id;
331 493
332 my $file_action; 494 return "$setID : $problemID";
333 my $edit_mode = $self->{edit_mode};
334 if ( not defined($edit_mode) ) {
335 $file_action = '';
336 } elsif ( $edit_mode eq 'temporaryFile') {
337 $file_action .= 'Editing temporary file : '. CGI::br() . $self->{problem_source_name};
338 } elsif ( $edit_mode eq 'savedFile' ){
339 $file_action .= 'Problem saved to : '. CGI::br() . $self->{problem_source_name};
340 }
341 my $problemNumber = $self->{problem}->problem_id . " : " . $file_action;
342
343 return "$setName : Problem $problemNumber";
344} 495}
345 496
346sub body { 497sub body {
347 my $self = shift; 498 my $self = shift;
499 my $r = $self->r;
500 my $ce = $r->ce;
501 my $db = $r->db;
502 my $urlpath = $r->urlpath;
503
504 if ($self->{invalidSet}) {
505 return CGI::div({class=>"ResultsWithError"},
506 CGI::p("The selected problem set (" . $urlpath->arg("setID") . ") is not a valid set for " . $r->param("effectiveUser") . "."));
507 }
348 508
349 return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the problem set that contains it is not yet open.")) 509 if ($self->{invalidProblem}) {
510 return CGI::div({class=>"ResultsWithError"},
511 CGI::p("The selected problem (" . $urlpath->arg("problemID") . ") is not a valid problem for set " . $self->{set}->set_id . "."));
512 }
513
350 unless $self->{isOpen}; 514 unless ($self->{isOpen}) {
351 515 return CGI::div({class=>"ResultsWithError"},
516 CGI::p("This problem is not available because the problem set that contains it is not yet open."));
517 }
352 # unpack some useful variables 518 # unpack some useful variables
353 my $r = $self->{r};
354 my $db = $self->{db};
355 my $set = $self->{set}; 519 my $set = $self->{set};
356 my $problem = $self->{problem}; 520 my $problem = $self->{problem};
521 my $editMode = $self->{editMode};
357 my $permissionLevel = $self->{permissionLevel}; 522 my $permissionLevel = $self->{permissionLevel};
358 my $submitAnswers = $self->{submitAnswers}; 523 my $submitAnswers = $self->{submitAnswers};
359 my $checkAnswers = $self->{checkAnswers}; 524 my $checkAnswers = $self->{checkAnswers};
360 my $previewAnswers = $self->{previewAnswers}; 525 my $previewAnswers = $self->{previewAnswers};
361 my %want = %{ $self->{want} }; 526 my %want = %{ $self->{want} };
362 my %can = %{ $self->{can} }; 527 my %can = %{ $self->{can} };
363 my %must = %{ $self->{must} }; 528 my %must = %{ $self->{must} };
364 my %will = %{ $self->{will} }; 529 my %will = %{ $self->{will} };
365 my $pg = $self->{pg}; 530 my $pg = $self->{pg};
366 531
532 #my $root = $ce->{webworkURLs}->{root};
533 my $courseName = $urlpath->arg("courseID");
534
535 #####create Editor link #####
536 ## print editor link if the user is an instructor AND the file is not in temporary editing mode
537 #my $editorLinkMessage = '';
538 ## and ( (not defined($self->{editMode})) or $self->{editMode} eq 'savedFile') # FIXME is this needed?
539 #if ($self->{permissionLevel}>=10 ) {
540 # $editorLinkMessage = CGI::a({-href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".
541 # $set->set_id.'/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
542 #}
543
544 my $editorLink = "";
545 # if we are here without a real problem set, carry that through
546 my $forced_field = [];
547 $forced_field = ['sourceFilePath' => $r->param("sourceFilePath")] if
548 ($set->set_id eq 'Undefined_Set');
549 if ($self->{permissionLevel}>=10) {
550 my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
551 courseID => $courseName, setID => $set->set_id, problemID => $problem->problem_id);
552 my $editorURL = $self->systemLink($editorPage, params=>$forced_field);
553 $editorLink = CGI::a({href=>$editorURL}, "Edit this problem");
554 }
555
367 ##### translation errors? ##### 556 ##### translation errors? #####
368 557
369 if ($pg->{flags}->{error_flag}) { 558 if ($pg->{flags}->{error_flag}) {
370 return $self->errorOutput($pg->{errors}, $pg->{body_text}); 559 print $self->errorOutput($pg->{errors}, $pg->{body_text});
560 print $editorLink;
561 return "";
371 } 562 }
372 563
373 ##### answer processing ##### 564 ##### answer processing #####
374 565 $WeBWorK::timer->continue("begin answer processing") if defined($WeBWorK::timer);
375 # if answers were submitted: 566 # if answers were submitted:
567 my $scoreRecordedMessage;
568 my $pureProblem;
376 if ($submitAnswers) { 569 if ($submitAnswers) {
377 # get a "pure" (unmerged) UserProblem to modify 570 # get a "pure" (unmerged) UserProblem to modify
378 # this will be undefined if the problem has not been assigned to this user 571 # this will be undefined if the problem has not been assigned to this user
379 my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); 572 $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); # checked
573 if (defined $pureProblem) {
380 # store answers in DB for sticky answers 574 # store answers in DB for sticky answers
381 my %answersToStore; 575 my %answersToStore;
382 my %answerHash = %{ $pg->{answers} }; 576 my %answerHash = %{ $pg->{answers} };
383 $answersToStore{$_} = $answerHash{$_}->{original_student_ans} 577 $answersToStore{$_} = $self->{formFields}->{$_} #$answerHash{$_}->{original_student_ans} -- this may have been modified for fields with multiple values. Don't use it!!
384 foreach (keys %answerHash); 578 foreach (keys %answerHash);
579
580 # There may be some more answers to store -- one which are auxiliary entries to a primary answer. Evaluating
581 # matrices works in this way, only the first answer triggers an answer evaluator, the rest are just inputs
582 # however we need to store them. Fortunately they are still in the input form.
583 my @extra_answer_names = @{ $pg->{flags}->{KEPT_EXTRA_ANSWERS}};
584 $answersToStore{$_} = $self->{formFields}->{$_} foreach (@extra_answer_names);
585
586 # Now let's encode these answers to store them -- append the extra answers to the end of answer entry order
587 my @answer_order = (@{$pg->{flags}->{ANSWER_ENTRY_ORDER}}, @extra_answer_names);
385 my $answerString = encodeAnswers(%answersToStore, 588 my $answerString = encodeAnswers(%answersToStore,
386 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }); 589 @answer_order);
387 590
591 # store last answer to database
388 $problem->last_answer($answerString); 592 $problem->last_answer($answerString);
389 # if $pureProblem is defined ( there is a user ) then record the last answer.
390 # FIXME (we're assuming that not being able to get a pure problem is enough to determine
391 # whether or not the problem database needs to be updated. This should be thought through
392 # more carefully to be sure.
393 if ( defined($pureProblem) ) {
394 $pureProblem->last_answer($answerString); 593 $pureProblem->last_answer($answerString);
395 $db->putUserProblem($pureProblem); 594 $db->putUserProblem($pureProblem);
396 #die "pureProblem = ", defined($pureProblem);
397 595
398
399 # store state in DB if it makes sense 596 # store state in DB if it makes sense
400 if ($will{recordAnswers}) { 597 if ($will{recordAnswers}) {
401 $problem->status($pg->{state}->{recorded_score}); 598 $problem->status($pg->{state}->{recorded_score});
402 $problem->attempted(1); 599 $problem->attempted(1);
403 $problem->num_correct($pg->{state}->{num_of_correct_ans}); 600 $problem->num_correct($pg->{state}->{num_of_correct_ans});
404 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans}); 601 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
405 $pureProblem->status($pg->{state}->{recorded_score}); 602 $pureProblem->status($pg->{state}->{recorded_score});
406 $pureProblem->attempted(1); 603 $pureProblem->attempted(1);
407 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans}); 604 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
408 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans}); 605 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
409 $db->putUserProblem($pureProblem); 606 if ($db->putUserProblem($pureProblem)) {
607 $scoreRecordedMessage = "Your score was recorded.";
608 } else {
609 $scoreRecordedMessage = "Your score was not recorded because there was a failure in storing the problem record to the database.";
610 }
410 # write to the transaction log, just to make sure 611 # write to the transaction log, just to make sure
411 writeLog($self->{ce}, "transaction", 612 writeLog($self->{ce}, "transaction",
412 $problem->problem_id."\t". 613 $problem->problem_id."\t".
413 $problem->set_id."\t". 614 $problem->set_id."\t".
414 $problem->user_id."\t". 615 $problem->user_id."\t".
… …
420 $pureProblem->attempted."\t". 621 $pureProblem->attempted."\t".
421 $pureProblem->last_answer."\t". 622 $pureProblem->last_answer."\t".
422 $pureProblem->num_correct."\t". 623 $pureProblem->num_correct."\t".
423 $pureProblem->num_incorrect 624 $pureProblem->num_incorrect
424 ); 625 );
626 } else {
627 if (time < $set->open_date or time > $set->due_date) {
628 $scoreRecordedMessage = "Your score was not recorded because this problem set is closed.";
629 } else {
630 $scoreRecordedMessage = "Your score was not recorded.";
631 }
425 } 632 }
633 } else {
634 $scoreRecordedMessage = "Your score was not recorded because this problem has not been built for you.";
426 } 635 }
427 } 636 }
637
428 # logging student answers 638 # logging student answers
429 my $pastAnswerLog = undef; 639
430 if (defined( $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'} )) { 640 my $answer_log = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
431 641 if ( defined($answer_log ) and defined($pureProblem)) {
432 $pastAnswerLog = $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'}; 642 if ($submitAnswers ) {
433
434 if ($submitAnswers and defined($pastAnswerLog) ) {
435 my $answerString = ""; 643 my $answerString = "";
436 my %answerHash = %{ $pg->{answers} }; 644 my %answerHash = %{ $pg->{answers} };
437 $answerString = $answerString . $answerHash{$_}->{original_student_ans}."\t" 645 # FIXME this is the line 552 error. make sure original student ans is defined.
646 # The fact that it is not defined is probably due to an error in some answer evaluator.
647 # But I think it is useful to suppress this error message in the log.
438 foreach (sort keys %answerHash); 648 foreach (sort keys %answerHash) {
649 my $student_ans = $answerHash{$_}->{original_student_ans} ||'';
650 $answerString .= $student_ans."\t"
651 }
439 $answerString = '' unless defined($answerString); # insure string is defined. 652 $answerString = '' unless defined($answerString); # insure string is defined.
440 writeLog($self->{ce}, "pastAnswerList", 653 writeCourseLog($self->{ce}, "answer_log",
654 join("",
441 '|'.$problem->user_id. 655 '|', $problem->user_id,
442 '|'.$problem->set_id. 656 '|', $problem->set_id,
443 '|'.$problem->problem_id.'|'."\t". 657 '|', $problem->problem_id,
658 '|',"\t",
444 time()."\t". 659 time(),"\t",
445 $answerString, 660 $answerString,
446 661 ),
447 ); 662 );
448 663
449 } 664 }
450
451 } 665 }
452 # end logging student answers 666
667 $WeBWorK::timer->continue("end answer processing") if defined($WeBWorK::timer);
453 668
454 ##### output ##### 669 ##### output #####
670
455 print CGI::start_div({class=>"problemHeader"}); 671 print CGI::start_div({class=>"problemHeader"});
672
673 # custom message for editor
674 if ($permissionLevel >= 10 and defined $editMode) {
675 if ($editMode eq "temporaryFile") {
676 print CGI::p(CGI::i("Editing temporary file: ", $problem->source_file));
677 } elsif ($editMode eq "savedFile") {
678 # FIXME: this is all done automatically if submitError exists.
679 #if ( defined($r->param('submiterror')) and $r->param('submiterror') ) {
680 # FIXME The following line doesn't work because the submiterror hook has already been called.
681 # The actions below should take place during the initialization phase.
682 # $self->{submiterror} .= $r->param('submiterror');
683 # print CGI::p(CGI::div({class=>'ResultsWithError'},$self->{submiterror}));
684 #} else {
685 # print CGI::p(CGI::div({ class=>'ResultsWithoutError'}, "Problem saved to: ", $problem->source_file));
686 #}
687 }
688 }
689 #FIXME we need error messages here if the problem was really not saved.
456 # attempt summary 690 # attempt summary
457 if ($submitAnswers or $will{showCorrectAnswers}) { 691 #FIXME -- the following is a kludge: if showPartialCorrectAnswers is negative don't show anything.
692 # until after the due date
693 # do I need to check $wills{howCorrectAnswers} to make preflight work??
694 if (($pg->{flags}->{showPartialCorrectAnswers}>= 0 and $submitAnswers) ) {
458 # print this if user submitted answers OR requested correct answers 695 # print this if user submitted answers OR requested correct answers
696
459 print $self->attemptResults($pg, $submitAnswers, 697 print $self->attemptResults($pg, 1,
460 $will{showCorrectAnswers}, 698 $will{showCorrectAnswers},
461 $pg->{flags}->{showPartialCorrectAnswers}, 1, 1); 699 $pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
462 } elsif ($checkAnswers) { 700 } elsif ($checkAnswers) {
463 # print this if user previewed answers 701 # print this if user previewed answers
702 print CGI::div({class=>'ResultsWithError'},"ANSWERS ONLY CHECKED -- ",CGI::br(),"ANSWERS NOT RECORDED", CGI::br() );
464 print $self->attemptResults($pg, 1, 0, 1, 1, 1); 703 print $self->attemptResults($pg, 1, $will{showCorrectAnswers}, 1, 1, 1);
465 # show attempt answers 704 # show attempt answers
466 # don't show correct answers 705 # show correct answers if asked
467 # show attempt results (correctness) 706 # show attempt results (correctness)
468 # don't show attempt previews 707 # show attempt previews
469 } elsif ($previewAnswers) { 708 } elsif ($previewAnswers) {
470 # print this if user previewed answers 709 # print this if user previewed answers
471 print $self->attemptResults($pg, 1, 0, 0, 0, 1); 710 print CGI::div({class=>'ResultsWithError'},"PREVIEW ONLY -- NOT RECORDED"),CGI::br(),$self->attemptResults($pg, 1, 0, 0, 0, 1);
472 # show attempt answers 711 # show attempt answers
473 # don't show correct answers 712 # don't show correct answers
474 # don't show attempt results (correctness) 713 # don't show attempt results (correctness)
475 # show attempt previews 714 # show attempt previews
476 } 715 }
477 716
478 print CGI::end_div(); 717 print CGI::end_div();
479 718
480 print CGI::start_div({class=>"problem"}); 719 print CGI::start_div({class=>"problem"});
481 #print CGI::hr(); 720
482 # main form 721 # main form
483 print 722 print
484 CGI::startform("POST", $r->uri), 723 CGI::startform("POST", $r->uri),
485 $self->hidden_authen_fields, 724 $self->hidden_authen_fields,
486 CGI::p($pg->{body_text}), 725 CGI::p($pg->{body_text}),
487 CGI::p($pg->{result}->{msg} ? CGI::b("Note: ") : "", CGI::i($pg->{result}->{msg})), 726 CGI::p($pg->{result}->{msg} ? CGI::b("Note: ") : "", CGI::i($pg->{result}->{msg})),
488 CGI::p( 727 CGI::p(
728 ($can{showCorrectAnswers}
729 ? CGI::checkbox(
730 -name => "showCorrectAnswers",
731 -checked => $will{showCorrectAnswers},
732 -label => "Show correct answers",
733 ) ." "
734 : "" ),
735 ($can{showHints}
736 ? '<div style="color:red">'. CGI::checkbox(
737 -name => "showHints",
738 -checked => $will{showHints},
739 -label => "Show Hints",
740 ) . "</div> "
741 : " " ),
742 ($can{showSolutions}
743 ? CGI::checkbox(
744 -name => "showSolutions",
745 -checked => $will{showSolutions},
746 -label => "Show Solutions",
747 ) . " "
748 : " " ),CGI::br(),
749 CGI::submit(-name=>"previewAnswers",
750 -label=>"Preview Answers"),
489 ($can{recordAnswers} 751 ($can{recordAnswers}
490 ? CGI::submit(-name=>"submitAnswers", 752 ? CGI::submit(-name=>"submitAnswers",
491 -label=>"Submit Answers") 753 -label=>"Submit Answers")
492 : ""), 754 : ""),
493 ($can{checkAnswers} 755 ( $can{checkAnswers}
494 ? CGI::submit(-name=>"checkAnswers", 756 ? CGI::submit(-name=>"checkAnswers",
495 -label=>"Check Answers") 757 -label=>"Check Answers")
496 : ""), 758 : ""),
497 CGI::submit(-name=>"previewAnswers",
498 -label=>"Preview Answers"),
499 ); 759 );
500 print CGI::end_div(); 760 print CGI::end_div();
501 761
502 print CGI::start_div({class=>"scoreSummary"}); 762 print CGI::start_div({class=>"scoreSummary"});
763
503 # score summary 764 # score summary
504 my $attempts = $problem->num_correct + $problem->num_incorrect; 765 my $attempts = $problem->num_correct + $problem->num_incorrect;
505 my $attemptsNoun = $attempts != 1 ? "times" : "time"; 766 my $attemptsNoun = $attempts != 1 ? "times" : "time";
506 my $lastScore = int ($problem->status * 100) . "%"; 767 my $lastScore = sprintf("%.0f%%", $problem->status * 100); # Round to whole number
507 my ($attemptsLeft, $attemptsLeftNoun); 768 my ($attemptsLeft, $attemptsLeftNoun);
508 if ($problem->max_attempts == -1) { 769 if ($problem->max_attempts == -1) {
509 # unlimited attempts 770 # unlimited attempts
510 $attemptsLeft = "unlimited"; 771 $attemptsLeft = "unlimited";
511 $attemptsLeftNoun = "attempts"; 772 $attemptsLeftNoun = "attempts";
… …
518 my $setClosedMessage; 779 my $setClosedMessage;
519 if (time < $set->open_date or time > $set->due_date) { 780 if (time < $set->open_date or time > $set->due_date) {
520 $setClosed = 1; 781 $setClosed = 1;
521 $setClosedMessage = "This problem set is closed."; 782 $setClosedMessage = "This problem set is closed.";
522 if ($permissionLevel > 0) { 783 if ($permissionLevel > 0) {
523 $setClosedMessage .= " Since you are a privileged user, additional attempts will be recorded."; 784 $setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
524 } else { 785 } else {
525 $setClosedMessage .= " Additional attempts will not be recorded."; 786 $setClosedMessage .= " Additional attempts will not be recorded.";
526 } 787 }
527 } 788 }
789
790 my $notCountedMessage = ($problem->value) ? "" : "(This problem will not count towards your grade.)";
528 print CGI::p( 791 print CGI::p(
792 $submitAnswers ? $scoreRecordedMessage . CGI::br() : "",
529 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(), 793 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(),
530 $problem->attempted 794 $problem->attempted
531 ? "Your recorded score is $lastScore." . CGI::br() 795 ? "Your recorded score is $lastScore. $notCountedMessage" . CGI::br()
532 : "", 796 : "",
533 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining." 797 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining."
534 ); 798 );
535 print CGI::end_div(); 799 print CGI::end_div();
536# print CGI::hr(), CGI::start_div({class=>"viewOptions"}); 800
537# print $self->viewOptions(),CGI::end_div(),
538# save state for viewOptions 801 # save state for viewOptions
539 print CGI::hidden(-name => "showOldAnswers", 802 print CGI::hidden(
803 -name => "showOldAnswers",
540 -value => $will{showOldAnswers}, 804 -value => $will{showOldAnswers}
541 ), 805 ),
542 CGI::hidden(-name => "showCorrectAnswers", 806
543 -value => $will{showCorrectAnswers}, 807 CGI::hidden(
544 ), 808 -name => "displayMode",
545 CGI::hidden(-name => "showHints",
546 -value => $will{showHints},
547 ),
548 CGI::hidden(-name => "showSolutions",
549 -value => $will{showSolutions},
550 ),
551 CGI::hidden(-name => "displayMode",
552 -value => $self->{displayMode} 809 -value => $self->{displayMode}
553 ); 810 );
811 print( CGI::hidden(
812 -name => 'editMode',
813 -value => $self->{editMode},
814 )
815 ) if defined($self->{editMode}) and $self->{editMode} eq 'temporaryFile';
816 print( CGI::hidden(
817 -name => 'sourceFilePath',
818 -value => $self->{problem}->{source_file}
819 )) if defined($self->{problem}->{source_file});
820
821 print( CGI::hidden(
822 -name => 'problemSeed',
823 -value => $r->param("problemSeed")
824 )) if defined($r->param("problemSeed"));
825
826 # end of main form
554 print CGI::endform(); 827 print CGI::endform();
555 828
556 print CGI::start_div({class=>"problemFooter"}); 829 print CGI::start_div({class=>"problemFooter"});
557 # feedback form
558 my $ce = $self->{ce};
559 my $root = $ce->{webworkURLs}->{root};
560 my $courseName = $ce->{courseName};
561 my $feedbackURL = "$root/$courseName/feedback/";
562 830
563 # arguments for answer inspection button 831 ## arguments for answer inspection button
564 my $prof_url = $ce->{webworkURLs}->{oldProf}; 832 #my $prof_url = $ce->{webworkURLs}->{oldProf};
833 #my $webworkURL = $ce->{webworkURLs}->{root};
565 my $cgi_url = $prof_url; 834 #my $cgi_url = $prof_url;
566 $cgi_url=~ s|/[^/]*$||; # clip profLogin.pl 835 #$cgi_url=~ s|/[^/]*$||; # clip profLogin.pl
567 my $authen_args = $self->url_authen_args(); 836 #my $authen_args = $self->url_authen_args();
568 my $showPastAnswersURL = "$cgi_url/showPastAnswers.pl"; 837 #my $showPastAnswersURL = "$webworkURL/$courseName/instructor/show_answers/";
569 838
570 839 my $pastAnswersPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ShowAnswers",
571 print CGI::end_div(); 840 courseID => $courseName);
572 print CGI::start_div(); 841 my $showPastAnswersURL = $self->systemLink($pastAnswersPage, authen => 0); # no authen info for form action
842
573 # print answer inspection button 843 # print answer inspection button
574 if ($self->{permissionLevel} >0) { 844 if ($self->{permissionLevel} > 0) {
575
576
577 print "\n", 845 print "\n",
578 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n", 846 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
579 $self->hidden_authen_fields,"\n", 847 $self->hidden_authen_fields,"\n",
580 CGI::hidden(-name => 'course', -value=>$courseName), "\n", 848 CGI::hidden(-name => 'courseID', -value=>$courseName), "\n",
581 CGI::hidden(-name => 'probNum', -value=>$problem->problem_id), "\n", 849 CGI::hidden(-name => 'problemID', -value=>$problem->problem_id), "\n",
582 CGI::hidden(-name => 'setNum', -value=>$problem->set_id), "\n", 850 CGI::hidden(-name => 'setID', -value=>$problem->set_id), "\n",
583 CGI::hidden(-name => 'User', -value=>$problem->user_id), "\n", 851 CGI::hidden(-name => 'studentUser', -value=>$problem->user_id), "\n",
584 CGI::p( {-align=>"left"}, 852 CGI::p( {-align=>"left"},
585 CGI::submit(-name => 'action', -value=>'Show Past Answers') 853 CGI::submit(-name => 'action', -value=>'Show Past Answers')
586 ), "\n", 854 ), "\n",
587 CGI::endform(); 855 CGI::endform();
856 }
588 857
858 ## arguments for feedback form
859 #my $feedbackURL = "$root/$courseName/feedback/";
860 #
861 ##print feedback form
862 #print
863 # CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
864 # $self->hidden_authen_fields,"\n",
865 # CGI::hidden("module", __PACKAGE__),"\n",
866 # CGI::hidden("set", $set->set_id),"\n",
867 # CGI::hidden("problem", $problem->problem_id),"\n",
868 # CGI::hidden("displayMode", $self->{displayMode}),"\n",
869 # CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
870 # CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
871 # CGI::hidden("showHints", $will{showHints}),"\n",
872 # CGI::hidden("showSolutions", $will{showSolutions}),"\n",
873 # CGI::p({-align=>"left"},
874 # CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
875 # ),
876 # CGI::endform(),"\n";
877
878 # feedback form url
879 my $feedbackPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Feedback",
880 courseID => $courseName);
881 my $feedbackURL = $self->systemLink($feedbackPage, authen => 0); # no authen info for form action
589 882
590
591 } #print feedback form 883 #print feedback form
592
593
594 print 884 print
595 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n", 885 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
596 $self->hidden_authen_fields,"\n", 886 $self->hidden_authen_fields,"\n",
597 CGI::hidden("module", __PACKAGE__),"\n", 887 CGI::hidden("module", __PACKAGE__),"\n",
598 CGI::hidden("set", $set->set_id),"\n", 888 CGI::hidden("set", $set->set_id),"\n",
… …
601 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n", 891 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
602 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n", 892 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
603 CGI::hidden("showHints", $will{showHints}),"\n", 893 CGI::hidden("showHints", $will{showHints}),"\n",
604 CGI::hidden("showSolutions", $will{showSolutions}),"\n", 894 CGI::hidden("showSolutions", $will{showSolutions}),"\n",
605 CGI::p({-align=>"left"}, 895 CGI::p({-align=>"left"},
606 CGI::submit(-name=>"feedbackForm", -label=>"Contact instructor") 896 CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
607 ), 897 ),
608 CGI::endform(),"\n"; 898 CGI::endform(),"\n";
609 899
610 # FIXME print editor link 900 # FIXME print editor link
611 # print editor link if the user is an instructor AND the file is not in temporary editing mode 901 print $editorLink; #empty unless it is appropriate to have an editor link.
612 if ($self->{permissionLevel}>=10 and ( (not defined($self->{edit_mode})) or $self->{edit_mode} eq 'savedFile') ) {
613 print CGI::a({-href=>"/webwork/$courseName/instructor/pgProblemEditor/".$set->set_id.
614 '/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
615 }
616 902
617 print CGI::end_div(); 903 print CGI::end_div();
618 904
619 # end answer inspection button
620 # warning output 905 # warning output
621 if ($pg->{warnings} ne "") { 906 #if ($pg->{warnings} ne "") {
622 print CGI::hr(), $self->warningOutput($pg->{warnings}); 907 # print CGI::hr(), $self->warningOutput($pg->{warnings});
623 } 908 #}
624 909
625 # debugging stuff 910 # debugging stuff
626 if (0) { 911 if (0) {
627 print 912 print
628 CGI::hr(), 913 CGI::hr(),
… …
642 return ""; 927 return "";
643} 928}
644 929
645##### output utilities ##### 930##### output utilities #####
646 931
647sub attemptResults($$$$$$) { 932sub attemptResults {
648 my $self = shift; 933 my $self = shift;
649 my $pg = shift; 934 my $pg = shift;
650 my $showAttemptAnswers = shift; 935 my $showAttemptAnswers = shift;
651 my $showCorrectAnswers = shift; 936 my $showCorrectAnswers = shift;
652 my $showAttemptResults = $showAttemptAnswers && shift; 937 my $showAttemptResults = $showAttemptAnswers && shift;
653 my $showSummary = shift; 938 my $showSummary = shift;
654 my $showAttemptPreview = shift || 0; 939 my $showAttemptPreview = shift || 0;
940
941 my $ce = $self->r->ce;
942
655 my $problemResult = $pg->{result}; # the overall result of the problem 943 my $problemResult = $pg->{result}; # the overall result of the problem
656 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }; 944 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
657 945
658 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames; 946 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
659 947
948 my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview";
949 my $imgGen = WeBWorK::PG::ImageGenerator->new(
950 tempDir => $ce->{webworkDirs}->{tmp},
951 latex => $ce->{externalPrograms}->{latex},
952 dvipng => $ce->{externalPrograms}->{dvipng},
953 useCache => 1,
954 cacheDir => $ce->{webworkDirs}->{equationCache},
955 cacheURL => $ce->{webworkURLs}->{equationCache},
956 cacheDB => $ce->{webworkFiles}->{equationCacheDB},
957 );
958
959 my $header;
660 my $header = CGI::th("Part"); 960 #$header .= CGI::th("Part");
661 $header .= $showAttemptAnswers ? CGI::th("Entered") : ""; 961 $header .= $showAttemptAnswers ? CGI::th("Entered") : "";
662 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : ""; 962 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : "";
663 $header .= $showCorrectAnswers ? CGI::th("Correct") : ""; 963 $header .= $showCorrectAnswers ? CGI::th("Correct") : "";
664 $header .= $showAttemptResults ? CGI::th("Result") : ""; 964 $header .= $showAttemptResults ? CGI::th("Result") : "";
665 $header .= $showMessages ? CGI::th("messages") : ""; 965 $header .= $showMessages ? CGI::th("Messages") : "";
666 my @tableRows = ( $header ); 966 my @tableRows = ( $header );
667 my $numCorrect; 967 my $numCorrect;
668 foreach my $name (@answerNames) { 968 foreach my $name (@answerNames) {
669 my $answerResult = $pg->{answers}->{$name}; 969 my $answerResult = $pg->{answers}->{$name};
670 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans 970 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
671 my $preview = ($showAttemptPreview 971 my $preview = ($showAttemptPreview
672 ? $self->previewAnswer($answerResult) 972 ? $self->previewAnswer($answerResult, $imgGen)
673 : ""); 973 : "");
674 my $correctAnswer = $answerResult->{correct_ans}; 974 my $correctAnswer = $answerResult->{correct_ans};
675 my $answerScore = $answerResult->{score}; 975 my $answerScore = $answerResult->{score};
676 my $answerMessage = $showMessages ? $answerResult->{ans_message} : ""; 976 my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
677 977 #FIXME --Can we be sure that $answerScore is an integer-- could the problem give partial credit?
678 $numCorrect += $answerScore > 0; 978 $numCorrect += $answerScore > 0;
679 my $resultString = $answerScore ? "correct" : "incorrect"; 979 my $resultString = $answerScore == 1 ? "correct" : "incorrect";
680 980
681 # get rid of the goofy prefix on the answer names (supposedly, the format 981 # get rid of the goofy prefix on the answer names (supposedly, the format
682 # of the answer names is changeable. this only fixes it for "AnSwEr" 982 # of the answer names is changeable. this only fixes it for "AnSwEr"
683 $name =~ s/^AnSwEr//; 983 #$name =~ s/^AnSwEr//;
684 984
985 my $row;
685 my $row = CGI::td($name); 986 #$row .= CGI::td($name);
686 $row .= $showAttemptAnswers ? CGI::td($studentAnswer) : ""; 987 $row .= $showAttemptAnswers ? CGI::td($self->nbsp($studentAnswer)) : "";
687 $row .= $showAttemptPreview ? CGI::td($preview) : ""; 988 $row .= $showAttemptPreview ? CGI::td($self->nbsp($preview)) : "";
688 $row .= $showCorrectAnswers ? CGI::td($correctAnswer) : ""; 989 $row .= $showCorrectAnswers ? CGI::td($self->nbsp($correctAnswer)) : "";
689 $row .= $showAttemptResults ? CGI::td($resultString) : ""; 990 $row .= $showAttemptResults ? CGI::td($self->nbsp($resultString)) : "";
690 $row .= $answerMessage ? CGI::td($answerMessage) : ""; 991 $row .= $showMessages ? CGI::td($self->nbsp($answerMessage)) : "";
691 push @tableRows, $row; 992 push @tableRows, $row;
692 } 993 }
693 994
995 # render equation images
996 $imgGen->render(refresh => 1);
997
694 my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions"; 998# my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
695 my $scorePercent = int ($problemResult->{score} * 100) . "\%"; 999 my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
1000# FIXME -- I left the old code in in case we have to back out.
696 my $summary = "On this attempt, you answered $numCorrect out of " 1001# my $summary = "On this attempt, you answered $numCorrect out of "
697 . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent."; 1002# . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
698 return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p($summary) : ""); 1003 my $summary = "";
1004 if (scalar @answerNames == 1) {
1005 if ($numCorrect == scalar @answerNames) {
1006 $summary .= CGI::div({class=>"ResultsWithoutError"},"The above answer is correct.");
1007 } else {
1008 $summary .= CGI::div({class=>"ResultsWithError"},"The above answer is NOT correct.");
1009 }
1010 } else {
1011 if ($numCorrect == scalar @answerNames) {
1012 $summary .= CGI::div({class=>"ResultsWithoutError"},"All of the above answers are correct.");
1013 } else {
1014 $summary .= CGI::div({class=>"ResultsWithError"},"At least one of the above answers is NOT correct.");
1015 }
1016 }
1017
1018 return
1019 CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows))
1020 . ($showSummary ? CGI::p({class=>'emphasis'},$summary) : "");
699} 1021}
700 1022
1023#sub nbsp {
1024# my $str = shift;
1025# ($str =~/\S/) ? $str : '&nbsp;' ; # returns non-breaking space for empty strings
1026# # tricky cases: $str =0;
1027# # $str is a complex number
1028#}
1029
701sub viewOptions($) { 1030sub viewOptions {
702 my $self = shift; 1031 my ($self) = @_;
1032 my $ce = $self->r->ce;
1033
703 my $displayMode = $self->{displayMode}; 1034 my $displayMode = $self->{displayMode};
704 my %must = %{ $self->{must} }; 1035 my %must = %{ $self->{must} };
705 my %can = %{ $self->{can} }; 1036 my %can = %{ $self->{can} };
706 my %will = %{ $self->{will} }; 1037 my %will = %{ $self->{will} };
707 1038
… …
711 CGI::checkbox( 1042 CGI::checkbox(
712 -name => "showOldAnswers", 1043 -name => "showOldAnswers",
713 -checked => $will{showOldAnswers}, 1044 -checked => $will{showOldAnswers},
714 -label => "Saved answers", 1045 -label => "Saved answers",
715 ), "&nbsp;&nbsp;".CGI::br(); 1046 ), "&nbsp;&nbsp;".CGI::br();
716 $can{showCorrectAnswers} and $optionLine .= join "", 1047
717 CGI::checkbox(
718 -name => "showCorrectAnswers",
719 -checked => $will{showCorrectAnswers},
720 -label => "Correct answers",
721 ), "&nbsp;&nbsp;".CGI::br();
722 $can{showHints} and $optionLine .= join "",
723 CGI::checkbox(
724 -name => "showHints",
725 -checked => $will{showHints},
726 -label => "Hints",
727 ), "&nbsp;&nbsp;".CGI::br();
728 $can{showSolutions} and $optionLine .= join "",
729 CGI::checkbox(
730 -name => "showSolutions",
731 -checked => $will{showSolutions},
732 -label => "Solutions",
733 ), "&nbsp;&nbsp;".CGI::br();
734 $optionLine and $optionLine .= join "", CGI::br(); 1048 $optionLine and $optionLine .= join "", CGI::br();
735 1049
736 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex align: left"}, 1050 my %display_modes = %{WeBWorK::PG::DISPLAY_MODES()};
1051 my @active_modes = grep { exists $display_modes{$_} }
1052 @{$ce->{pg}->{displayModes}};
1053 my $modeLine = (scalar(@active_modes)>1) ?
737 "View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;".CGI::br(), 1054 "View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;".CGI::br().
738 CGI::radio_group( 1055 CGI::radio_group(
739 -name => "displayMode", 1056 -name => "displayMode",
740 -values => ['plainText', 'formattedText', 'images'], 1057 -values => \@active_modes,
741 -default => $displayMode, 1058 -default => $displayMode,
742 -linebreak=>'true', 1059 -linebreak=>'true',
743 -labels => { 1060 -labels => {
744 plainText => "plain", 1061 plainText => "plain",
745 formattedText => "formatted", 1062 formattedText => "formatted",
746 images => "images", 1063 images => "images",
1064 jsMath => "jsMath",
1065 asciimath => "asciimath",
747 } 1066 },
748 ), CGI::br(),CGI::hr(), 1067 ). CGI::br().CGI::hr() : '';
1068
1069 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex align: left"},
1070 $modeLine,
749 $optionLine, 1071 $optionLine,
750 CGI::submit(-name=>"redisplay", -label=>"Save Options"), 1072 CGI::submit(-name=>"redisplay", -label=>"Save Options"),
751 ); 1073 );
752} 1074}
753 1075
754sub previewAnswer($$) { 1076sub previewAnswer {
755 my ($self, $answerResult) = @_; 1077 my ($self, $answerResult, $imgGen) = @_;
756 my $ce = $self->{ce}; 1078 my $ce = $self->r->ce;
757 my $effectiveUser = $self->{effectiveUser}; 1079 my $effectiveUser = $self->{effectiveUser};
758 my $set = $self->{set}; 1080 my $set = $self->{set};
759 my $problem = $self->{problem}; 1081 my $problem = $self->{problem};
760 my $displayMode = $self->{displayMode}; 1082 my $displayMode = $self->{displayMode};
761 1083
… …
764 # so we'll just deal with each case explicitly here. there's some code 1086 # so we'll just deal with each case explicitly here. there's some code
765 # duplication that can be dealt with later by abstracting out tth/dvipng/etc. 1087 # duplication that can be dealt with later by abstracting out tth/dvipng/etc.
766 1088
767 my $tex = $answerResult->{preview_latex_string}; 1089 my $tex = $answerResult->{preview_latex_string};
768 1090
769 return "" if $tex eq ""; 1091 return "" unless defined $tex and $tex ne "";
770 1092
771 if ($displayMode eq "plainText") { 1093 if ($displayMode eq "plainText") {
772 return $tex; 1094 return $tex;
773 } elsif ($displayMode eq "formattedText") { 1095 } elsif ($displayMode eq "formattedText") {
774 my $tthCommand = $ce->{externalPrograms}->{tth} 1096 my $tthCommand = $ce->{externalPrograms}->{tth}
… …
781 if ($?) { 1103 if ($?) {
782 return "<b>[tth failed: $? $@]</b>"; 1104 return "<b>[tth failed: $? $@]</b>";
783 } 1105 }
784 return $result; 1106 return $result;
785 } elsif ($displayMode eq "images") { 1107 } elsif ($displayMode eq "images") {
786 # how are we going to name this? 1108 $imgGen->add($tex);
787 my $targetPathCommon = "/m2i/" 1109 } elsif ($displayMode eq "jsMath") {
788 . $effectiveUser->user_id . "." 1110
789 . $set->set_id . "." 1111 return '<DIV CLASS="math">'.$tex.'</DIV>' ;
790 . $problem->problem_id . "." 1112
791 . $answerResult->{ans_name} . ".png"; 1113
792 1114
793 # figure out where to put things 1115
794 my $wd = tempdir("webwork-dvipng-XXXXXXXX", DIR => $ce->{courseDirs}->{html_temp});
795 my $latex = $ce->{externalPrograms}->{latex};
796 my $dvipng = $ce->{externalPrograms}->{dvipng};
797 my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
798 # should use surePathToTmpFile, but we have to
799 # isolate it from the problem enivronment first
800 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
801
802 # call dvipng to generate a preview
803 dvipng($wd, $latex, $dvipng, $tex, $targetPath);
804 rmtree($wd, 0, 0);
805 if (-e $targetPath) {
806 return "<img src=\"$targetURL\" alt=\"$tex\" />";
807 } else {
808 return "<b>[math2img failed]</b>";
809 }
810 } 1116 }
811} 1117}
812
813sub options {
814 my $self=shift;
815 my $out;
816 $out .=join("",
817 CGI::startform("POST", $self->{r}->uri),
818 $self->hidden_authen_fields,
819 CGI::hr(),
820 CGI::start_div({class=>"viewOptions"}),
821 $self->viewOptions(),CGI::end_div(),
822 );
823return $out;
824
825}
826##### logging subroutine ####
827
828
829 1118
830##### permission queries ##### 1119##### permission queries #####
831 1120
832# this stuff should be abstracted out into the permissions system 1121# this stuff should be abstracted out into the permissions system
833# however, the permission system only knows about things in the 1122# however, the permission system only knows about things in the
834# course environment and the username. hmmm... 1123# course environment and the username. hmmm...
835 1124
836# also, i should fix these so that they have a consistent calling 1125# also, i should fix these so that they have a consistent calling
837# format -- perhaps: 1126# format -- perhaps:
838# canPERM($courseEnv, $user, $set, $problem, $permissionLevel) 1127# canPERM($ce, $user, $set, $problem, $permissionLevel)
839 1128
840sub canShowCorrectAnswers($$) { 1129sub canShowCorrectAnswers($$) {
841 my ($permissionLevel, $answerDate) = @_; 1130 my ($permissionLevel, $answerDate) = @_;
842 return $permissionLevel > 0 || time > $answerDate; 1131 return $permissionLevel > 0 || time > $answerDate;
843} 1132}
… …
867sub mustRecordAnswers($) { 1156sub mustRecordAnswers($) {
868 my ($permissionLevel) = @_; 1157 my ($permissionLevel) = @_;
869 return $permissionLevel == 0; 1158 return $permissionLevel == 0;
870} 1159}
871 1160
1161
1162# FIXME: does this even get used?
1163sub submiterror {
1164 my $self = shift;
1165 my $submiterror = (defined($self->{submiterror}) ) ? $self->{submiterror} : '';
1166 $submiterror;
1167}
8721; 11681;
Legend:
Removed from v.1016  
changed lines
  Added in v.2251
aubreyja at gmail dot com
 ViewVC Help
Powered by ViewVC 1.0.9