--- loncom/interface/lonsyllabus.pm 2013/05/15 18:45:29 1.126
+++ loncom/interface/lonsyllabus.pm 2013/08/27 03:00:38 1.130
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.126 2013/05/15 18:45:29 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.130 2013/08/27 03:00:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -73,12 +73,6 @@ sub handler {
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
my $crstype = &Apache::loncommon::course_type();
-# ------------------------------------------------------------ Print the screen
-
- if ($target eq 'tex') {
- $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
- }
-
# --------------------------------------------------------------- Force Student
my ($forceedit,$forcestudent);
if ($env{'form.forceedit'}) { $forceedit=1; }
@@ -124,19 +118,26 @@ sub handler {
if ($filecontents eq -1) {
$r->print(&mt('Syllabus file unavailable'));
} elsif ($filetype eq 'tex') {
- my $result = &Apache::lontexconvert::converted(\$filecontents,
- $env{'form.texengine'});
- my %args;
- &get_breadcrumbs($cdom,$cnum,$crstype,\%args);
- $r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).
- $result.
- &Apache::loncommon::end_page());
+ if ($target eq 'tex') {
+ $r->print($filecontents);
+ } else {
+ my $result = &Apache::lontexconvert::converted(\$filecontents,
+ $env{'form.texengine'});
+ my %args;
+ &get_breadcrumbs($cdom,$cnum,$crstype,\%args);
+ $r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).
+ $result.
+ &Apache::loncommon::end_page());
+ }
} else {
my %mystyle;
+ unless ($target eq 'tex') {
+ $target = 'web';
+ }
&Apache::structuretags::reset_problem_globals();
my $oldfile = $env{'request.filename'};
$env{'request.filename'} = $item;
- my $result = &Apache::lonxml::xmlparse($r,'web',$filecontents,
+ my $result = &Apache::lonxml::xmlparse($r,$target,$filecontents,
'',%mystyle);
&Apache::structuretags::reset_problem_globals();
&Apache::lonhomework::finished_parsing();
@@ -145,17 +146,37 @@ sub handler {
$r->print($result);
}
} else {
- $r->print(&Apache::lonwrapper::wrapper($item));
+ if ($target eq 'tex') {
+ $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
+ ' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.
+ &mt('Unsupported file type.').' \strut \\\\ '.
+ &mt('Print the syllabus directly from your web browser').
+ '\end{document}');
+ } else {
+ $r->print(&Apache::lonwrapper::wrapper($item));
+ }
}
return OK;
}
} elsif ($external=~/\w/) {
unless ($allowed && $forceedit) {
- $r->print(&Apache::lonwrapper::wrapper($external));
+ if ($target eq 'tex') {
+ $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
+ ' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.$external.' '.
+ ' \strut \\\\ '.&mt('Print the syllabus directly from your web browser').
+ '\end{document}');
+ } else {
+ $r->print(&Apache::lonwrapper::wrapper($external));
+ }
return OK;
}
}
+# ------------------------------------------------------------ Print the screen
+
+ if ($target eq 'tex') {
+ $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
+ }
# ------------------------------ The buck stops here: internal syllabus display
# --------------------------------------------------------- The syllabus fields
@@ -332,18 +353,18 @@ sub handler {
}
&Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box',
'box_000_showpeople',$display);
- $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed));
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,\%syllabus));
&Apache::lontemplate::print_end_template($r);
} else {
unless ($hidepersonnel) {
&Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box');
- $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed));
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,\%syllabus));
&Apache::lontemplate::print_end_template($r);
}
}
} else {
unless ($hidepersonnel) {
- $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed));
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,%syllabus));
}
}
# -------------------------------------------------------------- Announcements?
@@ -406,10 +427,6 @@ sub handler {
}
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
- if ($allowed) {
- $r->print(''.
+ $r->print(''.
&Apache::lonhtmlcommon::htmlareaselectactive());
}
} else {
@@ -940,49 +957,121 @@ sub fields_check_uncheck {
}
sub get_personnel {
- my ($r,$target,$cdom,$cnum,$allowed) = @_;
+ my ($r,$target,$cdom,$cnum,$allowed,$crstype,$syllabus) = @_;
+ my (%hiddenroles,%hiddenusers);
+ if (ref($syllabus) eq 'HASH') {
+ if (ref($syllabus->{'personnel'}) eq 'HASH') {
+ if ($syllabus->{'personnel'}{'hiderole'}) {
+ map { $hiddenroles{$_} = 1; } split(/,/,$syllabus->{'personnel'}{'hiderole'});
+ }
+ if ($syllabus->{'personnel'}{'hideuser'}) {
+ map { $hiddenusers{$_} = 1; } split(/,/,$syllabus->{'personnel'}{'hideuser'});
+ }
+ }
+ }
my $output;
- my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
+ my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum,1);
if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ if ($allowed) {
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '| '.&mt('Role hidden?').' | '.&mt('Role').' | '.
+ ''.&mt('Personnel (hidden if checked)').' | '.
+ &Apache::loncommon::end_data_table_header_row());
+ } else {
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ }
} else {
$r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
}
my @personnel=sort(keys(%coursepersonnel));
my $lastpers=$personnel[$#personnel];
foreach my $element (@personnel) {
+ unless ($allowed) {
+ next if ($hiddenroles{$element})
+ }
+ my ($role,$sec);
+ if ($element =~ /:/) {
+ ($role,$sec) = split(/:/,$element);
+ } else {
+ $role = $element;
+ }
+ my $roletext = &Apache::lonnet::plaintext($role,$crstype);
+ if ($sec) {
+ $roletext .=' ('.&Apache::lonlocal::mt('Section [_1]',$sec).')';
+ }
if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::row_title($element));
+ if ($allowed) {
+ my $checked;
+ if ($hiddenroles{$element}) {
+ $checked = ' checked="checked"';
+ }
+ $r->print(&Apache::loncommon::start_data_table_row().
+ ''.
+ ''.
+ ' | '.$roletext.' | ');
+ } else {
+ $r->print(&Apache::lonhtmlcommon::row_title($roletext));
+ }
} else {
- $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
+ $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$roletext).' & ');
}
my @coursepersonlist;
foreach my $user (split(/\,/,$coursepersonnel{$element})) {
my ($puname,$pudom)=split(/\:/,$user);
if ($target ne 'tex') {
my $courseperson = &Apache::loncommon::plainname($puname,$pudom);
- if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
- ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
- push(@coursepersonlist,$courseperson);
+ my $checked;
+ if ($hiddenusers{$element.'&'.$puname.':'.$pudom}) {
+ $checked = ' checked="checked"';
+ }
+ if ($allowed) {
+ my $item = ''.(' 'x2).' ';
+ push(@coursepersonlist,$item);
+
} else {
- push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson,
- $puname,$pudom));
+ next if ($hiddenusers{$element.'&'.$puname.':'.$pudom});
+ if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
+ ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
+ push(@coursepersonlist,$courseperson);
+ } else {
+ push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson,
+ $puname,$pudom));
+ }
}
} else {
push(@coursepersonlist,&Apache::loncommon::plainname($puname,
$pudom).' ');
}
}
- $r->print(join(", ",@coursepersonlist));
+ if ($allowed) {
+ $r->print(join('',@coursepersonlist));
+ } else {
+ $r->print(join(', ',@coursepersonlist));
+ }
if ($target ne 'tex') {
- my $lastclose=$element eq $lastpers?1:0;
- $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
+ if ($allowed) {
+ $r->print(' | '.&Apache::loncommon::end_data_table_row());
+ } else {
+ my $lastclose=$element eq $lastpers?1:0;
+ $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
+ }
} else {
$r->print('\\\\ \hline');
}
}
if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ if ($allowed) {
+ $r->print(&Apache::loncommon::end_data_table());
+ } else {
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ }
} else {
$r->print('\end{tabular}\\\\');
}
@@ -995,10 +1084,10 @@ sub save_changes {
unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH')) {
return ($earlyout,$uploaded,$external,$minimal,$output);
}
- if ($env{'form.deleteuploaded'}) {
+ if (($env{'form.deleteuploaded_file'}) || ($env{'form.deleteuploaded_minimal'})) {
my %storehash;
if (($env{'form.choice'} eq 'file') &&
- ($env{'form.deleteuploaded'} eq 'file') && ($uploaded =~ /\w/)) {
+ ($env{'form.deleteuploaded_file'}) && ($uploaded =~ /\w/)) {
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
$storehash{'uploadedsyllabus'} = '';
@@ -1007,7 +1096,7 @@ sub save_changes {
undef($uploaded);
undef($external);
} elsif (($env{'form.choice'} eq 'minimal') &&
- ($env{'form.deleteuploaded'} eq 'minimal') && ($minimal =~ /\w/)) {
+ ($env{'form.deleteuploaded_minimal'}) && ($minimal =~ /\w/)) {
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus');
$storehash{'externalsyllabus'} = '';
@@ -1030,6 +1119,33 @@ sub save_changes {
my ($prefix) = split(/_/,$field);
$syllabus->{'uploaded.fields'} .= $prefix.',';
}
+ if ($field eq '000_showpeople') {
+ my @hideusers = &Apache::loncommon::get_env_multiple('form.hideuser');
+ my @hideroles = &Apache::loncommon::get_env_multiple('form.hiderole');
+ my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum,1);
+ my %personnel;
+ foreach my $key (keys(%coursepersonnel)) {
+ map { $personnel{$key}{$_} = 1; } split(/,/,$coursepersonnel{$key});
+ }
+ %{$syllabus->{'personnel'}} = ();
+ $syllabus->{'personnel'}{'hideuser'} = '';
+ $syllabus->{'personnel'}{'hiderole'} = '';
+ foreach my $role (@hideroles) {
+ if (exists($personnel{$role})) {
+ $syllabus->{'personnel'}{'hiderole'} .= $role.',';
+ }
+ }
+ foreach my $item (@hideusers) {
+ my ($role,$user) = split(/\&/,$item);
+ if (ref($personnel{$role}) eq 'HASH') {
+ if ($personnel{$role}{$user}) {
+ $syllabus->{'personnel'}{'hideuser'} .= $item.',';
+ }
+ }
+ }
+ $syllabus->{'personnel'}{'hideuser'} =~ s/,$//;
+ $syllabus->{'personnel'}{'hiderole'} =~ s/,$//;
+ }
}
$syllabus->{'uploaded.fields'} =~ s/,$//;
}
@@ -1268,7 +1384,6 @@ sub update_syllabus_env {
$storehash{'updatedsyllabus'} = $now;
&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now
});
-
} elsif ($saved eq 'url') {
my $prefix = &home_http_host($cdom,$cnum);
if ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
@@ -1300,7 +1415,7 @@ sub update_syllabus_env {
if (@envkeys > 0) {
foreach my $item (@envkeys) {
my $key = $item.'syllabus';
- if ($courseenv->{$key}) {
+ if ($courseenv->{$key} ne '') {
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
$storehash{$key} = '';
}
@@ -1428,7 +1543,7 @@ sub editfile_button {
}
$output .= '
-
+
';
return $output;
}
@@ -1446,15 +1561,17 @@ sub editbutton_js {
document.location.href = url+'?editmode=1&forceedit=1';
}
function dodelete(caller,url) {
- document.syllabus.deleteuploaded.value=caller;
- if (caller == 'minimal') {
- if (confirm("$lt{'min'}"+"\\n"+"$lt{'noundo'}")) {
- document.syllabus.submit();
+ if (document.getElementById('deleteuploaded_'+caller)) {
+ document.getElementById('deleteuploaded_'+caller).value=1;
+ if (caller == 'minimal') {
+ if (confirm("$lt{'min'}"+"\\n"+"$lt{'noundo'}")) {
+ document.syllabus.submit();
+ }
}
- }
- if (caller == 'file') {
- if (confirm("$lt{'file'}"+"\\n"+"$lt{'noundo'}")) {
- document.syllabus.submit();
+ if (caller == 'file') {
+ if (confirm("$lt{'file'}"+"\\n"+"$lt{'noundo'}")) {
+ document.syllabus.submit();
+ }
}
}
return;