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