[system] / branches / gage_dev / webwork2 / lib / WeBWorK / ContentGenerator / Problem.pm Repository:
ViewVC logotype

Diff of /branches/gage_dev/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm

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

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