version 1.21, 2007/10/02 01:10:27
|
version 1.22, 2007/10/03 19:57:29
|
Line 128 sub course_selector {
|
Line 128 sub course_selector {
|
my $totcodes = 0; |
my $totcodes = 0; |
my $jscript = ''; |
my $jscript = ''; |
my ($numtitles,$lasttitle); |
my ($numtitles,$lasttitle); |
$totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes); |
$totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom); |
if ($totcodes > 0) { |
if ($totcodes > 0) { |
$format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order); |
$format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order); |
if ($format_reply eq 'ok') { |
if ($format_reply eq 'ok') { |
Line 431 sub print_course_listing {
|
Line 431 sub print_course_listing {
|
if ($env{'form.coursenum'} ne '') { |
if ($env{'form.coursenum'} ne '') { |
%courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.', |
%courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.', |
$env{'form.coursenum'}, |
$env{'form.coursenum'}, |
undef,undef,'Course'); |
undef,undef,'Course',1); |
if (keys(%courses) == 0) { |
if (keys(%courses) == 0) { |
$output .= &mt('The courseID provided does not match a course in this domain.'); |
$output .= &mt('The courseID provided does not match a course in this domain.'); |
return $output; |
return $output; |
Line 457 sub construct_data_table {
|
Line 457 sub construct_data_table {
|
if (($details eq '') || ($env{'form.showdetails'})) { |
if (($details eq '') || ($env{'form.showdetails'})) { |
$sortname{'Code'} = 'code'; |
$sortname{'Code'} = 'code'; |
$sortname{'Title'} = 'title'; |
$sortname{'Title'} = 'title'; |
$sortname{'Owner'} = 'owner'; |
$sortname{'Owner(s)'} = 'owner'; |
} |
} |
my $output = &Apache::loncommon::start_data_table(). |
my $output = &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(); |
&Apache::loncommon::start_data_table_header_row(); |
my @coltitles = ('Code','Sections','Crosslisted','Title','Owner'); |
my @coltitles = ('Code','Sections','Crosslisted','Title','Owner(s)'); |
if (ref($usersections) eq 'HASH') { |
if (ref($usersections) eq 'HASH') { |
$coltitles[1] = 'Your Section'; |
$coltitles[1] = 'Your Section'; |
} |
} |
Line 492 sub construct_data_table {
|
Line 492 sub construct_data_table {
|
if ($env{'form.sortby'} eq 'code') { |
if ($env{'form.sortby'} eq 'code') { |
push(@{$Sortby{$courseinfo{$course}{'code'}}},$course); |
push(@{$Sortby{$courseinfo{$course}{'code'}}},$course); |
} elsif ($env{'form.sortby'} eq 'owner') { |
} elsif ($env{'form.sortby'} eq 'owner') { |
push(@{$Sortby{$courseinfo{$course}{'ownerlastname'}}},$course); |
push(@{$Sortby{$courseinfo{$course}{'ownerlastnames'}}},$course); |
} else { |
} else { |
push(@{$Sortby{$courseinfo{$course}{'title'}}},$course); |
push(@{$Sortby{$courseinfo{$course}{'title'}}},$course); |
} |
} |
Line 520 sub build_courseinfo_hash {
|
Line 520 sub build_courseinfo_hash {
|
my $now = time; |
my $now = time; |
foreach my $course (keys(%{$courses})) { |
foreach my $course (keys(%{$courses})) { |
my $descr; |
my $descr; |
if ($courses->{$course} =~ m/^([^:]*):/i) { |
if (ref($courses->{$course}) eq 'HASH') { |
|
$descr = $courses->{$course}{'description'}; |
|
} elsif ($courses->{$course} =~ m/^([^:]*):/i) { |
$descr = &unescape($1); |
$descr = &unescape($1); |
} else { |
} else { |
$descr = &unescape($courses->{$course}); |
$descr = &unescape($courses->{$course}); |
Line 529 sub build_courseinfo_hash {
|
Line 531 sub build_courseinfo_hash {
|
$cleandesc=~s/'/\\'/g; |
$cleandesc=~s/'/\\'/g; |
$cleandesc =~ s/^\s+//; |
$cleandesc =~ s/^\s+//; |
my ($cdom,$cnum)=split(/\_/,$course); |
my ($cdom,$cnum)=split(/\_/,$course); |
|
my ($descr,$instcode,$singleowner,$ttype,@owners,%ownernames); |
my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses->{$course}); |
if (ref($courses->{$course}) eq 'HASH') { |
$owner = &unescape($owner); |
$descr = $courses->{$course}{'description'}; |
my ($ownername,$ownerdom); |
$instcode = $courses->{$course}{'instcode'}; |
if ($owner =~ /:/) { |
$singleowner = $courses->{$course}{'owner'}; |
($ownername,$ownerdom) = split(/:/,$owner); |
$ttype = $courses->{$course}{'type'}; |
|
push(@owners,$singleowner); |
|
if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') { |
|
foreach my $item (@{$courses->{$course}{'co-owners'}}) { |
|
push(@owners,$item); |
|
} |
|
} |
} else { |
} else { |
$ownername = $owner; |
($descr,$instcode,$singleowner,$ttype) = |
if ($owner ne '') { |
split(/:/,$courses->{$course}); |
$ownerdom = $cdom; |
push(@owners,$singleowner); |
|
} |
|
foreach my $owner (@owners) { |
|
my ($ownername,$ownerdom) = @_; |
|
if ($owner =~ /:/) { |
|
($ownername,$ownerdom) = split(/:/,$owner); |
|
} else { |
|
$ownername = $owner; |
|
if ($owner ne '') { |
|
$ownerdom = $cdom; |
|
} |
|
} |
|
if ($ownername ne '' && $ownerdom ne '') { |
|
my %namehash=&Apache::loncommon::getnames($ownername,$ownerdom); |
|
$ownernames{$ownername.':'.$ownerdom} = \%namehash; |
} |
} |
} |
|
my %ownernames; |
|
if ($ownername ne '' && $ownerdom ne '') { |
|
%ownernames = &Apache::loncommon::getnames($ownername,$ownerdom); |
|
} |
} |
$courseinfo{$course}{'cdom'} = $cdom; |
$courseinfo{$course}{'cdom'} = $cdom; |
$courseinfo{$course}{'cnum'} = $cnum; |
$courseinfo{$course}{'cnum'} = $cnum; |
$courseinfo{$course}{'code'} = $instcode; |
$courseinfo{$course}{'code'} = $instcode; |
$courseinfo{$course}{'ownerlastname'} = $ownernames{'lastname'}; |
my @lastnames; |
|
foreach my $owner (keys(%ownernames)) { |
|
if (ref($ownernames{$owner}) eq 'HASH') { |
|
push(@lastnames,$ownernames{$owner}{'lastname'}); |
|
} |
|
} |
|
$courseinfo{$course}{'ownerlastnames'} = join(', ',sort(@lastnames)); |
$courseinfo{$course}{'title'} = $cleandesc; |
$courseinfo{$course}{'title'} = $cleandesc; |
$courseinfo{$course}{'owner'} = $owner; |
$courseinfo{$course}{'owner'} = $singleowner; |
|
|
my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); |
my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); |
my @classids; |
my @classids; |
Line 571 sub build_courseinfo_hash {
|
Line 595 sub build_courseinfo_hash {
|
} |
} |
$courseinfo{$course}{'showsyllabus'} = $showsyllabus; |
$courseinfo{$course}{'showsyllabus'} = $showsyllabus; |
if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) || |
if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) || |
($knownuser && ($details == 1))) { |
($knownuser && ($details == 1))) { |
$courseinfo{$course}{'counts'} = &count_students($cdom,$cnum,$numsec); |
$courseinfo{$course}{'counts'} = &count_students($cdom,$cnum,$numsec); |
$courseinfo{$course}{'autoenrollment'} = |
$courseinfo{$course}{'autoenrollment'} = |
&autoenroll_info(\%coursehash,$now,$seclist,$xlist_items, |
&autoenroll_info(\%coursehash,$now,$seclist,$xlist_items, |
$instcode,$owner,$cdom,$cnum); |
$instcode,\@owners,$cdom,$cnum); |
|
|
my $startaccess = ''; |
my $startaccess = ''; |
my $endaccess = ''; |
my $endaccess = ''; |
Line 641 sub courseinfo_row {
|
Line 665 sub courseinfo_row {
|
$cdom = $info->{'cdom'}; |
$cdom = $info->{'cdom'}; |
$cnum = $info->{'cnum'}; |
$cnum = $info->{'cnum'}; |
$title = $info->{'title'}; |
$title = $info->{'title'}; |
$ownerlast = $info->{'ownerlastname'}; |
$ownerlast = $info->{'ownerlastnames'}; |
$code = $info->{'code'}; |
$code = $info->{'code'}; |
$owner = $info->{'owner'}; |
$owner = $info->{'owner'}; |
$seclist = $info->{'seclist'}; |
$seclist = $info->{'seclist'}; |
Line 703 sub identify_sections {
|
Line 727 sub identify_sections {
|
} |
} |
|
|
sub get_valid_classes { |
sub get_valid_classes { |
my ($seclist,$xlist_items,$crscode,$owner,$cdom,$cnum) = @_; |
my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_; |
my $response; |
my $response; |
my %validations; |
my %validations; |
@{$validations{'sections'}} = (); |
@{$validations{'sections'}} = (); |
Line 712 sub get_valid_classes {
|
Line 736 sub get_valid_classes {
|
if ($seclist) { |
if ($seclist) { |
foreach my $sec (split(/, /,$seclist)) { |
foreach my $sec (split(/, /,$seclist)) { |
my $class = $crscode.$sec; |
my $class = $crscode.$sec; |
if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner, |
if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners, |
$class) eq 'ok') { |
$class) eq 'ok') { |
if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) { |
if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) { |
push(@{$validations{'sections'}},$sec); |
push(@{$validations{'sections'}},$sec); |
Line 723 sub get_valid_classes {
|
Line 747 sub get_valid_classes {
|
} |
} |
if ($xlist_items) { |
if ($xlist_items) { |
foreach my $item (split(/, /,$xlist_items)) { |
foreach my $item (split(/, /,$xlist_items)) { |
if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner, |
if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners, |
$item) eq 'ok') { |
$item) eq 'ok') { |
if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) { |
if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) { |
push(@{$validations{'xlists'}},$item); |
push(@{$validations{'xlists'}},$item); |
Line 885 END
|
Line 909 END
|
} |
} |
|
|
sub autoenroll_info { |
sub autoenroll_info { |
my ($coursehash,$now,$seclist,$xlist_items,$code,$owner,$cdom,$cnum) = @_; |
my ($coursehash,$now,$seclist,$xlist_items,$code,$owners,$cdom,$cnum) = @_; |
my $autoenrolldates = &mt('Not enabled'); |
my $autoenrolldates = &mt('Not enabled'); |
if (defined($coursehash->{'internal.autoadds'}) && $coursehash->{'internal.autoadds'} == 1) { |
if (defined($coursehash->{'internal.autoadds'}) && $coursehash->{'internal.autoadds'} == 1) { |
my ($autostart,$autoend); |
my ($autostart,$autoend); |
Line 901 sub autoenroll_info {
|
Line 925 sub autoenroll_info {
|
} else { |
} else { |
my $valid_classes = |
my $valid_classes = |
&get_valid_classes($seclist,$xlist_items,$code, |
&get_valid_classes($seclist,$xlist_items,$code, |
$owner,$cdom,$cnum); |
$owners,$cdom,$cnum); |
if ($valid_classes ne '') { |
if ($valid_classes ne '') { |
$autoenrolldates = &mt('Not enabled<br />Starts: '). |
$autoenrolldates = &mt('Not enabled<br />Starts: '). |
$autostart.'<br />'.$valid_classes; } |
$autostart.'<br />'.$valid_classes; } |
Line 911 sub autoenroll_info {
|
Line 935 sub autoenroll_info {
|
$autoenrolldates = &mt('Not enabled<br />Ended: ').$autoend; |
$autoenrolldates = &mt('Not enabled<br />Ended: ').$autoend; |
} else { |
} else { |
my $valid_classes = &get_valid_classes($seclist,$xlist_items, |
my $valid_classes = &get_valid_classes($seclist,$xlist_items, |
$code,$owner,$cdom,$cnum); |
$code,$owners,$cdom,$cnum); |
if ($valid_classes ne '') { |
if ($valid_classes ne '') { |
$autoenrolldates = &mt('Currently enabled<br />'). |
$autoenrolldates = &mt('Currently enabled<br />'). |
$valid_classes; |
$valid_classes; |