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

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

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

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