| … | |
… | |
| 56 | $self->{generationError} = ["SIMPLE", "You are not permitted to generate hardcopy for multiple sets. Please select a single set and try again."]; |
56 | $self->{generationError} = ["SIMPLE", "You are not permitted to generate hardcopy for multiple sets. Please select a single set and try again."]; |
| 57 | } |
57 | } |
| 58 | if (@users > 1 and not $multiUser) { |
58 | if (@users > 1 and not $multiUser) { |
| 59 | $self->{generationError} = ["SIMPLE", "You are not permitted to generate hardcopy for multiple users. Please select a single user and try again."]; |
59 | $self->{generationError} = ["SIMPLE", "You are not permitted to generate hardcopy for multiple users. Please select a single user and try again."]; |
| 60 | } |
60 | } |
| 61 | if ($users[0] ne $self->{effectiveUser}->id and not $multiUser) { |
61 | if ($users[0] ne $self->{effectiveUser}->user_id and not $multiUser) { |
| 62 | $self->{generationError} = ["SIMPLE", "You are not permitted to generate hardcopy for other users."]; |
62 | $self->{generationError} = ["SIMPLE", "You are not permitted to generate hardcopy for other users."]; |
| 63 | } |
63 | } |
| 64 | |
64 | |
| 65 | unless ($self->{generationError}) { |
65 | unless ($self->{generationError}) { |
| 66 | if ($r->param("generateHardcopy")) { |
66 | if ($r->param("generateHardcopy")) { |
| … | |
… | |
| 199 | { |
199 | { |
| 200 | print CGI::start_td(); |
200 | print CGI::start_td(); |
| 201 | print CGI::h3("Sets"); |
201 | print CGI::h3("Sets"); |
| 202 | print CGI::start_table(); |
202 | print CGI::start_table(); |
| 203 | my @sets; |
203 | my @sets; |
| 204 | push @sets, $db->getGlobalUserSet($self->{effectiveUser}->id, $_) |
204 | push @sets, $db->getGlobalUserSet($self->{effectiveUser}->user_id, $_) |
| 205 | foreach ($db->listUserSets($self->{effectiveUser}->id)); |
205 | foreach ($db->listUserSets($self->{effectiveUser}->user_id)); |
| 206 | @sets = sort { $a->set_id cmp $b->set_id } @sets; |
206 | @sets = sort { $a->set_id cmp $b->set_id } @sets; |
| 207 | foreach my $set (@sets) { |
207 | foreach my $set (@sets) { |
| 208 | my $checked = grep { $_ eq $set->set_id } @{$self->{sets}}; |
208 | my $checked = grep { $_ eq $set->set_id } @{$self->{sets}}; |
| 209 | my $control; |
209 | my $control; |
| 210 | if (time < $set->open_date and not $preOpenSets) { |
210 | if (time < $set->open_date and not $preOpenSets) { |
| … | |
… | |
| 248 | my @users; |
248 | my @users; |
| 249 | push @users, $self->{cldb}->getUser($_) |
249 | push @users, $self->{cldb}->getUser($_) |
| 250 | foreach ($self->{cldb}->listUsers()); |
250 | foreach ($self->{cldb}->listUsers()); |
| 251 | @users = sort { $a->last_name cmp $b->last_name } @users; |
251 | @users = sort { $a->last_name cmp $b->last_name } @users; |
| 252 | foreach my $user (@users) { |
252 | foreach my $user (@users) { |
| 253 | my $checked = grep { $_ eq $user->id } @{$self->{users}}; |
253 | my $checked = grep { $_ eq $user->user_id } @{$self->{users}}; |
| 254 | print CGI::Tr(CGI::td([ |
254 | print CGI::Tr(CGI::td([ |
| 255 | CGI::checkbox(-name=>"hcUser", -value=>$user->id, -label=>"", -checked=>$checked), |
255 | CGI::checkbox(-name=>"hcUser", -value=>$user->user_id, -label=>"", -checked=>$checked), |
| 256 | $user->id, |
256 | $user->user_id, |
| 257 | $user->last_name.", ".$user->first_name, |
257 | $user->last_name.", ".$user->first_name, |
| 258 | ])); |
258 | ])); |
| 259 | } |
259 | } |
| 260 | print CGI::end_table(); |
260 | print CGI::end_table(); |
| 261 | print CGI::end_td(); |
261 | print CGI::end_td(); |
| … | |
… | |
| 404 | |
404 | |
| 405 | sub getSetTeX { |
405 | sub getSetTeX { |
| 406 | my ($self, $setName) = @_; |
406 | my ($self, $setName) = @_; |
| 407 | my $ce = $self->{ce}; |
407 | my $ce = $self->{ce}; |
| 408 | my $db = $self->{db}; |
408 | my $db = $self->{db}; |
| 409 | my $effectiveUserName = $self->{effectiveUser}->id; |
409 | my $effectiveUserName = $self->{effectiveUser}->user_id; |
| 410 | my @problemNumbers = sort { $a <=> $b } |
410 | my @problemNumbers = sort { $a <=> $b } |
| 411 | $db->listUserProblems($effectiveUserName, $setName); |
411 | $db->listUserProblems($effectiveUserName, $setName); |
| 412 | |
412 | |
| 413 | # get header and footer |
413 | # get header and footer |
| 414 | my $setHeader = $db->getGlobalUserSet($effectiveUserName, $setName)->set_header |
414 | my $setHeader = $db->getGlobalUserSet($effectiveUserName, $setName)->set_header |
| … | |
… | |
| 448 | my $ce = $self->{ce}; |
448 | my $ce = $self->{ce}; |
| 449 | my $db = $self->{db}; |
449 | my $db = $self->{db}; |
| 450 | |
450 | |
| 451 | my $effectiveUser = $self->{effectiveUser}; |
451 | my $effectiveUser = $self->{effectiveUser}; |
| 452 | my $permissionLevel = $self->{permissionLevel}; |
452 | my $permissionLevel = $self->{permissionLevel}; |
| 453 | my $set = $db->getGlobalUserSet($effectiveUser->id, $setName); |
453 | my $set = $db->getGlobalUserSet($effectiveUser->user_id, $setName); |
| 454 | my $psvn = $set->psvn(); |
454 | my $psvn = $set->psvn(); |
| 455 | |
455 | |
| 456 | # decide what to do about problem number |
456 | # decide what to do about problem number |
| 457 | my $problem; |
457 | my $problem; |
| 458 | if ($problemNumber) { |
458 | if ($problemNumber) { |
| 459 | $problem = $db->getGlobalUserProblem($effectiveUser->id, $setName, $problemNumber); |
459 | $problem = $db->getGlobalUserProblem($effectiveUser->user_id, $setName, $problemNumber); |
| 460 | } elsif ($pgFile) { |
460 | } elsif ($pgFile) { |
| 461 | $problem = WeBWorK::DB::Record::UserProblem->new( |
461 | $problem = WeBWorK::DB::Record::UserProblem->new( |
| 462 | set_id => $set->set_id, |
462 | set_id => $set->set_id, |
| 463 | problem_id => 0, |
463 | problem_id => 0, |
| 464 | login_id => $effectiveUser->id, |
464 | login_id => $effectiveUser->user_id, |
| 465 | source_file => $pgFile, |
465 | source_file => $pgFile, |
| 466 | # the rest of Problem's fields are not needed, i think |
466 | # the rest of Problem's fields are not needed, i think |
| 467 | ); |
467 | ); |
| 468 | } |
468 | } |
| 469 | |
469 | |
Parent Directory
| 
Revision Log
| 
Patch