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