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