|
+ '.$/;
+ }
+
+ 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)
@@ -458,7 +588,9 @@ 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 'resources_for_anon') ||
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences_problems_for_anon') ||
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences_resources_for_anon')) {
$secpdfoption = 'Each PDF contains exactly one section';
}
return <{'VARS'}->{'style_file'}=~/\w/) {
&Apache::lonnet::appenv({'construct.style' =>
@@ -2148,7 +2285,7 @@ sub print_page_in_course {
foreach my $resource (@page_resources) {
my $resource_src = $resource->src(); # Essentially the URL of the resource.
- $result .= $resource->title() . '\\\\';
+ my $current_url = $resource->link();
# Recurse if a .page:
@@ -2158,11 +2295,10 @@ sub print_page_in_course {
$result .= &print_page_in_course($helper, $rparmhash,
$resource_src, \@page_resources);
} elsif ($resource->ext()) {
- $result .= &unsupported($currentURL,$mode,$symb);
- }
- # these resources go through the XML transformer:
-
- elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
+ $result.=&latex_header_footer_remove(&unsupported($current_url,$mode,$resource->symb));
+ } elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
+ # these resources go through the XML transformer:
+ $result .= &Apache::lonxml::latex_special_symbols($resource->title()) . '\\\\';
my $urlp = &Apache::lonnet::clutter($resource_src);
@@ -2546,7 +2682,7 @@ sub print_construction_sequence {
my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$body.=&path_to_problem($urlp,$LaTeXwidth);
$body.='\vskip 1 mm '.$answer.'\end{document}';
- $body = &encapsulate_minipage($body);
+ $body = &encapsulate_minipage($body,$answerform{'problem_split'});
$texversion.=$body;
}
}
@@ -2939,7 +3075,6 @@ ENDPART
&Apache::lonenc::reset_enc();
-
# Note due to document structure, not allowed to put \newpage
# prior to the first resource
@@ -3012,7 +3147,7 @@ ENDPART
my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$body .= &path_to_problem ($urlp,$LaTeXwidth);
$body .='\vskip 1 mm '.$answer;
- $body = &encapsulate_minipage($body);
+ $body = &encapsulate_minipage($body,$answerform{'problem_split'});
$texversion .= $body;
} else {
$texversion='';
@@ -3114,7 +3249,9 @@ 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 'map_incomplete_problems_people_seq') ||
+ ($print_type eq 'select_sequences_problems_for_students') ||
+ ($print_type eq 'select_sequences_resources_for_students')) {
#-- prints assignments for whole class or for selected students
@@ -3123,10 +3260,12 @@ 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 'map_incomplete_problems_people_seq') ||
+ ($print_type eq 'select_sequences_problems_for_students')) {
$selectionmade=5;
$type='problems';
- } elsif ($print_type eq 'resources_for_students') {
+ } elsif (($print_type eq 'resources_for_students') ||
+ ($print_type eq 'select_sequences_resources_for_students')) {
$selectionmade=8;
$type='resources';
}
@@ -3165,8 +3304,12 @@ ENDPART
my $map;
if ($helper->{VARS}->{'symb'}) {
- ($map, my $id, my $resource) =
- &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
+ unless ((($print_type eq 'all_problems_students') ||
+ ($print_type eq 'incomplete_problems_selpeople_course')) &&
+ $perm{'pfo'}) {
+ ($map, my $id, my $resource) =
+ &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
+ }
}
#loop over students
@@ -3226,7 +3369,9 @@ 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 'resources_for_anon') ||
+ ($print_type eq 'select_sequences_problems_for_anon') ||
+ ($print_type eq 'select_sequences_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'};
@@ -3238,7 +3383,7 @@ ENDPART
my @lines = &Apache::lonnet::get_scantronformat_file();
my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
foreach my $line (@lines) {
- chomp($line);
+ next if (($line =~ /^\#/) || ($line eq ''));
my ($name,$type,$length,$bubbles_per_item) =
(split(/:/,$line))[0,2,4,17];
if ($name eq $code_option) {
@@ -3250,18 +3395,10 @@ ENDPART
}
}
}
- my ($randomorder,$randompick,$map);
+ my $map;
if ($helper->{VARS}{'symb'}) {
($map, my $id, my $resource) =
&Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
- my $navmap = Apache::lonnavmaps::navmap->new();
- if (defined($navmap)) {
- if ($map) {
- my $mapres = $navmap->getResourceByUrl($map);
- $randomorder = $mapres->randomorder();
- $randompick = $mapres->randompick();
- }
- }
}
my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
$moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};
@@ -3330,14 +3467,11 @@ ENDPART
} else {
$moreenv{'CODE'}=&num_to_letters($code);
}
- my $actual_seq = \@master_seq;
- if ($randomorder || $randompick) {
- $env{'form.CODE'} = $moreenv{'CODE'};
- $actual_seq = master_seq_to_person_seq($map, \@master_seq,
- undef,
- $moreenv{'CODE'}, $nohidemap);
- delete($env{'form.CODE'});
- }
+ $env{'form.CODE'} = $moreenv{'CODE'};
+ my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
+ undef,
+ $moreenv{'CODE'}, $nohidemap);
+ delete($env{'form.CODE'});
my ($output,$fullname, $printed)=
&print_resources($r,$helper,'anonymous',$type,\%moreenv,
$actual_seq,$flag_latex_header_remove,
@@ -3455,12 +3589,13 @@ ENDPART
my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
- my ($anchor,$usehttp);
+ my ($anchor,$usehttp,$plainurl);
$url = &Apache::lonnet::clutter($url);
+ $plainurl = $url;
if (($ENV{'SERVER_PORT'} == 443) && ($env{'request.course.id'}) &&
(($url =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) ||
($url =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}))) {
- unless (&Apache::lonnet::uses_sts()) {
+ unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl())) {
$usehttp = 1;
}
}
@@ -3481,8 +3616,13 @@ ENDPART
if ($usehttp) {
$URLback .= (($URLback =~ /\?/) ? '&':'?').'usehttp=1';
}
- $URLback .= (($URLback =~ /\?/) ? '&':'?').'symb='.&escape($symb.$anchor);
+ unless ($plainurl =~ /\.page$/) {
+ $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:
@@ -3733,7 +3873,7 @@ sub print_resources {
my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$body .=&path_to_problem($res_url,$LaTeXwidth);
$body .='\vskip 1 mm '.$ansrendered;
- $body = &encapsulate_minipage($body);
+ $body = &encapsulate_minipage($body,$answerenv{'problem_split'});
$rendered = $header.$body;
}
}
@@ -3823,7 +3963,7 @@ sub print_resources {
$message = &mt('No incomplete resources');
}
if ($message) {
- $current_output = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n");
+ $current_output = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n",$moreenv->{'problem_split'});
}
if ($remove_latex_header eq "NO") {
$current_output = &print_latex_header() . $current_output;
@@ -3885,8 +4025,9 @@ sub handler {
if ($env{'request.course.id'}) {
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $clientip = &Apache::lonnet::get_requestor_ip($r);
my ($blocked,$blocktext) =
- &Apache::loncommon::blocking_status('printout',$cnum,$cdom);
+ &Apache::loncommon::blocking_status('printout',$clientip,$cnum,$cdom);
if ($blocked) {
my $checkrole = "cm./$cdom/$cnum";
if ($env{'request.course.sec'} ne '') {
@@ -4064,7 +4205,9 @@ sub printHelper {
$helper->{VARS}->{'construction'} = 1;
} else {
if ($env{'form.postdata'}) {
- $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
+ unless ($env{'form.postdata'} eq '/adm/navmaps') {
+ $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
+ }
if ( $helper->{VARS}->{'symb'} eq '') {
$helper->{VARS}->{'postdata'} = $env{'form.postdata'};
}
@@ -4073,22 +4216,42 @@ sub printHelper {
$helper->{VARS}->{'symb'} = $env{'form.symb'};
}
if ($env{'form.url'}) {
- $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+ unless ($env{'form.url'} eq '/adm/navmaps') {
+ $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) = &details_for_menu($helper);
+ 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);
+ }
if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
@@ -4120,10 +4283,24 @@ 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 = $navmap->getBySymb($symb);
+ my $res;
+ if ($symb ne '') {
+ $res = $navmap->getBySymb($symb);
+ } elsif ($map ne '') {
+ $res = $navmap->getResourceByUrl($map);
+ }
if (ref($res)) {
$res_printable = $res->resprintable(); #printability in course context
($res_printstartdate, $res_printenddate) = &get_print_dates($res);
@@ -4147,7 +4324,11 @@ sub printHelper {
my $postdata = $helper->{VARS}->{'postdata'};
$resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
}
- $subdir = &Apache::lonnet::filelocation("", $url);
+ if (($url eq '/adm/navmaps') && ($map eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
+ $res_printable=0;
+ } else {
+ $subdir = &Apache::lonnet::filelocation("", $url);
+ }
}
@@ -4261,14 +4442,14 @@ sub printHelper {
$helperFragment .= &generate_resource_chooser('CHOOSE_RESOURCES_PAGE',
'Select Resource(s) to print',
- 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
'RESOURCES',
'PAGESIZE',
$url,
$isNotMap, '', $symbFilter,
$start_new_option);
-
+
@@ -4286,20 +4467,25 @@ 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);
+ &create_incomplete_folder_selstud_helper($helper, $map, $nocurrloc);
&Apache::lonxml::xmlparse($r, 'helper', $helperStates);
} else {
if (&printable($map_open, $map_close)) {
- my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.
+ my $helperStates = &create_incomplete_folder_helper($helper, $map, $nocurrloc); # 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.
@@ -4307,26 +4493,41 @@ 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},
- [&mt('Selected [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
- '', '',
- ''. $sequenceTitle . ''),
+ [$optionText,
$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},
- [&mt('Selected [_1]Problems[_2] from folder [_3]','','',''.$sequenceTitle.''),
+ [$optionText,
'map_problems',
'CHOOSE_PROBLEMS'];
# Allow all resources from sequence
- push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','','',''.$sequenceTitle.''),
+ 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,
'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"',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" nocurrloc="'.$nocurrloc.'"',
'RESOURCES',
'PAGESIZE',
$map,
@@ -4335,7 +4536,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"',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1" nocurrloc="'.$nocurrloc.'" suppressNavmap="1"',
'RESOURCES',
'PAGESIZE',
$map,
@@ -4353,12 +4554,13 @@ 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},
- [&mtn('Selected Incomplete Problems from entire course for selected people'),
+ [&mt('Selected [_1]Incomplete Problems[_2] from [_3]entire course[_4] for [_5]selected people[_6]',
+ '','','','','',''),
'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.
@@ -4366,9 +4568,9 @@ sub printHelper {
# Selected problems/resources from entire course:
- 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'];
+ 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'];
my $suffixXml = <
Select sorting order of printout
@@ -4392,7 +4594,7 @@ ALL_PROBLEMS
$start_new_option) .
&generate_resource_chooser('ALL_RESOURCES',
'Select Resource(s) to print',
- " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1' modallink='1'",
+ 'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1" modallink="1" suppressNavmap="1"',
'RESOURCES',
'PAGESIZE',
'',
@@ -4430,138 +4632,8 @@ ALL_PROBLEMS
'problems_for_anon', 'CHOOSE_ANON1'];
}
- 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"',
- '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);
-
+ my ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice) =
+ &generate_common_choosers($r,$helper,$map,$url,$isProblem,$symbFilter,$start_new_option);
if ($helper->{VARS}->{'assignment'}) {
@@ -4570,9 +4642,18 @@ 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=<
$randomly_ordered_warning
PRINT_FORMATTING
@@ -4669,6 +4750,7 @@ 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'})
||
@@ -4702,14 +4784,113 @@ 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) {
- 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', <{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) {
+ &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,$isProblem,$symbFilter,$start_new_option);
+ }
+ }
+ }
+ 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_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);
+
+
+
+
+ (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', <
Select the sequence to print resources from:
@@ -4723,7 +4904,7 @@ CHOOSE_FROM_SUBDIR
(mark desired resources then click "next" button)
+ closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
PAGESIZE
return $isNotMap
return '$escapedSequenceName';
@@ -4732,8 +4913,8 @@ CHOOSE_FROM_SUBDIR
CHOOSE_FROM_ANY_SEQUENCE
-}
-
+ }
+ }
my $numchoices = 0;
if (ref($printChoices) eq 'ARRAY') {
$numchoices = @{$printChoices};
|