[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 1465 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
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=1; # 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;
… …
21use WeBWorK::PG::ImageGenerator; 32use WeBWorK::PG::ImageGenerator;
22use WeBWorK::PG::IO; 33use WeBWorK::PG::IO;
23use WeBWorK::Utils qw(writeLog writeCourseLog encodeAnswers decodeAnswers ref2string makeTempDirectory); 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);
25use WeBWorK::Timing; 36use WeBWorK::Timing;
37
38use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
26 39
27############################################################ 40############################################################
28# 41#
29# user 42# user
30# effectiveUser 43# effectiveUser
… …
40# 53#
41# redisplay - name of the "Redisplay Problem" button 54# redisplay - name of the "Redisplay Problem" button
42# submitAnswers - name of "Submit Answers" button 55# submitAnswers - name of "Submit Answers" button
43# checkAnswers - name of the "Check Answers" button 56# checkAnswers - name of the "Check Answers" button
44# 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
45# 60#
46############################################################ 61############################################################
47 62
63# FIXME: what is this?
48sub templateName { 64sub templateName {
49 "problem"; 65 "problem";
50} 66}
51 67
52sub pre_header_initialize { 68sub pre_header_initialize {
53 my ($self, $setName, $problemNumber) = @_; 69 my ($self) = @_;
54 my $r = $self->{r}; 70 my $r = $self->r;
55 my $courseEnv = $self->{ce}; 71 my $ce = $r->ce;
56 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");
57 my $userName = $r->param('user'); 77 my $userName = $r->param('user');
58 my $effectiveUserName = $r->param('effectiveUser'); 78 my $effectiveUserName = $r->param('effectiveUser');
59 my $key = $r->param('key'); 79 my $key = $r->param('key');
60 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
61 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;
62 my $permissionLevel = $db->getPermissionLevel($userName)->permission(); 92 my $permissionLevel = $PermissionLevel->permission;
63 93
64 # obtain the merged set for $effectiveUser 94 # obtain the merged set for $effectiveUser
65 my $set = $db->getMergedSet($effectiveUserName, $setName); 95 my $set = $db->getMergedSet($effectiveUserName, $setName); # checked
66 96
67 # obtain the merged problem for $effectiveUser 97 # obtain the merged problem for $effectiveUser
68 my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber); 98 my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber); # checked
69 99
70 my $editMode = $r->param("editMode"); 100 my $editMode = $r->param("editMode");
71 101
72 if ($permissionLevel > 0 and defined $editMode) { 102 if ($permissionLevel > 0) {
73 # professors are allowed to fabricate sets and problems not 103 # professors are allowed to fabricate sets and problems not
74 # assigned to them (or anyone). this allows them to use the 104 # assigned to them (or anyone). this allows them to use the
75 # editor to 105 # editor to
76 106
77 # if that is not yet defined obtain the global set, convert 107 # if that is not yet defined obtain the global set, convert
78 # it to a user set, and add fake user data 108 # it to a user set, and add fake user data
79 unless (defined $set) { 109 unless (defined $set) {
80 my $userSetClass = $db->{set_user}->{record}; 110 my $userSetClass = $db->{set_user}->{record};
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 {
81 $set = global2user($userSetClass, 116 $set = global2user($userSetClass, $globalSet);
82 $db->getGlobalSet($setName));
83 die "Set $setName does not exist"
84 unless defined $set;
85 $set->psvn(0); 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 }
86 } 125 }
87 126
88 # if that is not yet defined obtain the global problem, 127 # if that is not yet defined obtain the global problem,
89 # convert it to a user problem, and add fake user data 128 # convert it to a user problem, and add fake user data
90 unless (defined $problem) { 129 unless (defined $problem) {
91 my $userProblemClass = $db->{problem_user}->{record}; 130 my $userProblemClass = $db->{problem_user}->{record};
92 $problem = global2user($userProblemClass,
93 $db->getGlobalProblem($setName,$problemNumber)); 131 my $globalProblem = $db->getGlobalProblem($setName, $problemNumber); # checked
132 # if the global problem doesn't exist either, bail!
133 if(not defined $globalProblem) {
134 my $sourceFilePath = $r->param("sourceFilePath");
94 die "Problem $problemNumber in set $setName does not exist" 135 die "Problem $problemNumber in set $setName does not exist"
95 unless defined $problem; 136 unless defined $sourceFilePath;
137 $problem = fake_problem($db);
138 $problem->problem_id(1);
139 $problem->source_file($sourceFilePath);
96 $problem->user_id($effectiveUserName); 140 $problem->user_id($effectiveUserName);
141 } else {
142 $problem = global2user($userProblemClass, $globalProblem);
143 $problem->user_id($effectiveUserName);
97 $problem->problem_seed(0); 144 $problem->problem_seed(0);
98 $problem->status(0); 145 $problem->status(0);
99 $problem->attempted(0); 146 $problem->attempted(0);
100 $problem->last_answer(""); 147 $problem->last_answer("");
101 $problem->num_correct(0); 148 $problem->num_correct(0);
102 $problem->num_incorrect(0); 149 $problem->num_incorrect(0);
150 }
103 } 151 }
104 152
105 # now we're sure we have valid UserSet and UserProblem objects 153 # now we're sure we have valid UserSet and UserProblem objects
106 # yay! 154 # yay!
107 155
108 # now deal with possible editor overrides: 156 # now deal with possible editor overrides:
109 157
110 # if the caller is asking to override the source file, and 158 # if the caller is asking to override the source file, and
111 # editMode calls for a temporary file, do so 159 # editMode calls for a temporary file, do so
112 my $sourceFilePath = $r->param("sourceFilePath"); 160 my $sourceFilePath = $r->param("sourceFilePath");
113 if (defined $sourceFilePath and $editMode eq "temporaryFile") { 161 if (defined $sourceFilePath and
162 (not defined $editMode or $editMode eq "temporaryFile")) {
114 $problem->source_file($sourceFilePath); 163 $problem->source_file($sourceFilePath);
115 } 164 }
116 165
117 # if the caller is asking to override the problem seed, do so 166 # if the caller is asking to override the problem seed, do so
118 my $problemSeed = $r->param("problemSeed"); 167 my $problemSeed = $r->param("problemSeed");
119 if (defined $problemSeed) { 168 if (defined $problemSeed) {
120 $problem->problem_seed($problemSeed); 169 $problem->problem_seed($problemSeed);
121 } 170 }
171
172 my $published = ($set->published) ? "Published" : "Unpublished";
173 $self->addmessage(CGI::p("This set is " . CGI::font({class=>$published}, $published)));
122 } else { 174 } else {
175
176 $self->addmessage(CGI::div({class=>"ResultsWithError"}, CGI::p("This problem will not count towards your grade."))) unless $problem->value;;
123 # students can't view problems not assigned to them 177 # students can't view problems not assigned to them
124 die "Set $setName is not assigned to $effectiveUserName" 178
125 unless defined $set; 179 # A set is valid if it exists and if it is either published or the user is privileged.
126 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
127 unless defined $problem; 181 $self->{invalidProblem} = (grep /$problemNumber/, $db->listUserProblems($effectiveUserName, $setName)) == 0 || !($set->published || $permissionLevel->permission > 0);;
182
128 } 183 }
129 184
130 $self->{userName} = $userName; 185 $self->{userName} = $userName;
131 $self->{effectiveUserName} = $effectiveUserName; 186 $self->{effectiveUserName} = $effectiveUserName;
132 $self->{user} = $user; 187 $self->{user} = $user;
… …
137 $self->{editMode} = $editMode; 192 $self->{editMode} = $editMode;
138 193
139 ##### form processing ##### 194 ##### form processing #####
140 195
141 # 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)
142 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode}; 197 my $displayMode = $r->param("displayMode") || $ce->{pg}->{options}->{displayMode};
143 my $redisplay = $r->param("redisplay"); 198 my $redisplay = $r->param("redisplay");
144 my $submitAnswers = $r->param("submitAnswers"); 199 my $submitAnswers = $r->param("submitAnswers");
145 my $checkAnswers = $r->param("checkAnswers"); 200 my $checkAnswers = $r->param("checkAnswers");
146 my $previewAnswers = $r->param("previewAnswers"); 201 my $previewAnswers = $r->param("previewAnswers");
147 202
148 # fields which may be defined when using Problem Editor
149 #my $override_seed = ($permissionLevel>=10) ? $r->param('problemSeed') : undef;
150 #my $override_problem_source = ($permissionLevel>=10) ? $r->param('sourceFilePath') : undef;
151 #my $editMode = undef;
152 #my $submit_button = $r->param('submit_button');
153 #if ( defined($submit_button ) ) {
154 # $editMode = "temporaryFile" if $submit_button eq 'Refresh';
155 # $editMode = 'savedFile' if $submit_button eq 'Save';
156 #}
157 #
158 ##override using the source file data from the form field
159 #$problem->source_file($override_problem_source) if defined($override_problem_source);
160 #$problem->problem_seed($override_seed) if defined($override_seed);
161 #
162 ## store path to source file for title.
163 #$self->{problem_source_name} = $problem->source_file;
164 #$self->{edit_mode} = $editMode;
165 #$self->{current_problem_source} = (defined($override_problem_source) ) ?
166
167 # coerce form fields into CGI::Vars format
168 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars }; 203 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
169 204
170 $self->{displayMode} = $displayMode; 205 $self->{displayMode} = $displayMode;
171 $self->{redisplay} = $redisplay; 206 $self->{redisplay} = $redisplay;
172 $self->{submitAnswers} = $submitAnswers; 207 $self->{submitAnswers} = $submitAnswers;
173 $self->{checkAnswers} = $checkAnswers; 208 $self->{checkAnswers} = $checkAnswers;
174 $self->{previewAnswers} = $previewAnswers; 209 $self->{previewAnswers} = $previewAnswers;
175 $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};
176 220
177 ##### permissions ##### 221 ##### permissions #####
178 222
179 # are we allowed to view this problem? 223 # are we allowed to view this problem?
180 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0; 224 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
181 return unless $self->{isOpen}; 225 return unless $self->{isOpen};
182 226
183 # what does the user want to do? 227 # what does the user want to do?
184 my %want = ( 228 my %want = (
185 showOldAnswers => $r->param("showOldAnswers") || $courseEnv->{pg}->{options}->{showOldAnswers}, 229 showOldAnswers => $r->param("showOldAnswers") || $ce->{pg}->{options}->{showOldAnswers},
186 showCorrectAnswers => $r->param("showCorrectAnswers") || $courseEnv->{pg}->{options}->{showCorrectAnswers}, 230 showCorrectAnswers => $r->param("showCorrectAnswers") || $ce->{pg}->{options}->{showCorrectAnswers},
187 showHints => $r->param("showHints") || $courseEnv->{pg}->{options}->{showHints}, 231 showHints => $r->param("showHints") || $ce->{pg}->{options}->{showHints},
188 showSolutions => $r->param("showSolutions") || $courseEnv->{pg}->{options}->{showSolutions}, 232 showSolutions => $r->param("showSolutions") || $ce->{pg}->{options}->{showSolutions},
189 recordAnswers => $submitAnswers, 233 recordAnswers => $submitAnswers,
190 checkAnswers => $checkAnswers, 234 checkAnswers => $checkAnswers,
191 ); 235 );
192 236
193 # are certain options enforced? 237 # are certain options enforced?
… …
210 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1), 254 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1),
211 # 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
212 checkAnswers => canCheckAnswers($permissionLevel, $set->answer_date), 256 checkAnswers => canCheckAnswers($permissionLevel, $set->answer_date),
213 ); 257 );
214 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
215 # final values for options 298 # final values for options
216 my %will; 299 my %will;
217 foreach (keys %must) { 300 foreach (keys %must) {
218 $will{$_} = $can{$_} && ($want{$_} || $must{$_}); 301 $will{$_} = $can{$_} && ($want{$_} || $must{$_});
219 } 302 }
… …
226 $formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers; 309 $formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers;
227 } 310 }
228 311
229 ##### translation ##### 312 ##### translation #####
230 313
231 $WeBWorK::timer0->continue("begin pg processing") if $timer0_ON; 314 $WeBWorK::timer->continue("begin pg processing") if defined($WeBWorK::timer);
232 my $pg = WeBWorK::PG->new( 315 my $pg = WeBWorK::PG->new(
233 $courseEnv, 316 $ce,
234 $effectiveUser, 317 $effectiveUser,
235 $key, 318 $key,
236 $set, 319 $set,
237 $problem, 320 $problem,
238 $set->psvn, # FIXME: this field should be removed 321 $set->psvn, # FIXME: this field should be removed
… …
244 refreshMath2img => $will{showHints} || $will{showSolutions}, 327 refreshMath2img => $will{showHints} || $will{showSolutions},
245 processAnswers => 1, 328 processAnswers => 1,
246 }, 329 },
247 ); 330 );
248 331
249 $WeBWorK::timer0->continue("end pg processing") if $timer0_ON; 332 $WeBWorK::timer->continue("end pg processing") if defined($WeBWorK::timer);
250 ##### fix hint/solution options ##### 333 ##### fix hint/solution options #####
251 334
252 $can{showHints} &&= $pg->{flags}->{hintExists}; 335 $can{showHints} &&= $pg->{flags}->{hintExists}
336 &&= $pg->{flags}->{showHintLimit}<=$pg->{state}->{num_of_incorrect_ans};
253 $can{showSolutions} &&= $pg->{flags}->{solutionExists}; 337 $can{showSolutions} &&= $pg->{flags}->{solutionExists};
254 338
255 ##### store fields ##### 339 ##### store fields #####
256 340
257 $self->{want} = \%want; 341 $self->{want} = \%want;
258 $self->{must} = \%must; 342 $self->{must} = \%must;
259 $self->{can} = \%can; 343 $self->{can} = \%can;
260 $self->{will} = \%will; 344 $self->{will} = \%will;
261
262 $self->{pg} = $pg; 345 $self->{pg} = $pg;
263} 346}
264
265#sub if_warnings($$) {
266# my ($self, $arg) = @_;
267# return 0 unless $self->{isOpen};
268# return $self->{pg}->{warnings} ne "";
269#}
270 347
271sub if_errors($$) { 348sub if_errors($$) {
272 my ($self, $arg) = @_; 349 my ($self, $arg) = @_;
273 return 0 unless $self->{isOpen}; 350
351 if ($self->{isOpen}) {
274 return $self->{pg}->{flags}->{error_flag}; 352 return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
353 } else {
354 return !$arg;
355 }
275} 356}
276 357
277sub head { 358sub head {
278 my $self = shift; 359 my ($self) = @_;
360
279 return "" unless $self->{isOpen}; 361 return "" unless $self->{isOpen};
280 return $self->{pg}->{head_text} if $self->{pg}->{head_text}; 362 return $self->{pg}->{head_text} if $self->{pg}->{head_text};
281} 363}
282 364
283sub options { 365sub options {
284 my $self = shift; 366 my ($self) = @_;
367
368 return "" if $self->{invalidProblem};
369
285 return join("", 370 return join("",
286 CGI::start_form("POST", $self->{r}->uri), 371 CGI::start_form("POST", $self->{r}->uri),
287 $self->hidden_authen_fields, 372 $self->hidden_authen_fields,
288 CGI::hr(), 373 CGI::hr(),
289 CGI::start_div({class=>"viewOptions"}), 374 CGI::start_div({class=>"viewOptions"}),
… …
291 CGI::end_div(), 376 CGI::end_div(),
292 CGI::end_form() 377 CGI::end_form()
293 ); 378 );
294} 379}
295 380
296sub path { 381#sub path {
297 my $self = shift; 382# my $self = shift;
298 my $args = $_[-1]; 383# my $args = $_[-1];
299 my $setName = $self->{set}->set_id; 384# my $setName = $self->{set}->set_id;
300 my $problemNumber = $self->{problem}->problem_id; 385# my $problemNumber = $self->{problem}->problem_id;
301 386#
302 my $ce = $self->{ce}; 387# my $ce = $self->{ce};
303 my $root = $ce->{webworkURLs}->{root}; 388# my $root = $ce->{webworkURLs}->{root};
304 my $courseName = $ce->{courseName}; 389# my $courseName = $ce->{courseName};
305 return $self->pathMacro($args, 390# return $self->pathMacro($args,
306 "Home" => "$root", 391# "Home" => "$root",
307 $courseName => "$root/$courseName", 392# $courseName => "$root/$courseName",
308 $setName => "$root/$courseName/$setName", 393# $setName => "$root/$courseName/$setName",
309 "Problem $problemNumber" => "", 394# "Problem $problemNumber" => "",
310 ); 395# );
311} 396#}
312 397
313sub siblings { 398sub siblings {
314 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");
315 my $setName = $self->{set}->set_id; 408 my $setID = $self->{set}->set_id;
316 my $problemNumber = $self->{problem}->problem_id;
317
318 my $ce = $self->{ce};
319 my $db = $self->{db};
320 my $root = $ce->{webworkURLs}->{root};
321 my $courseName = $ce->{courseName};
322 print CGI::strong("Problems"), CGI::br();
323
324 my $effectiveUser = $self->{r}->param("effectiveUser"); 409 my $eUserID = $r->param("effectiveUser");
325 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
326 foreach my $problem (sort { $a <=> $b } @problemIDs) { 417 foreach my $problemID (@problemIDs) {
327 print '&nbsp;&nbsp;'.CGI::a({-href=>"$root/$courseName/$setName/".$problem."/?" 418 my $problemPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",
328 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}}, 419 courseID => $courseID, setID => $setID, problemID => $problemID);
329 "Problem ".$problem), CGI::br(); 420 print CGI::li(CGI::a({href=>$self->systemLink($problemPage)}, "Problem $problemID"));
330 } 421 }
331 422
423 print CGI::end_ul();
424 print CGI::end_li();
425 print CGI::end_ul();
426
332 return ""; 427 return "";
333} 428}
334 429
335sub nav { 430sub nav {
336 $WeBWorK::timer0->continue("begin nav subroutine") if $timer0_ON; 431 my ($self, $args) = @_;
337 my $self = shift;
338 my $args = $_[-1];
339 my $setName = $self->{set}->set_id;
340 my $problemNumber = $self->{problem}->problem_id;
341
342 my $ce = $self->{ce}; 432 my $r = $self->r;
343 my $db = $self->{db}; 433 my $db = $r->db;
344 my $root = $ce->{webworkURLs}->{root}; 434 my $urlpath = $r->urlpath;
345 my $courseName = $ce->{courseName};
346 435
347 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});
348 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
349 my $tail = "&displayMode=".$self->{displayMode}; 473 my $tail = "&displayMode=".$self->{displayMode};
350
351 my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList");
352
353 my @problemIDs = $db->listUserProblems($effectiveUser, $setName);
354 my ($prevID, $nextID);
355 foreach my $id (@problemIDs) {
356 $prevID = $id if $id < $problemNumber
357 and (not defined $prevID or $id > $prevID);
358 $nextID = $id if $id > $problemNumber
359 and (not defined $nextID or $id < $nextID);
360 }
361 unshift @links, "Previous Problem" , ($prevID
362 ? "$root/$courseName/$setName/".$prevID
363 : "") , "navPrev";
364 push @links, "Next Problem" , ($nextID
365 ? "$root/$courseName/$setName/".$nextID
366 : "") , "navNext";
367
368 my $result = $self->navMacro($args, $tail, @links); 474 return $self->navMacro($args, $tail, @links);
369 $WeBWorK::timer0->continue("end nav subroutine") if $timer0_ON;
370 return $result;
371} 475}
372 476
373sub title { 477sub title {
374 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
375 my $setName = $self->{set}->set_id; 484 #my $setID = $self->{set}->set_id;
376 my $problemNumber = $self->{problem}->problem_id; 485 #my $problemID = $self->{problem}->problem_id;
377 486
378 return "$setName : Problem $problemNumber"; 487 return "$setID : $problemID";
379} 488}
380 489
381sub body { 490sub body {
382 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 }
383 501
384 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
385 unless $self->{isOpen}; 507 unless ($self->{isOpen}) {
386 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 }
387 # unpack some useful variables 511 # unpack some useful variables
388 my $r = $self->{r};
389 my $db = $self->{db};
390 my $set = $self->{set}; 512 my $set = $self->{set};
391 my $problem = $self->{problem}; 513 my $problem = $self->{problem};
392 my $editMode = $self->{editMode}; 514 my $editMode = $self->{editMode};
393 my $permissionLevel = $self->{permissionLevel}; 515 my $permissionLevel = $self->{permissionLevel};
394 my $submitAnswers = $self->{submitAnswers}; 516 my $submitAnswers = $self->{submitAnswers};
… …
398 my %can = %{ $self->{can} }; 520 my %can = %{ $self->{can} };
399 my %must = %{ $self->{must} }; 521 my %must = %{ $self->{must} };
400 my %will = %{ $self->{will} }; 522 my %will = %{ $self->{will} };
401 my $pg = $self->{pg}; 523 my $pg = $self->{pg};
402 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
403 ##### translation errors? ##### 549 ##### translation errors? #####
404 550
405 if ($pg->{flags}->{error_flag}) { 551 if ($pg->{flags}->{error_flag}) {
406 return $self->errorOutput($pg->{errors}, $pg->{body_text}); 552 print $self->errorOutput($pg->{errors}, $pg->{body_text});
553 print $editorLink;
554 return "";
407 } 555 }
408 556
409 ##### answer processing ##### 557 ##### answer processing #####
410 $WeBWorK::timer0->continue("begin answer processing") if $timer0_ON; 558 $WeBWorK::timer->continue("begin answer processing") if defined($WeBWorK::timer);
411 # if answers were submitted: 559 # if answers were submitted:
412 my $scoreRecordedMessage; 560 my $scoreRecordedMessage;
561 my $pureProblem;
413 if ($submitAnswers) { 562 if ($submitAnswers) {
414 # get a "pure" (unmerged) UserProblem to modify 563 # get a "pure" (unmerged) UserProblem to modify
415 # 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
416 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
417 if (defined $pureProblem) { 566 if (defined $pureProblem) {
418 # store answers in DB for sticky answers 567 # store answers in DB for sticky answers
419 my %answersToStore; 568 my %answersToStore;
420 my %answerHash = %{ $pg->{answers} }; 569 my %answerHash = %{ $pg->{answers} };
421 $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!!
422 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);
423 my $answerString = encodeAnswers(%answersToStore, 581 my $answerString = encodeAnswers(%answersToStore,
424 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }); 582 @answer_order);
425 583
426 # store last answer to database 584 # store last answer to database
427 $problem->last_answer($answerString); 585 $problem->last_answer($answerString);
428 $pureProblem->last_answer($answerString); 586 $pureProblem->last_answer($answerString);
429 $db->putUserProblem($pureProblem); 587 $db->putUserProblem($pureProblem);
… …
471 } 629 }
472 630
473 # logging student answers 631 # logging student answers
474 632
475 my $answer_log = $self->{ce}->{courseFiles}->{logs}->{'answer_log'}; 633 my $answer_log = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
476 if ( defined($answer_log )) { 634 if ( defined($answer_log ) and defined($pureProblem)) {
477 if ($submitAnswers ) { 635 if ($submitAnswers ) {
478 my $answerString = ""; 636 my $answerString = "";
479 my %answerHash = %{ $pg->{answers} }; 637 my %answerHash = %{ $pg->{answers} };
480 $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.
481 foreach (sort keys %answerHash); 641 foreach (sort keys %answerHash) {
642 my $student_ans = $answerHash{$_}->{original_student_ans} ||'';
643 $answerString .= $student_ans."\t"
644 }
482 $answerString = '' unless defined($answerString); # insure string is defined. 645 $answerString = '' unless defined($answerString); # insure string is defined.
483 writeCourseLog($self->{ce}, "answer_log", 646 writeCourseLog($self->{ce}, "answer_log",
484 join("", 647 join("",
485 '|', $problem->user_id, 648 '|', $problem->user_id,
486 '|', $problem->set_id, 649 '|', $problem->set_id,
487 '|', $problem->problem_id, 650 '|', $problem->problem_id,
… …
492 ); 655 );
493 656
494 } 657 }
495 } 658 }
496 659
497 $WeBWorK::timer0->continue("end answer processing") if $timer0_ON; 660 $WeBWorK::timer->continue("end answer processing") if defined($WeBWorK::timer);
498 661
499 ##### output ##### 662 ##### output #####
500 663
501 print CGI::start_div({class=>"problemHeader"}); 664 print CGI::start_div({class=>"problemHeader"});
502 665
503 # custom message for editor 666 # custom message for editor
504 if ($permissionLevel >= 10 and defined $editMode) { 667 if ($permissionLevel >= 10 and defined $editMode) {
505 if ($editMode eq "temporaryFile") { 668 if ($editMode eq "temporaryFile") {
506 print CGI::p(CGI::i("Editing temporary file: ", $problem->source_file)); 669 print CGI::p(CGI::i("Editing temporary file: ", $problem->source_file));
507 } elsif ($editMode eq "savedFile") { 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 {
508 print CGI::p(CGI::i("Problem saved to: ", $problem->source_file)); 678 # print CGI::p(CGI::div({ class=>'ResultsWithoutError'}, "Problem saved to: ", $problem->source_file));
679 #}
509 } 680 }
510 } 681 }
511 682 #FIXME we need error messages here if the problem was really not saved.
512 # attempt summary 683 # attempt summary
513 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) ) {
514 # print this if user submitted answers OR requested correct answers 688 # print this if user submitted answers OR requested correct answers
689
515 print $self->attemptResults($pg, $submitAnswers, 690 print $self->attemptResults($pg, 1,
516 $will{showCorrectAnswers}, 691 $will{showCorrectAnswers},
517 $pg->{flags}->{showPartialCorrectAnswers}, 1, 1); 692 $pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
518 } elsif ($checkAnswers) { 693 } elsif ($checkAnswers) {
519 # 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() );
520 print $self->attemptResults($pg, 1, 0, 1, 1, 1); 696 print $self->attemptResults($pg, 1, $will{showCorrectAnswers}, 1, 1, 1);
521 # show attempt answers 697 # show attempt answers
522 # don't show correct answers 698 # show correct answers if asked
523 # show attempt results (correctness) 699 # show attempt results (correctness)
524 # don't show attempt previews 700 # show attempt previews
525 } elsif ($previewAnswers) { 701 } elsif ($previewAnswers) {
526 # print this if user previewed answers 702 # print this if user previewed answers
527 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);
528 # show attempt answers 704 # show attempt answers
529 # don't show correct answers 705 # don't show correct answers
530 # don't show attempt results (correctness) 706 # don't show attempt results (correctness)
531 # show attempt previews 707 # show attempt previews
532 } 708 }
533 709
534 print CGI::end_div(); 710 print CGI::end_div();
535 711
536 print CGI::start_div({class=>"problem"}); 712 print CGI::start_div({class=>"problem"});
537 713
538 # main form 714 # main form
539 print 715 print
540 CGI::startform("POST", $r->uri), 716 CGI::startform("POST", $r->uri),
541 $self->hidden_authen_fields, 717 $self->hidden_authen_fields,
542 CGI::p($pg->{body_text}), 718 CGI::p($pg->{body_text}),
… …
545 ($can{showCorrectAnswers} 721 ($can{showCorrectAnswers}
546 ? CGI::checkbox( 722 ? CGI::checkbox(
547 -name => "showCorrectAnswers", 723 -name => "showCorrectAnswers",
548 -checked => $will{showCorrectAnswers}, 724 -checked => $will{showCorrectAnswers},
549 -label => "Show correct answers", 725 -label => "Show correct answers",
550 ) . CGI::br() 726 ) ." "
551 : "" ), 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(),
552 CGI::submit(-name=>"previewAnswers", 742 CGI::submit(-name=>"previewAnswers",
553 -label=>"Preview Answers"), 743 -label=>"Preview Answers"),
554 ($can{recordAnswers} 744 ($can{recordAnswers}
555 ? CGI::submit(-name=>"submitAnswers", 745 ? CGI::submit(-name=>"submitAnswers",
556 -label=>"Submit Answers") 746 -label=>"Submit Answers")
557 : ""), 747 : ""),
558 ( ($can{checkAnswers} and not $can{recordAnswers}) 748 ( $can{checkAnswers}
559 ? CGI::submit(-name=>"checkAnswers", 749 ? CGI::submit(-name=>"checkAnswers",
560 -label=>"Check Answers") 750 -label=>"Check Answers")
561 : ""), 751 : ""),
562 ); 752 );
563 print CGI::end_div(); 753 print CGI::end_div();
… …
587 $setClosedMessage .= " However, 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.";
588 } else { 778 } else {
589 $setClosedMessage .= " Additional attempts will not be recorded."; 779 $setClosedMessage .= " Additional attempts will not be recorded.";
590 } 780 }
591 } 781 }
782
783 my $notCountedMessage = ($problem->value) ? "" : "(This problem will not count towards your grade.)";
592 print CGI::p( 784 print CGI::p(
593 $submitAnswers ? $scoreRecordedMessage . CGI::br() : "", 785 $submitAnswers ? $scoreRecordedMessage . CGI::br() : "",
594 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(), 786 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(),
595 $problem->attempted 787 $problem->attempted
596 ? "Your recorded score is $lastScore." . CGI::br() 788 ? "Your recorded score is $lastScore. $notCountedMessage" . CGI::br()
597 : "", 789 : "",
598 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining." 790 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining."
599 ); 791 );
600 print CGI::end_div(); 792 print CGI::end_div();
601 793
602 # save state for viewOptions 794 # save state for viewOptions
603 print CGI::hidden( 795 print CGI::hidden(
604 -name => "showOldAnswers", 796 -name => "showOldAnswers",
605 -value => $will{showOldAnswers} 797 -value => $will{showOldAnswers}
606 ), 798 ),
799
607 CGI::hidden( 800 CGI::hidden(
608 -name => "showCorrectAnswers",
609 -value => $will{showCorrectAnswers}
610 ),
611 CGI::hidden(
612 -name => "showHints",
613 -value => $will{showHints}),
614 CGI::hidden(
615 -name => "showSolutions",
616 -value => $will{showSolutions},
617 ),
618 CGI::hidden(
619 -name => "displayMode", 801 -name => "displayMode",
620 -value => $self->{displayMode} 802 -value => $self->{displayMode}
621 ); 803 );
622 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
623 # end of main form 814 # end of main form
624 print CGI::endform(); 815 print CGI::endform();
625 816
626 # stuff we need below (pull these out at the beginning?)
627 my $ce = $self->{ce};
628 my $root = $ce->{webworkURLs}->{root};
629 my $courseName = $ce->{courseName};
630
631 print CGI::start_div({class=>"problemFooter"}); 817 print CGI::start_div({class=>"problemFooter"});
632 818
633 # arguments for answer inspection button 819 ## arguments for answer inspection button
634 my $prof_url = $ce->{webworkURLs}->{oldProf}; 820 #my $prof_url = $ce->{webworkURLs}->{oldProf};
635 my $webworkURL = $ce->{webworkURLs}->{root}; 821 #my $webworkURL = $ce->{webworkURLs}->{root};
636 my $cgi_url = $prof_url; 822 #my $cgi_url = $prof_url;
637 $cgi_url=~ s|/[^/]*$||; # clip profLogin.pl 823 #$cgi_url=~ s|/[^/]*$||; # clip profLogin.pl
638 my $authen_args = $self->url_authen_args(); 824 #my $authen_args = $self->url_authen_args();
639 my $showPastAnswersURL = "$webworkURL/$courseName/instructor/show_answers/"; 825 #my $showPastAnswersURL = "$webworkURL/$courseName/instructor/show_answers/";
640 826
827 my $pastAnswersPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ShowAnswers",
828 courseID => $courseName);
829 my $showPastAnswersURL = $self->systemLink($pastAnswersPage, authen => 0); # no authen info for form action
830
641 # print answer inspection button 831 # print answer inspection button
642 if ($self->{permissionLevel} > 0) { 832 if ($self->{permissionLevel} > 0) {
643 print "\n", 833 print "\n",
644 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n", 834 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
645 $self->hidden_authen_fields,"\n", 835 $self->hidden_authen_fields,"\n",
646 CGI::hidden(-name => 'course', -value=>$courseName), "\n", 836 CGI::hidden(-name => 'courseID', -value=>$courseName), "\n",
647 CGI::hidden(-name => 'problemNumber', -value=>$problem->problem_id), "\n", 837 CGI::hidden(-name => 'problemID', -value=>$problem->problem_id), "\n",
648 CGI::hidden(-name => 'setName', -value=>$problem->set_id), "\n", 838 CGI::hidden(-name => 'setID', -value=>$problem->set_id), "\n",
649 CGI::hidden(-name => 'studentUser', -value=>$problem->user_id), "\n", 839 CGI::hidden(-name => 'studentUser', -value=>$problem->user_id), "\n",
650 CGI::p( {-align=>"left"}, 840 CGI::p( {-align=>"left"},
651 CGI::submit(-name => 'action', -value=>'Show Past Answers') 841 CGI::submit(-name => 'action', -value=>'Show Past Answers')
652 ), "\n", 842 ), "\n",
653 CGI::endform(); 843 CGI::endform();
654 } 844 }
655 845
656 #print CGI::end_div(); 846 ## arguments for feedback form
847 #my $feedbackURL = "$root/$courseName/feedback/";
657 # 848 #
658 #print CGI::start_div(); 849 ##print feedback form
659 850 #print
660 # arguments for feedback form 851 # CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
661 my $feedbackURL = "$root/$courseName/feedback/"; 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
662 870
663 #print feedback form 871 #print feedback form
664 print 872 print
665 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n", 873 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
666 $self->hidden_authen_fields,"\n", 874 $self->hidden_authen_fields,"\n",
… …
671 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n", 879 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
672 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n", 880 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
673 CGI::hidden("showHints", $will{showHints}),"\n", 881 CGI::hidden("showHints", $will{showHints}),"\n",
674 CGI::hidden("showSolutions", $will{showSolutions}),"\n", 882 CGI::hidden("showSolutions", $will{showSolutions}),"\n",
675 CGI::p({-align=>"left"}, 883 CGI::p({-align=>"left"},
676 CGI::submit(-name=>"feedbackForm", -label=>"Contact instructor") 884 CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
677 ), 885 ),
678 CGI::endform(),"\n"; 886 CGI::endform(),"\n";
679 887
680 # FIXME print editor link 888 # FIXME print editor link
681 # 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.
682 if ($self->{permissionLevel}>=10 and ( (not defined($self->{edit_mode})) or $self->{edit_mode} eq 'savedFile') ) {
683 print CGI::a({-href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".$set->set_id.
684 '/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
685 }
686 890
687 print CGI::end_div(); 891 print CGI::end_div();
688 892
689 # warning output 893 # warning output
690 #if ($pg->{warnings} ne "") { 894 #if ($pg->{warnings} ne "") {
… …
711 return ""; 915 return "";
712} 916}
713 917
714##### output utilities ##### 918##### output utilities #####
715 919
716sub attemptResults($$$$$$) { 920sub attemptResults {
717 my $self = shift; 921 my $self = shift;
718 my $pg = shift; 922 my $pg = shift;
719 my $showAttemptAnswers = shift; 923 my $showAttemptAnswers = shift;
720 my $showCorrectAnswers = shift; 924 my $showCorrectAnswers = shift;
721 my $showAttemptResults = $showAttemptAnswers && shift; 925 my $showAttemptResults = $showAttemptAnswers && shift;
722 my $showSummary = shift; 926 my $showSummary = shift;
723 my $showAttemptPreview = shift || 0; 927 my $showAttemptPreview = shift || 0;
928
724 my $ce = $self->{ce}; 929 my $ce = $self->r->ce;
930
725 my $problemResult = $pg->{result}; # the overall result of the problem 931 my $problemResult = $pg->{result}; # the overall result of the problem
726 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }; 932 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
727 933
728 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames; 934 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
729 935
730 my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview"; 936 my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview";
731 my $imgGen = WeBWorK::PG::ImageGenerator->new( 937 my $imgGen = WeBWorK::PG::ImageGenerator->new(
732 tempDir => $ce->{webworkDirs}->{tmp}, 938 tempDir => $ce->{webworkDirs}->{tmp},
733 dir => $ce->{courseDirs}->{html_temp},
734 url => $ce->{courseURLs}->{html_temp},
735 basename => $basename,
736 latex => $ce->{externalPrograms}->{latex}, 939 latex => $ce->{externalPrograms}->{latex},
737 dvipng => $ce->{externalPrograms}->{dvipng}, 940 dvipng => $ce->{externalPrograms}->{dvipng},
941 useCache => 1,
942 cacheDir => $ce->{webworkDirs}->{equationCache},
943 cacheURL => $ce->{webworkURLs}->{equationCache},
944 cacheDB => $ce->{webworkFiles}->{equationCacheDB},
738 ); 945 );
739 946
740 my $header; 947 my $header;
741 #$header .= CGI::th("Part"); 948 #$header .= CGI::th("Part");
742 $header .= $showAttemptAnswers ? CGI::th("Entered") : ""; 949 $header .= $showAttemptAnswers ? CGI::th("Entered") : "";
743 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : ""; 950 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : "";
744 $header .= $showCorrectAnswers ? CGI::th("Correct") : ""; 951 $header .= $showCorrectAnswers ? CGI::th("Correct") : "";
745 $header .= $showAttemptResults ? CGI::th("Result") : ""; 952 $header .= $showAttemptResults ? CGI::th("Result") : "";
746 $header .= $showMessages ? CGI::th("messages") : ""; 953 $header .= $showMessages ? CGI::th("Messages") : "";
747 my @tableRows = ( $header ); 954 my @tableRows = ( $header );
748 my $numCorrect; 955 my $numCorrect;
749 foreach my $name (@answerNames) { 956 foreach my $name (@answerNames) {
750 my $answerResult = $pg->{answers}->{$name}; 957 my $answerResult = $pg->{answers}->{$name};
751 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans 958 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
… …
753 ? $self->previewAnswer($answerResult, $imgGen) 960 ? $self->previewAnswer($answerResult, $imgGen)
754 : ""); 961 : "");
755 my $correctAnswer = $answerResult->{correct_ans}; 962 my $correctAnswer = $answerResult->{correct_ans};
756 my $answerScore = $answerResult->{score}; 963 my $answerScore = $answerResult->{score};
757 my $answerMessage = $showMessages ? $answerResult->{ans_message} : ""; 964 my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
758 965 #FIXME --Can we be sure that $answerScore is an integer-- could the problem give partial credit?
759 $numCorrect += $answerScore > 0; 966 $numCorrect += $answerScore > 0;
760 my $resultString = $answerScore ? "correct" : "incorrect"; 967 my $resultString = $answerScore == 1 ? "correct" : "incorrect";
761 968
762 # 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
763 # 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"
764 $name =~ s/^AnSwEr//; 971 #$name =~ s/^AnSwEr//;
765 972
766 my $row; 973 my $row;
767 #$row .= CGI::td($name); 974 #$row .= CGI::td($name);
768 $row .= $showAttemptAnswers ? CGI::td(nbsp($studentAnswer)) : ""; 975 $row .= $showAttemptAnswers ? CGI::td($self->nbsp($studentAnswer)) : "";
769 $row .= $showAttemptPreview ? CGI::td(nbsp($preview)) : ""; 976 $row .= $showAttemptPreview ? CGI::td($self->nbsp($preview)) : "";
770 $row .= $showCorrectAnswers ? CGI::td(nbsp($correctAnswer)) : ""; 977 $row .= $showCorrectAnswers ? CGI::td($self->nbsp($correctAnswer)) : "";
771 $row .= $showAttemptResults ? CGI::td(nbsp($resultString)) : ""; 978 $row .= $showAttemptResults ? CGI::td($self->nbsp($resultString)) : "";
772 $row .= $answerMessage ? CGI::td(nbsp($answerMessage)) : ""; 979 $row .= $showMessages ? CGI::td($self->nbsp($answerMessage)) : "";
773 push @tableRows, $row; 980 push @tableRows, $row;
774 } 981 }
775 982
776 # render equation images 983 # render equation images
777 $imgGen->render(refresh => 1); 984 $imgGen->render(refresh => 1);
778 985
779 my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions"; 986# my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
780 my $scorePercent = sprintf("%.0f%%", $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.
781 my $summary = "On this attempt, you answered $numCorrect out of " 989# my $summary = "On this attempt, you answered $numCorrect out of "
782 . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent."; 990# . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
783 return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p({class=>'emphasis'},$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) : "");
784} 1009}
1010
785sub nbsp { 1011#sub nbsp {
786 my $str = shift; 1012# my $str = shift;
787 ($str =~/\S/) ? $str : '&nbsp;' ; # returns non-breaking space for empty strings 1013# ($str =~/\S/) ? $str : '&nbsp;' ; # returns non-breaking space for empty strings
788 # tricky cases: $str =0; 1014# # tricky cases: $str =0;
789 # $str is a complex number 1015# # $str is a complex number
790} 1016#}
1017
791sub viewOptions($) { 1018sub viewOptions {
792 my $self = shift; 1019 my ($self) = @_;
1020
793 my $displayMode = $self->{displayMode}; 1021 my $displayMode = $self->{displayMode};
794 my %must = %{ $self->{must} }; 1022 my %must = %{ $self->{must} };
795 my %can = %{ $self->{can} }; 1023 my %can = %{ $self->{can} };
796 my %will = %{ $self->{will} }; 1024 my %will = %{ $self->{will} };
797 1025
… …
801 CGI::checkbox( 1029 CGI::checkbox(
802 -name => "showOldAnswers", 1030 -name => "showOldAnswers",
803 -checked => $will{showOldAnswers}, 1031 -checked => $will{showOldAnswers},
804 -label => "Saved answers", 1032 -label => "Saved answers",
805 ), "&nbsp;&nbsp;".CGI::br(); 1033 ), "&nbsp;&nbsp;".CGI::br();
806 $can{showHints} and $optionLine .= join "", 1034
807 CGI::checkbox(
808 -name => "showHints",
809 -checked => $will{showHints},
810 -label => "Hints",
811 ), "&nbsp;&nbsp;".CGI::br();
812 $can{showSolutions} and $optionLine .= join "",
813 CGI::checkbox(
814 -name => "showSolutions",
815 -checked => $will{showSolutions},
816 -label => "Solutions",
817 ), "&nbsp;&nbsp;".CGI::br();
818 $optionLine and $optionLine .= join "", CGI::br(); 1035 $optionLine and $optionLine .= join "", CGI::br();
819 1036
820 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"},
821 "View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;".CGI::br(), 1038 "View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;".CGI::br(),
822 CGI::radio_group( 1039 CGI::radio_group(
823 -name => "displayMode", 1040 -name => "displayMode",
824 -values => ['plainText', 'formattedText', 'images'], 1041 -values => ['plainText', 'formattedText', 'images', 'jsMath'],
825 -default => $displayMode, 1042 -default => $displayMode,
826 -linebreak=>'true', 1043 -linebreak=>'true',
827 -labels => { 1044 -labels => {
828 plainText => "plain", 1045 plainText => "plain",
829 formattedText => "formatted", 1046 formattedText => "formatted",
830 images => "images", 1047 images => "images",
1048 jsMath => "jsMath",
831 } 1049 }
832 ), CGI::br(),CGI::hr(), 1050 ), CGI::br(),CGI::hr(),
833 $optionLine, 1051 $optionLine,
834 CGI::submit(-name=>"redisplay", -label=>"Save Options"), 1052 CGI::submit(-name=>"redisplay", -label=>"Save Options"),
835 ); 1053 );
836} 1054}
837 1055
838sub previewAnswer($$) { 1056sub previewAnswer {
839 my ($self, $answerResult, $imgGen) = @_; 1057 my ($self, $answerResult, $imgGen) = @_;
840 my $ce = $self->{ce}; 1058 my $ce = $self->r->ce;
841 my $effectiveUser = $self->{effectiveUser}; 1059 my $effectiveUser = $self->{effectiveUser};
842 my $set = $self->{set}; 1060 my $set = $self->{set};
843 my $problem = $self->{problem}; 1061 my $problem = $self->{problem};
844 my $displayMode = $self->{displayMode}; 1062 my $displayMode = $self->{displayMode};
845 1063
… …
865 if ($?) { 1083 if ($?) {
866 return "<b>[tth failed: $? $@]</b>"; 1084 return "<b>[tth failed: $? $@]</b>";
867 } 1085 }
868 return $result; 1086 return $result;
869 } elsif ($displayMode eq "images") { 1087 } elsif ($displayMode eq "images") {
870 ## how are we going to name this?
871 #my $targetPathCommon = "/m2i/"
872 # . $effectiveUser->user_id . "."
873 # . $set->set_id . "."
874 # . $problem->problem_id . "."
875 # . $answerResult->{ans_name} . ".png";
876 #
877 ## figure out where to put things
878 #my $wd = makeTempDirectory($ce->{courseDirs}->{html_temp}, "webwork-dvipng");
879 #my $latex = $ce->{externalPrograms}->{latex};
880 #my $dvipng = $ce->{externalPrograms}->{dvipng};
881 #my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
882 # # should use surePathToTmpFile, but we have to
883 # # isolate it from the problem enivronment first
884 #my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
885 #
886 ## call dvipng to generate a preview
887 #dvipng($wd, $latex, $dvipng, $tex, $targetPath);
888 #rmtree($wd, 0, 0);
889 #if (-e $targetPath) {
890 # return "<img src=\"$targetURL\" alt=\"$tex\" />";
891 #} else {
892 # return "<b>[math2img failed]</b>";
893 #}
894 $imgGen->add($answerResult->{preview_latex_string}); 1088 $imgGen->add($answerResult->{preview_latex_string});
895
896 } 1089 }
897} 1090}
898
899##### logging subroutine ####
900
901
902 1091
903##### permission queries ##### 1092##### permission queries #####
904 1093
905# this stuff should be abstracted out into the permissions system 1094# this stuff should be abstracted out into the permissions system
906# however, the permission system only knows about things in the 1095# however, the permission system only knows about things in the
907# course environment and the username. hmmm... 1096# course environment and the username. hmmm...
908 1097
909# 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
910# format -- perhaps: 1099# format -- perhaps:
911# canPERM($courseEnv, $user, $set, $problem, $permissionLevel) 1100# canPERM($ce, $user, $set, $problem, $permissionLevel)
912 1101
913sub canShowCorrectAnswers($$) { 1102sub canShowCorrectAnswers($$) {
914 my ($permissionLevel, $answerDate) = @_; 1103 my ($permissionLevel, $answerDate) = @_;
915 return $permissionLevel > 0 || time > $answerDate; 1104 return $permissionLevel > 0 || time > $answerDate;
916} 1105}
… …
940sub mustRecordAnswers($) { 1129sub mustRecordAnswers($) {
941 my ($permissionLevel) = @_; 1130 my ($permissionLevel) = @_;
942 return $permissionLevel == 0; 1131 return $permissionLevel == 0;
943} 1132}
944 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}
9451; 11411;
Legend:
Removed from v.1465  
changed lines
  Added in v.2166
aubreyja at gmail dot com
 ViewVC Help
Powered by ViewVC 1.0.9