|
- '.$/;
- }
-
- my @lines = &Apache::lonnet::get_scantronformat_file();
- my $codechoice='';
- foreach my $line (@lines) {
- next if (($line =~ /^\#/) || ($line eq ''));
- my ($name,$description,$code_type,$code_length)=
- (split(/:/,$line))[0,1,2,4];
- if ($code_length > 0 &&
- $code_type =~/^(letter|number|-1)/) {
- $codechoice.=''.$description.'';
- }
- }
- if ($codechoice eq '') {
- $codechoice='Default';
- }
- my $anon1 = &generate_code_selector($helper,
- 'CHOOSE_ANON1',
- 'SELECT_PROBLEMS',
- $codechoice,
- $code_selection,
- $namechoice) . $resource_selector;
-
- &Apache::lonxml::xmlparse($r, 'helper',$anon1);
-
- my $anon_page = &generate_code_selector($helper,
- 'CHOOSE_ANON1_PAGE',
- 'SELECT_PROBLEMS_PAGE',
- $codechoice,
- $code_selection,
- $namechoice) .
- &generate_resource_chooser('SELECT_PROBLEMS_PAGE',
- 'Select Problem(s) to print',
- "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",
- 'RESOURCES',
- 'PRINT_FORMATTING',
- $url,
- $isProblem, '', $symbFilter,
- $start_new_option);
- &Apache::lonxml::xmlparse($r, 'helper', $anon_page);
- return ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice);
-}
-
# Returns the XML for choosing how assignments are to be formatted
# that text must still be parsed by the helper xml parser.
# Parameters: 3 (required)
@@ -588,9 +458,7 @@ sub generate_format_selector {
my $secpdfoption;
unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon') ||
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
- ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon') ||
- ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences_problems_for_anon') ||
- ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences_resources_for_anon')) {
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon') ) {
$secpdfoption = 'Each PDF contains exactly one section';
}
return <{NAV_MAP}; # Slightly OO dirty.
- # Don't bother looping over undefined or empty parts array;
+ # Don't bother looping over undefined or empty parts arraY;
if (@parts) {
foreach my $part (@parts) {
@@ -796,7 +664,7 @@ sub map_print_dates {
my $navmap = $res->{NAV_MAP}; # slightly OO dirty.
- # Don't bother looping over undefined or empty parts array;
+ # Don't bother looping over undefined or empty parts arraY;
if (@parts) {
foreach my $part (@parts) {
@@ -897,8 +765,8 @@ sub master_seq_to_person_seq {
my $iterator = $navmap->getIterator($start,$finish,{},1);
# Iterate on the resource..select the items that are randomly selected
- # and that are in the seq_hash. Presumably the iterator will take care
- # of the random ordering part of the deal.
+ # and that are in the seq_has. Presumably the iterator will take care
+ # of the random ordering part of the deal.
my $curres;
while ($curres = $iterator->next()) {
#
@@ -974,7 +842,7 @@ sub set_font_size {
my ($text) = @_;
# There appear to be cases where the font directive is empty.. in which
- # case the first substitution would insert a spurious \ oh happy day.
+ # case the first substituion would insert a spurious \ oh happy day.
# as this has been the cause of much mystery and hair pulling _sigh_
if ($font_size ne '') {
@@ -992,7 +860,7 @@ sub set_font_size {
# - The PDF, if necessary, is replicated.
# - The PDF is added to the list of files to convert to postscript (along with the images).
# - The LaTeX is added to include the final converted postscript in the file as an included
-# job. The assumption is that the includepsheader.ps header will be included.
+# job. The assumption is that the includedpsheader.ps header will be included.
#
# Parameters:
# pdf_uri - URI of the PDF file to include.
@@ -1016,9 +884,9 @@ sub include_pdf {
$file = &Apache::lonnet::filelocation('',$pdf_uri);
}
- # The file is now replicated locally ... or it did not exist in the first place
+ # The file isn ow replicated locally.. or it did not exist in the first place
# (unlikely). If it did exist, add the pdf to the set of files/images that
- # need to be converted for this print job:
+ # need tob e converted for this print job:
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
$file =~ s{(.*)/res/}{$londocroot/res/};
@@ -1155,8 +1023,8 @@ sub printf_style_subst {
if ($size ne "") {
$subst = substr($subst, 0, $size);
- # Here's a nice edge case ... suppose the end of the
- # substring is a \. In that case may have just
+ # Here's a nice edge case.. supose the end of the
+ # substring is a \. In that case may have just
# chopped off a TeX escape... in that case, we append
# " " for the trailing character, and let the field
# spill over a bit (sigh).
@@ -1444,7 +1312,7 @@ sub compare_names {
}
# Break the tie on the first name, but there are leading (possibly trailing
- # whitespaces to get rid of first)
+ # whitespaces to get rid of first
#
$f1 =~ s/^\s+//; # Remove leading...
$f1 =~ s/\s+$//; # Trailing spaces from first 1...
@@ -1865,11 +1733,11 @@ my %page_formats=
('letter' => {
'book' => {
'1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.275 in'],
- '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.275 in']
+ '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','-0.4 in']
},
'album' => {
'1' => [ '8.8 in', '6.8 in','-0.55 in', '-0.55 in','0.394 in'],
- '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
+ '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.25 in']
},
},
'legal' => {
@@ -2535,7 +2403,7 @@ sub load_skips {
my ($helper) = @_;
- # If this is the first time, unwrap the resources and extra spaces:
+ # If this is the first time, unrap the resources and extra spaces:
if (!$skips_loaded) {
@extraspace = (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE'}));
@@ -2842,8 +2710,8 @@ ENDPART
my @student_names=();
- # Common settings for the %form hash:
- # In some cases these settings get overridden by specific cases, but the
+ # Common settings for the %form has:
+ # In some cases these settings get overriddent by specific cases, but the
# settings are common enough to make it worthwhile factoring them out
# here.
#
@@ -3251,9 +3119,7 @@ ENDPART
($print_type eq 'all_problems_students') ||
($print_type eq 'resources_for_students') ||
($print_type eq 'incomplete_problems_selpeople_course') ||
- ($print_type eq 'map_incomplete_problems_people_seq') ||
- ($print_type eq 'select_sequences_problems_for_students') ||
- ($print_type eq 'select_sequences_resources_for_students')) {
+ ($print_type eq 'map_incomplete_problems_people_seq')){
#-- prints assignments for whole class or for selected students
@@ -3262,12 +3128,10 @@ ENDPART
($print_type eq 'problems_for_students_from_page') ||
($print_type eq 'all_problems_students') ||
($print_type eq 'incomplete_problems_selpeople_course') ||
- ($print_type eq 'map_incomplete_problems_people_seq') ||
- ($print_type eq 'select_sequences_problems_for_students')) {
+ ($print_type eq 'map_incomplete_problems_people_seq')) {
$selectionmade=5;
$type='problems';
- } elsif (($print_type eq 'resources_for_students') ||
- ($print_type eq 'select_sequences_resources_for_students')) {
+ } elsif ($print_type eq 'resources_for_students') {
$selectionmade=8;
$type='resources';
}
@@ -3312,8 +3176,6 @@ ENDPART
($map, my $id, my $resource) =
&Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
}
- } elsif (($helper->{'VARS'}->{'postdata'} eq '/adm/navmaps') && ($perm{'pfo'})) {
- $map = $helper->{'VARS'}->{'SEQUENCE'};
}
#loop over students
@@ -3373,9 +3235,7 @@ ENDPART
$result .= $print_array[0].' \end{document}';
} elsif (($print_type eq 'problems_for_anon') ||
($print_type eq 'problems_for_anon_page') ||
- ($print_type eq 'resources_for_anon') ||
- ($print_type eq 'select_sequences_problems_for_anon') ||
- ($print_type eq 'select_sequences_resources_for_anon')) {
+ ($print_type eq 'resources_for_anon') ) {
my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
@@ -3403,8 +3263,6 @@ ENDPART
if ($helper->{VARS}{'symb'}) {
($map, my $id, my $resource) =
&Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
- } elsif (($helper->{'VARS'}->{'postdata'} eq '/adm/navmaps') && ($perm{'pfo'})) {
- $map = $helper->{'VARS'}->{'SEQUENCE'};
}
my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
$moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};
@@ -3626,9 +3484,6 @@ ENDPART
$URLback .= (($URLback =~ /\?/) ? '&':'?').'symb='.&escape($symb.$anchor);
}
}
- } elsif (($helper->{VARS}->{'postdata'} eq '/adm/navmaps') &&
- ($env{'request.course.id'})) {
- $URLback=$helper->{VARS}->{'postdata'};
}
#
# Final adjustment of the font size:
@@ -3803,7 +3658,7 @@ sub print_resources {
# nice to put the special in as a postscript comment
# e.g. \special{ps:\ENDOFSTUDENTSTAMP} unfortunately,
# The special gets passed the \ and dvips puts it in the output file
- # so we will just rely on printout.pl to strip ENDOFSTUDENTSTAMP from the
+ # so we will just rely on prntout.pl to strip ENDOFSTUDENTSTAMP from the
# postscript. Each ENDOFSTUDENTSTAMP will go on a line by itself.
#
@@ -4212,9 +4067,7 @@ sub printHelper {
$helper->{VARS}->{'construction'} = 1;
} else {
if ($env{'form.postdata'}) {
- unless ($env{'form.postdata'} eq '/adm/navmaps') {
- $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
- }
+ $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
if ( $helper->{VARS}->{'symb'} eq '') {
$helper->{VARS}->{'postdata'} = $env{'form.postdata'};
}
@@ -4223,42 +4076,23 @@ sub printHelper {
$helper->{VARS}->{'symb'} = $env{'form.symb'};
}
if ($env{'form.url'}) {
- unless ($env{'form.url'} eq '/adm/navmaps') {
- $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
- }
+ $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
}
+
+ }
+
+ if ($env{'form.symb'}) {
+ $helper->{VARS}->{'symb'} = $env{'form.symb'};
}
+ if ($env{'form.url'}) {
+ $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+ }
if ($helper->{VARS}->{'symb'} ne '') {
$helper->{VARS}->{'symb'}=
&Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
}
- my ($resourceTitle,$sequenceTitle,$mapTitle,$cdom,$cnum);
- if ($helper->{VARS}->{'postdata'} eq '/adm/navmaps') {
- $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
- "uploaded/$cdom/$cnum/default.sequence") {
- my $navmap = Apache::lonnavmaps::navmap->new();
- if (ref($navmap)) {
- my @toplevelres = $navmap->retrieveResources('',sub { !(($_[0]->is_map()) || ($_[0]->src =~ /^\/adm\/navmaps/)) },0,0);
- if (@toplevelres) {
- my @printable;
- if ($perm{'pav'} || $perm{'pfo'}) {
- @printable = @toplevelres;
- } else {
- @printable = $navmap->retrieveResources(undef,sub { $_[0]->resprintable() },0,1);
- }
- if (@printable) {
- $sequenceTitle = 'Main Content';
- $mapTitle = $sequenceTitle;
- }
- }
- }
- }
- } else {
- ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
- }
+ my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
@@ -4290,24 +4124,10 @@ sub printHelper {
($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
$helper->{VARS}->{'postdata'} =
&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
- } elsif (($helper->{VARS}->{'postdata'} eq '/adm/navmaps') &&
- ($env{'request.course.id'} ne '')) {
- if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
- "uploaded/$cdom/$cnum/default.sequence") {
- $map = $env{'course.'.$env{'request.course.id'}.'.url'};
- $url = $helper->{VARS}->{'postdata'};
- }
- }
- if (($symb ne '') || ($map ne '')) {
if (!$userCanPrint) {
my $navmap = Apache::lonnavmaps::navmap->new();
if (ref($navmap)) {
- my $res;
- if ($symb ne '') {
- $res = $navmap->getBySymb($symb);
- } elsif ($map ne '') {
- $res = $navmap->getResourceByUrl($map);
- }
+ my $res = $navmap->getBySymb($symb);
if (ref($res)) {
$res_printable = $res->resprintable(); #printability in course context
($res_printstartdate, $res_printenddate) = &get_print_dates($res);
@@ -4331,11 +4151,7 @@ sub printHelper {
my $postdata = $helper->{VARS}->{'postdata'};
$resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
}
- if (($url eq '/adm/navmaps') && ($map eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
- $res_printable=0;
- } else {
- $subdir = &Apache::lonnet::filelocation("", $url);
- }
+ $subdir = &Apache::lonnet::filelocation("", $url);
}
@@ -4456,7 +4272,7 @@ sub printHelper {
$isNotMap, '', $symbFilter,
$start_new_option);
-
+
@@ -4474,25 +4290,20 @@ sub printHelper {
# the exact form of this depends on whether or not we are privileged or a mere
# plebe of s student:
- my $optionText = '';
my $printSelector = 'map_incomplete_problems_seq';
my $nextState = 'CHOOSE_INCOMPLETE_SEQ';
my $textSuffix = '';
- my $nocurrloc = '';
- if ($helper->{VARS}->{'postdata'} eq '/adm/navmaps') {
- $nocurrloc = 1;
- }
if ($userCanPrint) {
$printSelector = 'map_incomplete_problems_people_seq';
$nextState = 'CHOOSE_INCOMPLETE_PEOPLE_SEQ';
$textSuffix = ' for selected students';
my $helperStates =
- &create_incomplete_folder_selstud_helper($helper, $map, $nocurrloc);
+ &create_incomplete_folder_selstud_helper($helper, $map);
&Apache::lonxml::xmlparse($r, 'helper', $helperStates);
} else {
if (&printable($map_open, $map_close)) {
- my $helperStates = &create_incomplete_folder_helper($helper, $map, $nocurrloc); # Create needed states for student.
+ my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.
&Apache::lonxml::xmlparse($r, 'helper', $helperStates);
} else {
# TODO: Figure out how to break the news...this folder is not printable.
@@ -4500,41 +4311,26 @@ sub printHelper {
}
if ($userCanPrint || &printable($map_open, $map_close)) {
- if ($helper->{VARS}->{'postdata'} eq '/adm/navmaps') {
- $optionText = &mt('Selected [_1]Incomplete Problems[_2] [_3]not in a folder[_4]' . $textSuffix,
- '','','','');
- } else {
- $optionText = &mt('Selected [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
- '','',''.$sequenceTitle.'');
- }
push(@{$printChoices},
- [$optionText,
+ [&mt('Selected [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
+ '', '',
+ ''. $sequenceTitle . ''),
$printSelector,
$nextState]);
}
# Allow problems from sequence
if ($userCanPrint || &printable($map_open, $map_close)) {
- if ($helper->{VARS}->{'postdata'} eq '/adm/navmaps') {
- $optionText = &mt('Selected [_1]Problems[_2] [_3]not in a folder[_4]','','','','');
- } else {
- $optionText = &mt('Selected [_1]Problems[_2] from folder [_3]','','',''.$sequenceTitle.'');
- }
push @{$printChoices},
- [$optionText,
+ [&mt('Selected [_1]Problems[_2] from folder [_3]','','',''.$sequenceTitle.''),
'map_problems',
'CHOOSE_PROBLEMS'];
# Allow all resources from sequence
- if ($helper->{VARS}->{'postdata'} eq '/adm/navmaps') {
- $optionText = &mt('Selected [_1]Resources[_2] [_3]not in a folder[_4]','','','','');
- } else {
- $optionText = &mt('Selected [_1]Resources[_2] from folder [_3]','','',''.$sequenceTitle.'');
- }
- push @{$printChoices}, [$optionText,
+ push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','','',''.$sequenceTitle.''),
'map_problems_pages',
'CHOOSE_PROBLEMS_HTML'];
my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
'Select Problem(s) to print',
- 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" nocurrloc="'.$nocurrloc.'"',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',
'RESOURCES',
'PAGESIZE',
$map,
@@ -4543,7 +4339,7 @@ sub printHelper {
$start_new_option);
$helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
'Select Resource(s) to print',
- 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" nocurrloc="'.$nocurrloc.'" suppressNavmap="1"',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
'RESOURCES',
'PAGESIZE',
$map,
@@ -4561,13 +4357,12 @@ sub printHelper {
my $post_data = $helper->{VARS}->{'postdata'};
if ($perm{'pfo'} && !$is_published &&
- ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
+ ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
# BZ 5209 - incomplete problems from entire course:
push(@{$printChoices},
- [&mt('Selected [_1]Incomplete Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]',
- '','','','','',''),
+ [&mtn('Selected Incomplete Problems from entire course for selected people'),
'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.
@@ -4575,9 +4370,9 @@ sub printHelper {
# Selected problems/resources from entire course:
- push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from [_3]entire course[_4]','','','',''), 'all_problems', 'ALL_PROBLEMS'];
- push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from [_3]entire course[_4]','','','',''), 'all_resources', 'ALL_RESOURCES'];
- push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]','','','','','',''), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
+ push @{$printChoices}, [&mtn('Selected Problems from entire course'), 'all_problems', 'ALL_PROBLEMS'];
+ push @{$printChoices}, [&mtn('Selected Resources from entire course'), 'all_resources', 'ALL_RESOURCES'];
+ push @{$printChoices}, [&mtn('Selected Problems from entire course for selected people'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
my $suffixXml = <
Select sorting order of printout
@@ -4639,8 +4434,138 @@ ALL_PROBLEMS
'problems_for_anon', 'CHOOSE_ANON1'];
}
- my ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice) =
- &generate_common_choosers($r,$helper,$map,$url,$isProblem,$symbFilter,$start_new_option);
+ my $randomly_ordered_warning =
+ &get_randomly_ordered_warning($helper, $map);
+
+ # resource_selector will hold a few states that:
+ # - Allow resources to be selected for printing.
+ # - Determine pagination between assignments.
+ # - Determine how many assignments should be bundled into a single PDF.
+ # TODO:
+ # Probably good to do things like separate this up into several vars, each
+ # with one state, and use REGEXPs at inclusion time to set state names
+ # and next states for better mix and match capability
+ #
+ my $resource_selector= &generate_resource_chooser('SELECT_PROBLEMS',
+ 'Select resources to print',
+ 'multichoice="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
+ 'RESOURCES',
+ 'PRINT_FORMATTING',
+ $map,
+ $isProblem, '', $symbFilter,
+ $start_new_option);
+ $resource_selector .= &generate_format_selector($helper,
+ 'How should results be printed?',
+ 'PRINT_FORMATTING').
+ &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
+ 'Select Problem(s) to print',
+ "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",
+ 'RESOURCES',
+ 'PRINT_FORMATTING',
+ $url,
+ $isProblem, '', $symbFilter,
+ $start_new_option);
+
+
+# Generate student choosers.
+
+
+
+ &Apache::lonxml::xmlparse($r, 'helper',
+ &generate_student_chooser('CHOOSE_TGT_STUDENTS_PAGE',
+ 'student_sort',
+ 'STUDENTS',
+ 'CHOOSE_STUDENTS_PAGE'));
+ &Apache::lonxml::xmlparse($r, 'helper',
+ &generate_student_chooser('CHOOSE_STUDENTS',
+ 'student_sort',
+ 'STUDENTS',
+ 'SELECT_PROBLEMS'));
+ &Apache::lonxml::xmlparse($r, 'helper', $resource_selector);
+
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
+ my $namechoice='';
+ foreach my $name (sort {uc($a) cmp uc($b)} @names) {
+ if ($name =~ /^error: 2 /) { next; }
+ if ($name =~ /^type\0/) { next; }
+ $namechoice.=''.$name.'';
+ }
+
+
+ my %code_values;
+ my %codes_to_print;
+ foreach my $key (@names) {
+ %code_values = &Apache::grades::get_codes($key, $cdom, $cnum);
+ foreach my $key (keys(%code_values)) {
+ $codes_to_print{$key} = 1;
+ }
+ }
+
+ my $code_selection;
+ foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {
+ my $choice = $code;
+ if ($code =~ /^[A-Z]+$/) { # Alpha code
+ $choice = &letters_to_num($code);
+ }
+ push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
+ }
+ if (%codes_to_print) {
+ $code_selection .='
+ Choose single CODE from list:
+ |
+
+
+
+ push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
+
+
+ |
+ '.$/;
+
+ }
+
+ my @lines = &Apache::lonnet::get_scantronformat_file();
+ my $codechoice='';
+ foreach my $line (@lines) {
+ next if (($line =~ /^\#/) || ($line eq ''));
+ my ($name,$description,$code_type,$code_length)=
+ (split(/:/,$line))[0,1,2,4];
+ if ($code_length > 0 &&
+ $code_type =~/^(letter|number|-1)/) {
+ $codechoice.=''.$description.'';
+ }
+ }
+ if ($codechoice eq '') {
+ $codechoice='Default';
+ }
+ my $anon1 = &generate_code_selector($helper,
+ 'CHOOSE_ANON1',
+ 'SELECT_PROBLEMS',
+ $codechoice,
+ $code_selection,
+ $namechoice) . $resource_selector;
+
+
+ &Apache::lonxml::xmlparse($r, 'helper',$anon1);
+
+ my $anon_page = &generate_code_selector($helper,
+ 'CHOOSE_ANON1_PAGE',
+ 'SELECT_PROBLEMS_PAGE',
+ $codechoice,
+ $code_selection,
+ $namechoice) .
+ &generate_resource_chooser('SELECT_PROBLEMS_PAGE',
+ 'Select Problem(s) to print',
+ "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",
+ 'RESOURCES',
+ 'PRINT_FORMATTING',
+ $url,
+ $isProblem, '', $symbFilter,
+ $start_new_option);
+ &Apache::lonxml::xmlparse($r, 'helper', $anon_page);
+
if ($helper->{VARS}->{'assignment'}) {
@@ -4649,18 +4574,9 @@ ALL_PROBLEMS
push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]','','',''.$sequenceTitle.'','',''), 'resources_for_students', 'CHOOSE_STUDENTS1'];
push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]','','',''.$sequenceTitle.'','',''), 'resources_for_anon', 'CHOOSE_ANON2'];
}
-
- # resource_selector will hold a few states that:
- # - Allow resources to be selected for printing.
- # - Determine pagination between assignments.
- # - Determine how many assignments should be bundled into a single PDF.
- # TODO:
- # Probably good to do things like separate this up into several vars, each
- # with one state, and use REGEXPs at inclusion time to set state names
- # and next states for better mix and match capability
- #
- my $resource_selector=<
$randomly_ordered_warning
PRINT_FORMATTING
@@ -4757,7 +4673,6 @@ CHOOSE_ANON2
# FIXME: That RE should come from a library somewhere.
if (($perm{'pav'}
- && ($subdir ne '')
&& $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
&& (defined($helper->{'VARS'}->{'construction'})
||
@@ -4791,148 +4706,14 @@ CHOOSE_FROM_SUBDIR
# Allow the user to select any sequence in the course, feed it to
# another resource selector for that sequence
- if ((!$helper->{VARS}->{'construction'}) &&
- (!$is_published || (($subdir eq '') && ($url eq '/adm/navmaps')))) {
- push(@$printChoices,[&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course',
- '','','',''),
- 'select_sequences','CHOOSE_SEQUENCE']);
- my $escapedSequenceName;
- if ($helper->{VARS}->{'SEQUENCE'} ne '') {
- $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
- } elsif (($subdir eq '') && ($url eq '/adm/navmaps')) {
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
- "uploaded/$cdom/$cnum/default.sequence") {
- $escapedSequenceName = $env{'course.'.$env{'request.course.id'}.'.url'};
- }
- }
- #Escape apostrophes and backslashes for Perl
- $escapedSequenceName =~ s/\\/\\\\/g;
- $escapedSequenceName =~ s/'/\\'/g;
- my $nocurrloc;
- if (($subdir eq '') && ($url eq '/adm/navmaps')) {
- $nocurrloc = 'nocurrloc="1"';
- if ($perm{'pfo'}) {
- push(@{$printChoices},
- [&mt('Selected [_1]Problems[_2] from [_3]selected folder[_4] in course for [_5]selected people[_6]',
- '','','','','',''),
- 'select_sequences_problems_for_students','CHOOSE_SEQUENCE_STUDENTS'],
- [&mt('Selected [_1]Problems[_2] from [_3]selected folder[_4] in course for [_5]CODEd assignments[_6]',
- '','','','','',''),
- 'select_sequences_problems_for_anon','CHOOSE_SEQUENCE_ANON1'],
- [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course for [_5]selected people[_6]',
- '','','','','',''),
- 'select_sequences_resources_for_students','CHOOSE_SEQUENCE_STUDENTS1'],
- [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course for [_5]CODEd assignments[_6]',
- '','','','','',''),
- 'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']);
- if ($escapedSequenceName) {
- my ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice) =
- &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,
- $isProblem,$symbFilter,$start_new_option);
-
- my $resource_selector = <
-
- Sort by section then student
- Sort by students across sections.
-
-
-
-
-
-
- $randomly_ordered_warning
- PRINT_FORMATTING
- (mark desired resources then click "next" button)
-
- return $isNotMap;
- $escapedSequenceName
- return $symbFilter;
- $start_new_option
-
-
-RESOURCE_SELECTOR
-
- my $anon3 = &generate_code_selector($helper,
- 'CHOOSE_ANON3',
- 'SELECT_RESOURCES',
- $codechoice,
- $code_selection,
- $namechoice) . $resource_selector;
-
- &Apache::lonxml::xmlparse($r, 'helper',$anon3);
- }
- }
- }
- if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) {
- &Apache::lonxml::xmlparse($r, 'helper', <
- Select the sequence to print resources from:
-
- CHOOSE_FROM_ANY_SEQUENCE
- return &Apache::lonprintout::printable_sequence(\$res);
- return $urlValue;
- return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
-
-
-
-
- Select the sequence to print resources from:
-
- CHOOSE_STUDENTS
- return &Apache::lonprintout::printable_sequence(\$res);
- return $urlValue;
- return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
-
-
-
-
- Select the sequence to print resources from:
-
- CHOOSE_ANON1
- return &Apache::lonprintout::printable_sequence(\$res);
- return $urlValue;
- return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
-
-
-
-
- Select the sequence to print resources from:
-
- CHOOSE_STUDENTS2
- return &Apache::lonprintout::printable_sequence(\$res);
- return $urlValue;
- return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
-
-
-
-
- Select the sequence to print resources from:
-
- CHOOSE_ANON3
- return &Apache::lonprintout::printable_sequence(\$res);
- return $urlValue;
- return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
-
-
-
-
- (mark desired resources then click "next" button)
-
- PAGESIZE
- return $isNotMap
- return '$escapedSequenceName';
- return $symbFilter;
- $start_new_option
-
-
-CHOOSE_FROM_ANY_SEQUENCE
- } else {
- &Apache::lonxml::xmlparse($r, 'helper', <{VARS}->{'construction'} && !$is_published) {
+ push @$printChoices, [&mtn("Selected Resources from selected folder in course"),
+ 'select_sequences', 'CHOOSE_SEQUENCE'];
+ my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
+ #Escape apostrophes and backslashes for Perl
+ $escapedSequenceName =~ s/\\/\\\\/g;
+ $escapedSequenceName =~ s/'/\\'/g;
+ &Apache::lonxml::xmlparse($r, 'helper', <
Select the sequence to print resources from:
@@ -4946,7 +4727,7 @@ CHOOSE_FROM_ANY_SEQUENCE
(mark desired resources then click "next" button)
+ closeallpages="1" modallink="1" suppressNavmap="1">
PAGESIZE
return $isNotMap
return '$escapedSequenceName';
@@ -4955,8 +4736,8 @@ CHOOSE_FROM_ANY_SEQUENCE
CHOOSE_FROM_ANY_SEQUENCE
- }
- }
+}
+
my $numchoices = 0;
if (ref($printChoices) eq 'ARRAY') {
$numchoices = @{$printChoices};
|