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

Diff of /trunk/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm

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

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