[system] / trunk / webwork-modperl / lib / WeBWorK / ContentGenerator / Problem.pm Repository:
ViewVC logotype

Diff of /trunk/webwork-modperl/lib/WeBWorK/ContentGenerator/Problem.pm

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

Revision 671 Revision 1197
… …
2# WeBWorK mod_perl (c) 2000-2002 WeBWorK Project 2# WeBWorK mod_perl (c) 2000-2002 WeBWorK Project
3# $Id$ 3# $Id$
4################################################################################ 4################################################################################
5 5
6package WeBWorK::ContentGenerator::Problem; 6package WeBWorK::ContentGenerator::Problem;
7use base qw(WeBWorK::ContentGenerator);
7 8
8=head1 NAME 9=head1 NAME
9 10
10WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem. 11WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem.
11 12
12=cut 13=cut
13 14
14use strict; 15use strict;
15use warnings; 16use warnings;
16use base qw(WeBWorK::ContentGenerator);
17use CGI qw(); 17use CGI qw();
18use File::Temp qw(tempdir); 18use File::Path qw(rmtree);
19use WeBWorK::Form; 19use WeBWorK::Form;
20use WeBWorK::PG; 20use WeBWorK::PG;
21use WeBWorK::PG::IO; 21use WeBWorK::PG::IO;
22use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string); 22use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string makeTempDirectory);
23 23use WeBWorK::DB::Utils qw(global2user user2global findDefaults);
24use WeBWorK::Timing;
24############################################################ 25############################################################
25# 26#
26# user 27# user
28# effectiveUser
27# key 29# key
28# 30#
29# displayMode 31# displayMode
30# showOldAnswers 32# showOldAnswers
31# showCorrectAnswers 33# showCorrectAnswers
… …
34# 36#
35# AnSwEr# - answer blanks in problem 37# AnSwEr# - answer blanks in problem
36# 38#
37# redisplay - name of the "Redisplay Problem" button 39# redisplay - name of the "Redisplay Problem" button
38# submitAnswers - name of "Submit Answers" button 40# submitAnswers - name of "Submit Answers" button
41# checkAnswers - name of the "Check Answers" button
42# previewAnswers - name of the "Preview Answers" button
39# 43#
40############################################################ 44############################################################
41 45
42sub pre_header_initialize { 46sub pre_header_initialize {
43 my ($self, $setName, $problemNumber) = @_; 47 my ($self, $setName, $problemNumber) = @_;
44 my $courseEnv = $self->{courseEnvironment}; 48 my $r = $self->{r};
45 my $r = $self->{r}; 49 my $courseEnv = $self->{ce};
50 my $db = $self->{db};
46 my $userName = $r->param('user'); 51 my $userName = $r->param('user');
47 52 my $effectiveUserName = $r->param('effectiveUser');
48 ##### database setup ##### 53 my $key = $r->param('key');
49
50 my $cldb = WeBWorK::DB::Classlist->new($courseEnv);
51 my $wwdb = WeBWorK::DB::WW->new($courseEnv);
52 my $authdb = WeBWorK::DB::Auth->new($courseEnv);
53
54 my $user = $cldb->getUser($userName); 54 my $user = $db->getUser($userName);
55 my $set = $wwdb->getSet($userName, $setName); 55 my $effectiveUser = $db->getUser($effectiveUserName);
56 my $permissionLevel = $db->getPermissionLevel($userName)->permission();
57
58 # obtain the merged set for $effectiveUser
59 my $set = $db->getMergedSet($effectiveUserName, $setName);
60
61 # obtain the merged problem for $effectiveUser
56 my $problem = $wwdb->getProblem($userName, $setName, $problemNumber); 62 my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber);
57 my $psvn = $wwdb->getPSVN($userName, $setName); 63
58 my $permissionLevel = $authdb->getPermissions($userName); 64 my $editMode = $r->param("editMode");
65
66 if ($permissionLevel > 0 and defined $editMode) {
67 # professors are allowed to fabricate sets and problems not
68 # assigned to them (or anyone). this allows them to use the
69 # editor to
70
71 # if that is not yet defined obtain the global set, convert
72 # it to a user set, and add fake user data
73 unless (defined $set) {
74 my $userSetClass = $db->{set_user}->{record};
75 $set = global2user($userSetClass,
76 $db->getGlobalSet($setName));
77 die "Set $setName does not exist"
78 unless defined $set;
79 $set->psvn(0);
80 }
81
82 # if that is not yet defined obtain the global problem,
83 # convert it to a user problem, and add fake user data
84 unless (defined $problem) {
85 my $userProblemClass = $db->{problem_user}->{record};
86 $problem = global2user($userProblemClass,
87 $db->getGlobalProblem($setName,$problemNumber));
88 die "Problem $problemNumber in set $setName does not exist"
89 unless defined $problem;
90 $problem->user_id($effectiveUserName);
91 $problem->problem_seed(0);
92 $problem->status(0);
93 $problem->attempted(0);
94 $problem->last_answer("");
95 $problem->num_correct(0);
96 $problem->num_incorrect(0);
97 }
98
99 # now we're sure we have valid UserSet and UserProblem objects
100 # yay!
101
102 # now deal with possible editor overrides:
103
104 # if the caller is asking to override the source file, and
105 # editMode calls for a temporary file, do so
106 my $sourceFilePath = $r->param("sourceFilePath");
107 if (defined $sourceFilePath and $editMode eq "temporaryFile") {
108 $problem->source_file($sourceFilePath);
109 }
110
111 # if the caller is asking to override the problem seed, do so
112 my $problemSeed = $r->param("problemSeed");
113 if (defined $problemSeed) {
114 $problem->problem_seed($problemSeed);
115 }
116 } else {
117 # students can't view problems not assigned to them
118 die "Set $setName is not assigned to $effectiveUserName"
119 unless defined $set;
120 die "Problem $problemNumber in set $setName is not assigned to $effectiveUserName"
121 unless defined $problem;
122 }
123
124 $self->{userName} = $userName;
125 $self->{effectiveUserName} = $effectiveUserName;
126 $self->{user} = $user;
127 $self->{effectiveUser} = $effectiveUser;
128 $self->{permissionLevel} = $permissionLevel;
129 $self->{set} = $set;
130 $self->{problem} = $problem;
131 $self->{editMode} = $editMode;
59 132
60 ##### form processing ##### 133 ##### form processing #####
61 134
62 # set options from form fields (see comment at top of file for names) 135 # set options from form fields (see comment at top of file for names)
63 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode}; 136 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode};
64 my $redisplay = $r->param("redisplay"); 137 my $redisplay = $r->param("redisplay");
65 my $submitAnswers = $r->param("submitAnswers"); 138 my $submitAnswers = $r->param("submitAnswers");
139 my $checkAnswers = $r->param("checkAnswers");
66 my $previewAnswers = $r->param("previewAnswers"); 140 my $previewAnswers = $r->param("previewAnswers");
141
142 # fields which may be defined when using Problem Editor
143 #my $override_seed = ($permissionLevel>=10) ? $r->param('problemSeed') : undef;
144 #my $override_problem_source = ($permissionLevel>=10) ? $r->param('sourceFilePath') : undef;
145 #my $editMode = undef;
146 #my $submit_button = $r->param('submit_button');
147 #if ( defined($submit_button ) ) {
148 # $editMode = "temporaryFile" if $submit_button eq 'Refresh';
149 # $editMode = 'savedFile' if $submit_button eq 'Save';
150 #}
151 #
152 ##override using the source file data from the form field
153 #$problem->source_file($override_problem_source) if defined($override_problem_source);
154 #$problem->problem_seed($override_seed) if defined($override_seed);
155 #
156 ## store path to source file for title.
157 #$self->{problem_source_name} = $problem->source_file;
158 #$self->{edit_mode} = $editMode;
159 #$self->{current_problem_source} = (defined($override_problem_source) ) ?
67 160
68 # coerce form fields into CGI::Vars format 161 # coerce form fields into CGI::Vars format
69 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars }; 162 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
70 163
164 $self->{displayMode} = $displayMode;
165 $self->{redisplay} = $redisplay;
166 $self->{submitAnswers} = $submitAnswers;
167 $self->{checkAnswers} = $checkAnswers;
168 $self->{previewAnswers} = $previewAnswers;
169 $self->{formFields} = $formFields;
170
71 ##### permissions ##### 171 ##### permissions #####
172
173 # are we allowed to view this problem?
174 $self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
175 return unless $self->{isOpen};
72 176
73 # what does the user want to do? 177 # what does the user want to do?
74 my %want = ( 178 my %want = (
75 showOldAnswers => $r->param("showOldAnswers") || $courseEnv->{pg}->{options}->{showOldAnswers}, 179 showOldAnswers => $r->param("showOldAnswers") || $courseEnv->{pg}->{options}->{showOldAnswers},
76 showCorrectAnswers => $r->param("showCorrectAnswers") || $courseEnv->{pg}->{options}->{showCorrectAnswers}, 180 showCorrectAnswers => $r->param("showCorrectAnswers") || $courseEnv->{pg}->{options}->{showCorrectAnswers},
77 showHints => $r->param("showHints") || $courseEnv->{pg}->{options}->{showHints}, 181 showHints => $r->param("showHints") || $courseEnv->{pg}->{options}->{showHints},
78 showSolutions => $r->param("showSolutions") || $courseEnv->{pg}->{options}->{showSolutions}, 182 showSolutions => $r->param("showSolutions") || $courseEnv->{pg}->{options}->{showSolutions},
79 recordAnswers => $r->param("recordAnswers") || 1, 183 recordAnswers => $submitAnswers,
184 checkAnswers => $checkAnswers,
80 ); 185 );
81 186
82 # are certain options enforced? 187 # are certain options enforced?
83 my %must = ( 188 my %must = (
84 showOldAnswers => 0, 189 showOldAnswers => 0,
85 showCorrectAnswers => 0, 190 showCorrectAnswers => 0,
86 showHints => 0, 191 showHints => 0,
87 showSolutions => 0, 192 showSolutions => 0,
88 recordAnswers => mustRecordAnswers($permissionLevel), 193 recordAnswers => mustRecordAnswers($permissionLevel),
194 checkAnswers => 0,
89 ); 195 );
90 196
91 # does the user have permission to use certain options? 197 # does the user have permission to use certain options?
92 my %can = ( 198 my %can = (
93 showOldAnswers => 1, 199 showOldAnswers => 1,
94 showCorrectAnswers => canShowCorrectAnswers($permissionLevel, $set->answer_date), 200 showCorrectAnswers => canShowCorrectAnswers($permissionLevel, $set->answer_date),
95 showHints => 1, 201 showHints => 1,
96 showSolutions => canShowSolutions($permissionLevel, $set->answer_date), 202 showSolutions => canShowSolutions($permissionLevel, $set->answer_date),
97 recordAnswers => canRecordAnswers($permissionLevel, $set->open_date, $set->due_date, 203 recordAnswers => canRecordAnswers($permissionLevel, $set->open_date, $set->due_date,
98 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1), 204 $problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1),
99 # num_correct+num_incorrect+1 -- as this happens before updating $problem 205 # attempts=num_correct+num_incorrect+1, as this happens before updating $problem
206 checkAnswers => canCheckAnswers($permissionLevel, $set->answer_date),
100 ); 207 );
101 208
102 # final values for options 209 # final values for options
103 my %will; 210 my %will;
104 foreach (keys %must) { 211 foreach (keys %must) {
105 $will{$_} = $can{$_} && ($want{$_} || $must{$_}); 212 $will{$_} = $can{$_} && ($want{$_} || $must{$_});
106 #warn "$_: can? $can{$_} want? $want{$_} must? $must{$_} will? $will{$_}\n";
107 } 213 }
108 214
109 ##### sticky answers ##### 215 ##### sticky answers #####
110 216
111 if (not $submitAnswers and $will{showOldAnswers}) { 217 if (not $submitAnswers and $will{showOldAnswers}) {
… …
116 222
117 ##### translation ##### 223 ##### translation #####
118 224
119 my $pg = WeBWorK::PG->new( 225 my $pg = WeBWorK::PG->new(
120 $courseEnv, 226 $courseEnv,
121 $user, 227 $effectiveUser,
122 $r->param('key'), 228 $key,
123 $set, 229 $set,
124 $problem, 230 $problem,
125 $psvn, 231 $set->psvn, # FIXME: this field should be removed
126 $formFields, 232 $formFields,
127 { # translation options 233 { # translation options
128 displayMode => $displayMode, 234 displayMode => $displayMode,
129 showHints => $will{showHints}, 235 showHints => $will{showHints},
130 showSolutions => $will{showSolutions}, 236 showSolutions => $will{showSolutions},
131 refreshMath2img => $will{showHints} || $will{showSolutions}, 237 refreshMath2img => $will{showHints} || $will{showSolutions},
132 # try leaving processAnswers on all the time? 238 processAnswers => 1,
133 processAnswers => 1, #$submitAnswers ? 1 : 0,
134 }, 239 },
135 ); 240 );
136 241
242 ##### fix hint/solution options #####
243
244 $can{showHints} &&= $pg->{flags}->{hintExists};
245 $can{showSolutions} &&= $pg->{flags}->{solutionExists};
246
137 ##### store fields ##### 247 ##### store fields #####
138
139 $self->{cldb} = $cldb;
140 $self->{wwdb} = $wwdb;
141 $self->{authdb} = $authdb;
142
143 $self->{user} = $user;
144 $self->{set} = $set;
145 $self->{problem} = $problem;
146 $self->{permissionLevel} = $permissionLevel;
147
148 $self->{displayMode} = $displayMode;
149 $self->{redisplay} = $redisplay;
150 $self->{submitAnswers} = $submitAnswers;
151 $self->{previewAnswers} = $previewAnswers;
152 $self->{formFields} = $formFields;
153 248
154 $self->{want} = \%want; 249 $self->{want} = \%want;
155 $self->{must} = \%must; 250 $self->{must} = \%must;
156 $self->{can} = \%can; 251 $self->{can} = \%can;
157 $self->{will} = \%will; 252 $self->{will} = \%will;
158 253
159 $self->{pg} = $pg; 254 $self->{pg} = $pg;
160} 255}
161 256
162sub if_warnings($$) { 257#sub if_warnings($$) {
163 my ($self, $arg) = @_; 258# my ($self, $arg) = @_;
259# return 0 unless $self->{isOpen};
164 return $self->{pg}->{warnings} ne ""; 260# return $self->{pg}->{warnings} ne "";
165} 261#}
166 262
167sub if_errors($$) { 263sub if_errors($$) {
168 my ($self, $arg) = @_; 264 my ($self, $arg) = @_;
265 return 0 unless $self->{isOpen};
169 return $self->{pg}->{flags}->{error_flag}; 266 return $self->{pg}->{flags}->{error_flag};
170} 267}
171 268
172sub head { 269sub head {
173 my $self = shift; 270 my $self = shift;
174 271 return "" unless $self->{isOpen};
175 return $self->{pg}->{head_text} if $self->{pg}->{head_text}; 272 return $self->{pg}->{head_text} if $self->{pg}->{head_text};
273}
274
275sub options {
276 my $self = shift;
277 return join("",
278 CGI::start_form("POST", $self->{r}->uri),
279 $self->hidden_authen_fields,
280 CGI::hr(),
281 CGI::start_div({class=>"viewOptions"}),
282 $self->viewOptions(),
283 CGI::end_div(),
284 CGI::end_form()
285 );
176} 286}
177 287
178sub path { 288sub path {
179 my $self = shift; 289 my $self = shift;
180 my $args = $_[-1]; 290 my $args = $_[-1];
181 my $setName = $self->{set}->id; 291 my $setName = $self->{set}->set_id;
182 my $problemNumber = $self->{problem}->id; 292 my $problemNumber = $self->{problem}->problem_id;
183 293
184 my $ce = $self->{courseEnvironment}; 294 my $ce = $self->{ce};
185 my $root = $ce->{webworkURLs}->{root}; 295 my $root = $ce->{webworkURLs}->{root};
186 my $courseName = $ce->{courseName}; 296 my $courseName = $ce->{courseName};
187 return $self->pathMacro($args, 297 return $self->pathMacro($args,
188 "Home" => "$root", 298 "Home" => "$root",
189 $courseName => "$root/$courseName", 299 $courseName => "$root/$courseName",
… …
192 ); 302 );
193} 303}
194 304
195sub siblings { 305sub siblings {
196 my $self = shift; 306 my $self = shift;
197 my $setName = $self->{set}->id; 307 my $setName = $self->{set}->set_id;
198 my $problemNumber = $self->{problem}->id; 308 my $problemNumber = $self->{problem}->problem_id;
199 309
200 my $ce = $self->{courseEnvironment}; 310 my $ce = $self->{ce};
311 my $db = $self->{db};
201 my $root = $ce->{webworkURLs}->{root}; 312 my $root = $ce->{webworkURLs}->{root};
202 my $courseName = $ce->{courseName}; 313 my $courseName = $ce->{courseName};
203 314 my $timer0 = WeBWorK::Timing->new("time siblings");
315 $timer0->start;
204 print CGI::strong("Problems"), CGI::br(); 316 print CGI::strong("Problems"), CGI::br();
205 317
206 my $wwdb = $self->{wwdb};
207 my $user = $self->{r}->param("user"); 318 my $effectiveUser = $self->{r}->param("effectiveUser");
208 my @problems; 319 my @problems;
209 push @problems, $wwdb->getProblem($user, $setName, $_) 320# push @problems, $db->getMergedProblem($effectiveUser, $setName, $_)
210 foreach ($wwdb->getProblems($user, $setName)); 321# foreach ($db->listUserProblems($effectiveUser, $setName));
322 @problems = $db->listUserProblems($effectiveUser, $setName); # this is much faster
323# foreach my $problem (sort { $a->problem_id <=> $b->problem_id } @problems) {
211 foreach my $problem (sort { $a->id <=> $b->id } @problems) { 324 foreach my $problem (sort { $a <=> $b } @problems) {
212 print CGI::a({-href=>"$root/$courseName/$setName/".$problem->id."/?" 325 print CGI::a({-href=>"$root/$courseName/$setName/".$problem."/?"
213 . $self->url_authen_args}, "Problem ".$problem->id), CGI::br(); 326 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}},
327 "Problem ".$problem), CGI::br();
214 } 328 }
329 $timer0->stop;
330 $timer0->save;
331 '';
215} 332}
216 333
217sub nav { 334sub nav {
218 my $self = shift; 335 my $self = shift;
219 my $args = $_[-1]; 336 my $args = $_[-1];
220 my $setName = $self->{set}->id; 337 my $setName = $self->{set}->set_id;
221 my $problemNumber = $self->{problem}->id; 338 my $problemNumber = $self->{problem}->problem_id;
222 339
223 my $ce = $self->{courseEnvironment}; 340 my $ce = $self->{ce};
341 my $db = $self->{db};
224 my $root = $ce->{webworkURLs}->{root}; 342 my $root = $ce->{webworkURLs}->{root};
225 my $courseName = $ce->{courseName}; 343 my $courseName = $ce->{courseName};
226 344
227 my $wwdb = $self->{wwdb}; 345 my $wwdb = $self->{wwdb};
228 my $user = $self->{r}->param("user"); 346 my $effectiveUser = $self->{r}->param("effectiveUser");
347 my $tail = "&displayMode=".$self->{displayMode};
229 348
230 my @links = ("Problem List" => "$root/$courseName/$setName"); 349 my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList");
231 350
351 # FIXME: this could be faster
232 my $prevProblem = $wwdb->getProblem($user, $setName, $problemNumber-1); 352 my $prevProblem = $db->getMergedProblem($effectiveUser, $setName, $problemNumber-1);
233 my $nextProblem = $wwdb->getProblem($user, $setName, $problemNumber+1); 353 my $nextProblem = $db->getMergedProblem($effectiveUser, $setName, $problemNumber+1);
234 unshift @links, "Previous Problem" => $prevProblem 354 unshift @links, "Previous Problem" , ($prevProblem
235 ? "$root/$courseName/$setName/".$prevProblem->id 355 ? "$root/$courseName/$setName/".$prevProblem->problem_id
236 : ""; 356 : "") , "navPrev";
237 push @links, "Next Problem" => $nextProblem 357 push @links, "Next Problem" , ($nextProblem
238 ? "$root/$courseName/$setName/".$nextProblem->id 358 ? "$root/$courseName/$setName/".$nextProblem->problem_id
239 : ""; 359 : "") , "navNext";
240 360
241 return $self->navMacro($args, @links); 361 return $self->navMacro($args, $tail, @links);
242} 362}
243 363
244sub title { 364sub title {
245 my $self = shift; 365 my $self = shift;
246 my $setName = $self->{set}->id; 366 my $setName = $self->{set}->set_id;
247 my $problemNumber = $self->{problem}->id; 367 my $problemNumber = $self->{problem}->problem_id;
248 368
249 return "$setName : Problem $problemNumber"; 369 return "$setName : Problem $problemNumber";
250} 370}
251 371
252sub body { 372sub body {
253 my $self = shift; 373 my $self = shift;
254 374
375 return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the problem set that contains it is not yet open."))
376 unless $self->{isOpen};
377
255 # unpack some useful variables 378 # unpack some useful variables
256 my $r = $self->{r}; 379 my $r = $self->{r};
257 my $wwdb = $self->{wwdb}; 380 my $db = $self->{db};
258 my $set = $self->{set}; 381 my $set = $self->{set};
259 my $problem = $self->{problem}; 382 my $problem = $self->{problem};
383 my $editMode = $self->{editMode};
260 my $permissionLevel = $self->{permissionLevel}; 384 my $permissionLevel = $self->{permissionLevel};
261 my $submitAnswers = $self->{submitAnswers}; 385 my $submitAnswers = $self->{submitAnswers};
386 my $checkAnswers = $self->{checkAnswers};
262 my $previewAnswers = $self->{previewAnswers}; 387 my $previewAnswers = $self->{previewAnswers};
388 my %want = %{ $self->{want} };
389 my %can = %{ $self->{can} };
390 my %must = %{ $self->{must} };
263 my %will = %{ $self->{will} }; 391 my %will = %{ $self->{will} };
264 my $pg = $self->{pg}; 392 my $pg = $self->{pg};
265 393
266 ##### translation errors? ##### 394 ##### translation errors? #####
267 395
268 if ($pg->{flags}->{error_flag}) { 396 if ($pg->{flags}->{error_flag}) {
269 return translationError($pg->{errors}, $pg->{body_text}); 397 return $self->errorOutput($pg->{errors}, $pg->{body_text});
270 } 398 }
271 399
272 ##### answer processing ##### 400 ##### answer processing #####
273 401
274 # if answers were submitted: 402 # if answers were submitted:
275 if ($submitAnswers) { 403 if ($submitAnswers) {
404 # get a "pure" (unmerged) UserProblem to modify
405 # this will be undefined if the problem has not been assigned to this user
406 my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id);
276 # store answers in DB for sticky answers 407 # store answers in DB for sticky answers
277 my %answersToStore; 408 my %answersToStore;
278 my %answerHash = %{ $pg->{answers} }; 409 my %answerHash = %{ $pg->{answers} };
279 $answersToStore{$_} = $answerHash{$_}->{original_student_ans} 410 $answersToStore{$_} = $answerHash{$_}->{original_student_ans}
280 foreach (keys %answerHash); 411 foreach (keys %answerHash);
281 my $answerString = encodeAnswers(%answersToStore, 412 my $answerString = encodeAnswers(%answersToStore,
282 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }); 413 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} });
414
283 $problem->last_answer($answerString); 415 $problem->last_answer($answerString);
416 # if $pureProblem is defined ( there is a user ) then record the last answer.
417 # FIXME (we're assuming that not being able to get a pure problem is enough to determine
418 # whether or not the problem database needs to be updated. This should be thought through
419 # more carefully to be sure.
420 if ( defined($pureProblem) ) {
421 $pureProblem->last_answer($answerString);
284 $wwdb->setProblem($problem); 422 $db->putUserProblem($pureProblem);
423 #die "pureProblem = ", defined($pureProblem);
285 424
425
286 # store state in DB if it makes sense 426 # store state in DB if it makes sense
287 if ($will{recordAnswers}) { 427 if ($will{recordAnswers}) {
288 $problem->attempted(1);
289 $problem->status($pg->{state}->{recorded_score}); 428 $problem->status($pg->{state}->{recorded_score});
429 $problem->attempted(1);
290 $problem->num_correct($pg->{state}->{num_of_correct_ans}); 430 $problem->num_correct($pg->{state}->{num_of_correct_ans});
291 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans}); 431 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
432 $pureProblem->status($pg->{state}->{recorded_score});
433 $pureProblem->attempted(1);
434 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
435 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
292 $wwdb->setProblem($problem); 436 $db->putUserProblem($pureProblem);
293 # write to the transaction log, just to make sure 437 # write to the transaction log, just to make sure
294 writeLog($self->{courseEnvironment}, "transaction", 438 writeLog($self->{ce}, "transaction",
295 $problem->id."\t". 439 $problem->problem_id."\t".
296 $problem->set_id."\t". 440 $problem->set_id."\t".
297 $problem->login_id."\t". 441 $problem->user_id."\t".
298 $problem->source_file."\t". 442 $problem->source_file."\t".
299 $problem->value."\t". 443 $problem->value."\t".
300 $problem->max_attempts."\t". 444 $problem->max_attempts."\t".
301 $problem->problem_seed."\t". 445 $problem->problem_seed."\t".
302 $problem->status."\t". 446 $pureProblem->status."\t".
303 $problem->attempted."\t". 447 $pureProblem->attempted."\t".
304 $problem->last_answer."\t". 448 $pureProblem->last_answer."\t".
305 $problem->num_correct."\t". 449 $pureProblem->num_correct."\t".
306 $problem->num_incorrect 450 $pureProblem->num_incorrect
307 ); 451 );
452 }
308 } 453 }
309 } 454 }
455 # logging student answers
456 my $pastAnswerLog = undef;
457 if (defined( $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'} )) {
458
459 $pastAnswerLog = $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'};
460
461 if ($submitAnswers and defined($pastAnswerLog) ) {
462 my $answerString = "";
463 my %answerHash = %{ $pg->{answers} };
464 $answerString = $answerString . $answerHash{$_}->{original_student_ans}."\t"
465 foreach (sort keys %answerHash);
466 $answerString = '' unless defined($answerString); # insure string is defined.
467 writeLog($self->{ce}, "pastAnswerList",
468 '|'.$problem->user_id.
469 '|'.$problem->set_id.
470 '|'.$problem->problem_id.'|'."\t".
471 time()."\t".
472 $answerString,
473
474 );
475
476 }
477
478 }
479 # end logging student answers
310 480
311 ##### output ##### 481 ##### output #####
482
483 print CGI::start_div({class=>"problemHeader"});
484
485 # custom message for editor
486 if ($permissionLevel >= 10 and defined $editMode) {
487 if ($editMode eq "temporaryFile") {
488 print CGI::p(CGI::i("Editing temporary file: ", $problem->source_file));
489 } elsif ($editMode eq "savedFile") {
490 print CGI::p(CGI::i("Problem saved to: ", $problem->source_file));
491 }
492 }
312 493
313 # attempt summary 494 # attempt summary
314 if ($submitAnswers or $will{showCorrectAnswers}) { 495 if ($submitAnswers or $will{showCorrectAnswers}) {
315 # print this if user submitted answers OR requested correct answers 496 # print this if user submitted answers OR requested correct answers
316 print $self->attemptResults($pg, $submitAnswers, $will{showCorrectAnswers}, 497 print $self->attemptResults($pg, $submitAnswers,
498 $will{showCorrectAnswers},
317 $pg->{flags}->{showPartialCorrectAnswers}); 499 $pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
500 } elsif ($checkAnswers) {
501 # print this if user previewed answers
502 print $self->attemptResults($pg, 1, 0, 1, 1, 1);
503 # show attempt answers
504 # don't show correct answers
505 # show attempt results (correctness)
506 # don't show attempt previews
318 } elsif ($previewAnswers) { 507 } elsif ($previewAnswers) {
319 # print this if user previewed answers 508 # print this if user previewed answers
320 print $self->attemptResults($pg, 1, 0, 0); 509 print $self->attemptResults($pg, 1, 0, 0, 0, 1);
321 # don't show correctness 510 # show attempt answers
322 # don't show correct answers 511 # don't show correct answers
512 # don't show attempt results (correctness)
513 # show attempt previews
323 } 514 }
515
516 print CGI::end_div();
517
518 print CGI::start_div({class=>"problem"});
519
520 # main form
521 print
522 CGI::startform("POST", $r->uri),
523 $self->hidden_authen_fields,
524 CGI::p($pg->{body_text}),
525 CGI::p($pg->{result}->{msg} ? CGI::b("Note: ") : "", CGI::i($pg->{result}->{msg})),
526 CGI::p(
527 ($can{recordAnswers}
528 ? CGI::submit(-name=>"submitAnswers",
529 -label=>"Submit Answers")
530 : ""),
531 ($can{checkAnswers}
532 ? CGI::submit(-name=>"checkAnswers",
533 -label=>"Check Answers")
534 : ""),
535 CGI::submit(-name=>"previewAnswers",
536 -label=>"Preview Answers"),
537 );
538 print CGI::end_div();
539
540 print CGI::start_div({class=>"scoreSummary"});
324 541
325 # score summary 542 # score summary
326 my $attempts = $problem->num_correct + $problem->num_incorrect; 543 my $attempts = $problem->num_correct + $problem->num_incorrect;
327 my $attemptsNoun = $attempts != 1 ? "times" : "time"; 544 my $attemptsNoun = $attempts != 1 ? "times" : "time";
328 my $lastScore = int ($problem->status * 100) . "%"; 545 my $lastScore = sprintf("%.0f%%", $problem->status * 100); # Round to whole number
329 my ($attemptsLeft, $attemptsLeftNoun); 546 my ($attemptsLeft, $attemptsLeftNoun);
330 if ($problem->max_attempts == -1) { 547 if ($problem->max_attempts == -1) {
331 # unlimited attempts 548 # unlimited attempts
332 $attemptsLeft = "unlimited"; 549 $attemptsLeft = "unlimited";
333 $attemptsLeftNoun = "attempts"; 550 $attemptsLeftNoun = "attempts";
334 } else { 551 } else {
335 $attemptsLeft = $problem->max_attempts - $attempts; 552 $attemptsLeft = $problem->max_attempts - $attempts;
336 $attemptsLeftNoun = $attemptsLeft == 1 ? "attempt" : "attempts"; 553 $attemptsLeftNoun = $attemptsLeft == 1 ? "attempt" : "attempts";
337 } 554 }
555
556 my $setClosed = 0;
338 my $setClosedMessage; 557 my $setClosedMessage;
339 if (time < $set->open_date or time > $set->due_date) { 558 if (time < $set->open_date or time > $set->due_date) {
559 $setClosed = 1;
340 $setClosedMessage = "This problem set is closed."; 560 $setClosedMessage = "This problem set is closed.";
341 if ($permissionLevel > 0) { 561 if ($permissionLevel > 0) {
342 $setClosedMessage .= " Since you are a privileged user, additional attempts will be recorded."; 562 $setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
343 } else { 563 } else {
344 $setClosedMessage .= " Additional attempts will not be recorded."; 564 $setClosedMessage .= " Additional attempts will not be recorded.";
345 } 565 }
346 } 566 }
347 print CGI::p( 567 print CGI::p(
348 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(), 568 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(),
349 $problem->attempted 569 $problem->attempted
350 ? "Your recorded score is $lastScore." . CGI::br() 570 ? "Your recorded score is $lastScore." . CGI::br()
351 : "", 571 : "",
352 "You have $attemptsLeft $attemptsLeftNoun remaining.", CGI::br(), 572 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining."
353 $setClosedMessage,
354 ); 573 );
355 574 print CGI::end_div();
575
576 # save state for viewOptions
356 print CGI::hr(); 577 print CGI::hidden(
357 578 -name => "showOldAnswers",
358 # main form 579 -value => $will{showOldAnswers}
359 print
360 CGI::startform("POST", $r->uri),
361 $self->hidden_authen_fields,
362 CGI::p(CGI::i($pg->{result}->{msg})),
363 CGI::p($pg->{body_text}),
364 CGI::p(
365 CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers"),
366 CGI::submit(-name=>"previewAnswers", -label=>"Preview Answers"),
367 ), 580 ),
368 $self->viewOptions(), 581 CGI::hidden(
582 -name => "showCorrectAnswers",
583 -value => $will{showCorrectAnswers}
584 ),
585 CGI::hidden(
586 -name => "showHints",
587 -value => $will{showHints}),
588 CGI::hidden(
589 -name => "showSolutions",
590 -value => $will{showSolutions},
591 ),
592 CGI::hidden(
593 -name => "displayMode",
594 -value => $self->{displayMode}
595 );
596
597 # end of main form
369 CGI::endform(); 598 print CGI::endform();
370 599
371 # feedback form 600 # stuff we need below (pull these out at the beginning?)
372 my $ce = $self->{courseEnvironment}; 601 my $ce = $self->{ce};
373 my $root = $ce->{webworkURLs}->{root}; 602 my $root = $ce->{webworkURLs}->{root};
374 my $courseName = $ce->{courseName}; 603 my $courseName = $ce->{courseName};
604
605 print CGI::start_div({class=>"problemFooter"});
606
607 # arguments for answer inspection button
608 my $prof_url = $ce->{webworkURLs}->{oldProf};
609 my $cgi_url = $prof_url;
610 $cgi_url=~ s|/[^/]*$||; # clip profLogin.pl
611 my $authen_args = $self->url_authen_args();
612 my $showPastAnswersURL = "$cgi_url/showPastAnswers.pl";
613
614 # print answer inspection button
615 if ($self->{permissionLevel} > 0) {
616 print "\n",
617 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
618 $self->hidden_authen_fields,"\n",
619 CGI::hidden(-name => 'course', -value=>$courseName), "\n",
620 CGI::hidden(-name => 'probNum', -value=>$problem->problem_id), "\n",
621 CGI::hidden(-name => 'setNum', -value=>$problem->set_id), "\n",
622 CGI::hidden(-name => 'User', -value=>$problem->user_id), "\n",
623 CGI::p( {-align=>"left"},
624 CGI::submit(-name => 'action', -value=>'Show Past Answers')
625 ), "\n",
626 CGI::endform();
627 }
628
629 #print CGI::end_div();
630 #
631 #print CGI::start_div();
632
633 # arguments for feedback form
375 my $feedbackURL = "$root/$courseName/feedback/"; 634 my $feedbackURL = "$root/$courseName/feedback/";
635
636 #print feedback form
376 print 637 print
377 CGI::startform("POST", $feedbackURL), 638 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
378 $self->hidden_authen_fields, 639 $self->hidden_authen_fields,"\n",
379 CGI::hidden("module", __PACKAGE__), 640 CGI::hidden("module", __PACKAGE__),"\n",
380 CGI::hidden("set", $set->id), 641 CGI::hidden("set", $set->set_id),"\n",
381 CGI::hidden("problem", $problem->id), 642 CGI::hidden("problem", $problem->problem_id),"\n",
382 CGI::hidden("displayMode", $self->{displayMode}), 643 CGI::hidden("displayMode", $self->{displayMode}),"\n",
383 CGI::hidden("showOldAnswers", $will{showOldAnswers}), 644 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
384 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}), 645 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
385 CGI::hidden("showHints", $will{showHints}), 646 CGI::hidden("showHints", $will{showHints}),"\n",
386 CGI::hidden("showSolutions", $will{showSolutions}), 647 CGI::hidden("showSolutions", $will{showSolutions}),"\n",
387 CGI::p({-align=>"right"}, 648 CGI::p({-align=>"left"},
388 CGI::submit(-name=>"feedbackForm", -label=>"Send Feedback") 649 CGI::submit(-name=>"feedbackForm", -label=>"Contact instructor")
389 ), 650 ),
390 CGI::endform(); 651 CGI::endform(),"\n";
652
653 # FIXME print editor link
654 # print editor link if the user is an instructor AND the file is not in temporary editing mode
655 if ($self->{permissionLevel}>=10 and ( (not defined($self->{edit_mode})) or $self->{edit_mode} eq 'savedFile') ) {
656 print CGI::a({-href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".$set->set_id.
657 '/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
658 }
659
660 print CGI::end_div();
391 661
392 # warning output 662 # warning output
393 if ($pg->{warnings} ne "") { 663 #if ($pg->{warnings} ne "") {
394 print CGI::hr(), warningOutput($pg->{warnings}); 664 # print CGI::hr(), $self->warningOutput($pg->{warnings});
395 } 665 #}
396 666
397 # debugging stuff 667 # debugging stuff
668 if (0) {
398 #print 669 print
399 # CGI::hr(), 670 CGI::hr(),
400 # CGI::h2("debugging information"), 671 CGI::h2("debugging information"),
401 # CGI::h3("form fields"), 672 CGI::h3("form fields"),
402 # ref2string($self->{formFields}), 673 ref2string($self->{formFields}),
403 # CGI::h3("user object"), 674 CGI::h3("user object"),
404 # ref2string($self->{user}), 675 ref2string($self->{user}),
405 # CGI::h3("set object"), 676 CGI::h3("set object"),
406 # ref2string($set), 677 ref2string($set),
407 # CGI::h3("problem object"), 678 CGI::h3("problem object"),
408 # ref2string($problem), 679 ref2string($problem),
409 # CGI::h3("PG object"), 680 CGI::h3("PG object"),
410 # ref2string($pg, {'WeBWorK::PG::Translator' => 1}); 681 ref2string($pg, {'WeBWorK::PG::Translator' => 1});
682 }
411 683
412 return ""; 684 return "";
413} 685}
414 686
415##### output utilities ##### 687##### output utilities #####
416 688
417# this is used by ProblemSet.pm too, so don't fuck it up
418sub translationError($$) {
419 my ($error, $details) = @_;
420 return
421 CGI::h2("Software Error"),
422 CGI::p(<<EOF),
423WeBWorK has encountered a software error while attempting to process this problem.
424It is likely that there is an error in the problem itself.
425If you are a student, contact your professor to have the error corrected.
426If you are a professor, please consut the error output below for more informaiton.
427EOF
428 CGI::h3("Error messages"), CGI::blockquote(CGI::pre($error)),
429 CGI::h3("Error context"), CGI::blockquote(CGI::pre($details));
430}
431
432# this is used by ProblemSet.pm too, so don't fuck it up
433sub warningOutput($) {
434 my $warnings = shift;
435
436 return
437 CGI::h2("Software Warnings"),
438 CGI::p(<<EOF),
439WeBWorK has encountered warnings while attempting to process this problem.
440It is likely that this indicates an error or ambiguity in the problem itself.
441If you are a student, contact your professor to have the problem corrected.
442If you are a professor, please consut the error output below for more informaiton.
443EOF
444 CGI::h3("Warning messages"),
445 CGI::blockquote(CGI::pre($warnings)),
446 ;
447}
448
449sub attemptResults($$$$$) { 689sub attemptResults($$$$$$) {
450 my $self = shift; 690 my $self = shift;
451 my $pg = shift; 691 my $pg = shift;
452 my $showAttemptAnswers = shift; 692 my $showAttemptAnswers = shift;
453 my $showCorrectAnswers = shift; 693 my $showCorrectAnswers = shift;
454 my $showAttemptResults = $showAttemptAnswers && shift; 694 my $showAttemptResults = $showAttemptAnswers && shift;
695 my $showSummary = shift;
696 my $showAttemptPreview = shift || 0;
455 my $problemResult = $pg->{result}; # the overall result of the problem 697 my $problemResult = $pg->{result}; # the overall result of the problem
456 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }; 698 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
457 699
700 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
701
458 my $header = CGI::th("answer"); 702 my $header = CGI::th("Part");
459 $header .= $showAttemptAnswers ? CGI::th("attempt") : ""; 703 $header .= $showAttemptAnswers ? CGI::th("Entered") : "";
460 $header .= $showAttemptAnswers ? CGI::th("preview") : ""; 704 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : "";
461 $header .= $showCorrectAnswers ? CGI::th("correct") : ""; 705 $header .= $showCorrectAnswers ? CGI::th("Correct") : "";
462 $header .= $showAttemptResults ? CGI::th("result") : ""; 706 $header .= $showAttemptResults ? CGI::th("Result") : "";
463 $header .= $showAttemptAnswers ? CGI::th("messages") : ""; 707 $header .= $showMessages ? CGI::th("messages") : "";
464 my @tableRows = ( $header ); 708 my @tableRows = ( $header );
465 my $numCorrect; 709 my $numCorrect;
466 foreach my $name (@answerNames) { 710 foreach my $name (@answerNames) {
467 my $answerResult = $pg->{answers}->{$name}; 711 my $answerResult = $pg->{answers}->{$name};
468 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans 712 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
469 my $preview = $self->previewAnswer($answerResult); 713 my $preview = ($showAttemptPreview
714 ? $self->previewAnswer($answerResult)
715 : "");
470 my $correctAnswer = $answerResult->{correct_ans}; 716 my $correctAnswer = $answerResult->{correct_ans};
471 my $answerScore = $answerResult->{score}; 717 my $answerScore = $answerResult->{score};
472 my $answerMessage = $showAttemptAnswers ? $answerResult->{ans_message} : ""; 718 my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
473 719
474 $numCorrect += $answerScore > 0; 720 $numCorrect += $answerScore > 0;
475 my $resultString = $answerScore ? "correct" : "incorrect"; 721 my $resultString = $answerScore ? "correct" : "incorrect";
476 722
477 # get rid of the goofy prefix on the answer names (supposedly, the format 723 # get rid of the goofy prefix on the answer names (supposedly, the format
478 # of the answer names is changeable. this only fixes 724 # of the answer names is changeable. this only fixes it for "AnSwEr"
479 $name =~ s/^AnSwEr//; 725 $name =~ s/^AnSwEr//;
480 726
481 my $row = CGI::td($name); 727 my $row = CGI::td($name);
482 $row .= $showAttemptAnswers ? CGI::td($studentAnswer) : ""; 728 $row .= $showAttemptAnswers ? CGI::td(nbsp($studentAnswer)) : "";
483 $row .= $showAttemptAnswers ? CGI::td($preview) : ""; 729 $row .= $showAttemptPreview ? CGI::td(nbsp($preview)) : "";
484 $row .= $showCorrectAnswers ? CGI::td($correctAnswer) : ""; 730 $row .= $showCorrectAnswers ? CGI::td(nbsp($correctAnswer)) : "";
485 $row .= $showAttemptResults ? CGI::td($resultString) : ""; 731 $row .= $showAttemptResults ? CGI::td(nbsp($resultString)) : "";
486 $row .= $answerMessage ? CGI::td($answerMessage) : ""; 732 $row .= $answerMessage ? CGI::td(nbsp($answerMessage)) : "";
487 push @tableRows, $row; 733 push @tableRows, $row;
488 } 734 }
489 735
490 my $numCorrectNoun = $numCorrect == 1 ? "question" : "questions"; 736 my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
491 my $scorePercent = int ($problemResult->{score} * 100) . "\%"; 737 my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
492 my $summary = "On this attempt, you answered $numCorrect $numCorrectNoun out of " 738 my $summary = "On this attempt, you answered $numCorrect out of "
493 . scalar @answerNames . " correct, for a score of $scorePercent."; 739 . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
494 return CGI::table({-border=>1}, CGI::Tr(\@tableRows)) . CGI::p($summary); 740 return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p($summary) : "");
495} 741}
496 742sub nbsp {
743 my $str = shift;
744 ($str) ? $str : '&nbsp;'; # returns non-breaking space for empty strings
745}
497sub viewOptions($) { 746sub viewOptions($) {
498 my $self = shift; 747 my $self = shift;
499 my $displayMode = $self->{displayMode}; 748 my $displayMode = $self->{displayMode};
500 my %must = %{ $self->{must} }; 749 my %must = %{ $self->{must} };
501 my %can = %{ $self->{can} }; 750 my %can = %{ $self->{can} };
502 my %will = %{ $self->{will} }; 751 my %will = %{ $self->{will} };
503 752
504 my $optionLine; 753 my $optionLine;
505 $can{showOldAnswers} and $optionLine .= join "", 754 $can{showOldAnswers} and $optionLine .= join "",
506 "Show: &nbsp;", 755 "Show: &nbsp;".CGI::br(),
507 CGI::checkbox( 756 CGI::checkbox(
508 -name => "showOldAnswers", 757 -name => "showOldAnswers",
509 -checked => $will{showOldAnswers}, 758 -checked => $will{showOldAnswers},
510 -label => "Saved answers", 759 -label => "Saved answers",
511 ), "&nbsp;&nbsp;"; 760 ), "&nbsp;&nbsp;".CGI::br();
512 $can{showCorrectAnswers} and $optionLine .= join "", 761 $can{showCorrectAnswers} and $optionLine .= join "",
513 CGI::checkbox( 762 CGI::checkbox(
514 -name => "showCorrectAnswers", 763 -name => "showCorrectAnswers",
515 -checked => $will{showCorrectAnswers}, 764 -checked => $will{showCorrectAnswers},
516 -label => "Correct answers", 765 -label => "Correct answers",
517 ), "&nbsp;&nbsp;"; 766 ), "&nbsp;&nbsp;".CGI::br();
518 $can{showHints} and $optionLine .= join "", 767 $can{showHints} and $optionLine .= join "",
519 CGI::checkbox( 768 CGI::checkbox(
520 -name => "showHints", 769 -name => "showHints",
521 -checked => $will{showHints}, 770 -checked => $will{showHints},
522 -label => "Hints", 771 -label => "Hints",
523 ), "&nbsp;&nbsp;"; 772 ), "&nbsp;&nbsp;".CGI::br();
524 $can{showSolutions} and $optionLine .= join "", 773 $can{showSolutions} and $optionLine .= join "",
525 CGI::checkbox( 774 CGI::checkbox(
526 -name => "showSolutions", 775 -name => "showSolutions",
527 -checked => $will{showSolutions}, 776 -checked => $will{showSolutions},
528 -label => "Solutions", 777 -label => "Solutions",
529 ), "&nbsp;&nbsp;"; 778 ), "&nbsp;&nbsp;".CGI::br();
530 $optionLine and $optionLine .= join "", CGI::br(); 779 $optionLine and $optionLine .= join "", CGI::br();
531 780
532 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex"}, 781 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex align: left"},
533 "View equations as: &nbsp;", 782 "View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;".CGI::br(),
534 CGI::radio_group( 783 CGI::radio_group(
535 -name => "displayMode", 784 -name => "displayMode",
536 -values => ['plainText', 'formattedText', 'images'], 785 -values => ['plainText', 'formattedText', 'images'],
537 -default => $displayMode, 786 -default => $displayMode,
787 -linebreak=>'true',
538 -labels => { 788 -labels => {
539 plainText => "plain text", 789 plainText => "plain",
540 formattedText => "formatted text", 790 formattedText => "formatted",
541 images => "images", 791 images => "images",
542 } 792 }
543 ), CGI::br(), 793 ), CGI::br(),CGI::hr(),
544 $optionLine, 794 $optionLine,
545 CGI::submit(-name=>"redisplay", -label=>"Redisplay Problem"), 795 CGI::submit(-name=>"redisplay", -label=>"Save Options"),
546 ); 796 );
547} 797}
548 798
549sub previewAnswer($$) { 799sub previewAnswer($$) {
550 my ($self, $answerResult) = @_; 800 my ($self, $answerResult) = @_;
551 my $ce = $self->{courseEnvironment}; 801 my $ce = $self->{ce};
552 my $user = $self->{user}; 802 my $effectiveUser = $self->{effectiveUser};
553 my $set = $self->{set}; 803 my $set = $self->{set};
554 my $problem = $self->{problem}; 804 my $problem = $self->{problem};
805 my $displayMode = $self->{displayMode};
555 806
556 # how are we going to name this? 807 # note: right now, we have to do things completely differently when we are
557 my $targetPathCommon = "/png/" 808 # rendering math from INSIDE the translator and from OUTSIDE the translator.
558 . $user->id . "." 809 # so we'll just deal with each case explicitly here. there's some code
559 . $set->id . "." 810 # duplication that can be dealt with later by abstracting out tth/dvipng/etc.
560 . $problem->id . "."
561 . $answerResult->{ans_name} . ".png";
562 811
563 # figure out where to put things
564 my $wd = tempdir("webwork-dvipng-XXXXXXXX", DIR => $ce->{courseDirs}->{html_temp});
565 my $latex = $ce->{externalPrograms}->{latex};
566 my $dvipng = $ce->{externalPrograms}->{dvipng};
567 my $tex = $answerResult->{preview_latex_string}; 812 my $tex = $answerResult->{preview_latex_string};
813
814 return "" if $tex eq "";
815
816 if ($displayMode eq "plainText") {
817 return $tex;
818 } elsif ($displayMode eq "formattedText") {
819 my $tthCommand = $ce->{externalPrograms}->{tth}
820 . " -L -f5 -r 2> /dev/null <<END_OF_INPUT; echo > /dev/null\n"
821 . "\\(".$tex."\\)\n"
822 . "END_OF_INPUT\n";
823
824 # call tth
825 my $result = `$tthCommand`;
826 if ($?) {
827 return "<b>[tth failed: $? $@]</b>";
828 }
829 return $result;
830 } elsif ($displayMode eq "images") {
831 # how are we going to name this?
832 my $targetPathCommon = "/m2i/"
833 . $effectiveUser->user_id . "."
834 . $set->set_id . "."
835 . $problem->problem_id . "."
836 . $answerResult->{ans_name} . ".png";
837
838 # figure out where to put things
839 my $wd = makeTempDirectory($ce->{courseDirs}->{html_temp}, "webwork-dvipng");
840 my $latex = $ce->{externalPrograms}->{latex};
841 my $dvipng = $ce->{externalPrograms}->{dvipng};
568 my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon; 842 my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
569 # should use surePathToTmpFile, but we have to 843 # should use surePathToTmpFile, but we have to
570 # isolate it from the problem enivronment first 844 # isolate it from the problem enivronment first
571 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon; 845 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
572 846
573 # call dvipng to generate a preview 847 # call dvipng to generate a preview
574 dvipng($wd, $latex, $dvipng, $tex, $targetPath); 848 dvipng($wd, $latex, $dvipng, $tex, $targetPath);
849 rmtree($wd, 0, 0);
575 if (-e $targetPath) { 850 if (-e $targetPath) {
576 return "<img src=\"$targetURL\" alt=\"$tex\" />"; 851 return "<img src=\"$targetURL\" alt=\"$tex\" />";
577 } else { 852 } else {
578 return "<b>[math2img failed]</b>"; 853 return "<b>[math2img failed]</b>";
579 } 854 }
855 }
580} 856}
857
858##### logging subroutine ####
859
860
581 861
582##### permission queries ##### 862##### permission queries #####
583 863
584# this stuff should be abstracted out into the permissions system 864# this stuff should be abstracted out into the permissions system
585# however, the permission system only knows about things in the 865# however, the permission system only knows about things in the
… …
606 my $attemptsOK = $maxAttempts == -1 || $attempts <= $maxAttempts; 886 my $attemptsOK = $maxAttempts == -1 || $attempts <= $maxAttempts;
607 my $recordAnswers = $permHigh || ($timeOK && $attemptsOK); 887 my $recordAnswers = $permHigh || ($timeOK && $attemptsOK);
608 return $recordAnswers; 888 return $recordAnswers;
609} 889}
610 890
891sub canCheckAnswers($$) {
892 my ($permissionLevel, $answerDate) = @_;
893 my $permHigh = $permissionLevel > 0;
894 my $timeOK = time >= $answerDate;
895 my $recordAnswers = $permHigh || $timeOK;
896 return $recordAnswers;
897}
898
611sub mustRecordAnswers($) { 899sub mustRecordAnswers($) {
612 my ($permissionLevel) = @_; 900 my ($permissionLevel) = @_;
613 return $permissionLevel == 0; 901 return $permissionLevel == 0;
614} 902}
615 903
Legend:
Removed from v.671  
changed lines
  Added in v.1197
aubreyja at gmail dot com
 ViewVC Help
Powered by ViewVC 1.0.9