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