| … | |
… | |
| 226 | "Select", |
226 | "Select", |
| 227 | "Problems", |
227 | "Problems", |
| 228 | "Assigned Users", |
228 | "Assigned Users", |
| 229 | "Set Name", |
229 | "Set Name", |
| 230 | "Set Header", |
230 | "Set Header", |
| 231 | "Problem Header", |
231 | "Paper Header", |
| 232 | "Open Date", |
232 | "Open Date", |
| 233 | "Due Date", |
233 | "Due Date", |
| 234 | "Answer Date", |
234 | "Answer Date", |
| 235 | "Visible", |
235 | "Visible", |
| 236 | ); |
236 | ); |
| … | |
… | |
| 553 | CGI::popup_menu( |
553 | CGI::popup_menu( |
| 554 | -name => "action.sort.primary", |
554 | -name => "action.sort.primary", |
| 555 | -values => [qw(set_id set_header problem_header open_date due_date answer_date published)], |
555 | -values => [qw(set_id set_header problem_header open_date due_date answer_date published)], |
| 556 | -default => $actionParams{"action.sort.primary"}->[0] || "due_date", |
556 | -default => $actionParams{"action.sort.primary"}->[0] || "due_date", |
| 557 | -labels => { |
557 | -labels => { |
| 558 | set_id => "set name", |
558 | set_id => "Set Name", |
| 559 | set_header => "set header", |
559 | set_header => "Set Header", |
| 560 | problem_header => "problem header", |
560 | problem_header => "Paper Header", |
| 561 | open_date => "open date", |
561 | open_date => "Open Date", |
| 562 | due_date => "due date", |
562 | due_date => "Due Date", |
| 563 | answer_date => "answer date", |
563 | answer_date => "Answer Date", |
| 564 | published => "visibility", |
564 | published => "Visibility", |
| 565 | }, |
565 | }, |
| 566 | -onchange => $onChange, |
566 | -onchange => $onChange, |
| 567 | ), |
567 | ), |
| 568 | " Secondary sort: ", |
568 | " Secondary sort: ", |
| 569 | CGI::popup_menu( |
569 | CGI::popup_menu( |
| 570 | -name => "action.sort.secondary", |
570 | -name => "action.sort.secondary", |
| 571 | -values => [qw(set_id set_header problem_header open_date due_date answer_date published)], |
571 | -values => [qw(set_id set_header problem_header open_date due_date answer_date published)], |
| 572 | -default => $actionParams{"action.sort.secondary"}->[0] || "open_date", |
572 | -default => $actionParams{"action.sort.secondary"}->[0] || "open_date", |
| 573 | -labels => { |
573 | -labels => { |
| 574 | set_id => "set name", |
574 | set_id => "Set Name", |
| 575 | set_header => "set header", |
575 | set_header => "Set Header", |
| 576 | problem_header => "problem header", |
576 | problem_header => "Paper Header", |
| 577 | open_date => "open date", |
577 | open_date => "Open Date", |
| 578 | due_date => "due date", |
578 | due_date => "Due Date", |
| 579 | answer_date => "answer date", |
579 | answer_date => "Answer Date", |
| 580 | published => "visibility", |
580 | published => "Visibility", |
| 581 | }, |
581 | }, |
| 582 | -onchange => $onChange, |
582 | -onchange => $onChange, |
| 583 | ), |
583 | ), |
| 584 | ".", |
584 | ".", |
| 585 | ); |
585 | ); |
| … | |
… | |
| 593 | |
593 | |
| 594 | $self->{primarySortField} = $primary; |
594 | $self->{primarySortField} = $primary; |
| 595 | $self->{secondarySortField} = $secondary; |
595 | $self->{secondarySortField} = $secondary; |
| 596 | |
596 | |
| 597 | my %names = ( |
597 | my %names = ( |
| 598 | set_id => "set name", |
598 | set_id => "Set Name", |
| 599 | set_header => "set header", |
599 | set_header => "Set Header", |
| 600 | problem_header => "problem header", |
600 | problem_header => "Paper Header", |
| 601 | open_date => "open date", |
601 | open_date => "Open Date", |
| 602 | due_date => "due date", |
602 | due_date => "Due Date", |
| 603 | answer_date => "answer date", |
603 | answer_date => "Answer Date", |
| 604 | published => "visibility", |
604 | published => "Visibility", |
| 605 | ); |
605 | ); |
| 606 | |
606 | |
| 607 | return "sort by $names{$primary} and then by $names{$secondary}."; |
607 | return "sort by $names{$primary} and then by $names{$secondary}."; |
| 608 | } |
608 | } |
| 609 | |
609 | |
| … | |
… | |
| 1016 | return CGI::em("You are not authorized to create problem sets"); |
1016 | return CGI::em("You are not authorized to create problem sets"); |
| 1017 | } |
1017 | } |
| 1018 | |
1018 | |
| 1019 | my @fileNames = @{ $actionParams->{"action.import.source"} }; |
1019 | my @fileNames = @{ $actionParams->{"action.import.source"} }; |
| 1020 | my $newSetName = $actionParams->{"action.import.name"}->[0]; |
1020 | my $newSetName = $actionParams->{"action.import.name"}->[0]; |
| 1021 | $newSetName = "" if $newSetName =~ /\(/; |
1021 | $newSetName = "" if @fileNames > 1; # cannot assign set names to multiple imports |
| 1022 | my $assign = $actionParams->{"action.import.assign"}->[0]; |
1022 | my $assign = $actionParams->{"action.import.assign"}->[0]; |
| 1023 | |
1023 | |
| 1024 | my ($added, $skipped) = $self->importSetsFromDef($newSetName, $assign, @fileNames); |
1024 | my ($added, $skipped) = $self->importSetsFromDef($newSetName, $assign, @fileNames); |
| 1025 | |
1025 | |
| 1026 | # make new sets visible... do we really want to do this? probably. |
1026 | # make new sets visible... do we really want to do this? probably. |