version 1.10, 2006/10/18 14:07:47
|
version 1.16, 2007/01/10 03:57:51
|
Line 47 sub handler {
|
Line 47 sub handler {
|
my $lonidsdir=$r->dir_config('lonIDsDir'); |
my $lonidsdir=$r->dir_config('lonIDsDir'); |
my $handle; |
my $handle; |
if ($lonid) { |
if ($lonid) { |
$handle=$lonid->value; |
$handle=&LONCAPA::clean_handle($lonid->value); |
$handle=~s/\W//g; |
|
} |
} |
if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) { |
if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) { |
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); |
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); |
Line 67 sub handler {
|
Line 66 sub handler {
|
&course_selector($r,$codedom,$formname,$domdesc); |
&course_selector($r,$codedom,$formname,$domdesc); |
if ($env{'form.state'} eq 'listing') { |
if ($env{'form.state'} eq 'listing') { |
$r->print('<br /><br />'.&print_course_listing($codedom).'<br />'); |
$r->print('<br /><br />'.&print_course_listing($codedom).'<br />'); |
} |
} |
} |
} |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
Line 237 function setCourseId(caller) {
|
Line 236 function setCourseId(caller) {
|
'</option>'."\n".'</select>'."\n". |
'</option>'."\n".'</select>'."\n". |
'</td>' |
'</td>' |
); |
); |
|
if (&user_is_dc($codedom)) { |
|
my $showdetails_status; |
|
if ($env{'form.showdetails'}) { |
|
$showdetails_status = 'checked="checked" '; |
|
} |
|
$r->print('<td></td><td><input type="checkbox" name="showdetails" value="1" '.$showdetails_status.'/>'.&mt('Show full details for each course (DC only)').'</td>'); |
|
} |
$r->print('</tr></table>'); |
$r->print('</tr></table>'); |
if ($numtitles > 4) { |
if ($numtitles > 4) { |
$r->print('<br /><br />'.$codetitles[$numtitles-1].'<br />'."\n". |
$r->print('<br /><br />'.$codetitles[$numtitles-1].'<br />'."\n". |
Line 253 function setCourseId(caller) {
|
Line 259 function setCourseId(caller) {
|
return; |
return; |
} |
} |
|
|
|
sub user_is_dc { |
|
my ($codedom) = @_; |
|
if (exists($env{'user.role.dc./'.$codedom.'/'})) { |
|
my $livedc = 1; |
|
my $now = time; |
|
my ($start,$end)=split(/\./,$env{'user.role.dc./'.$codedom.'/'}); |
|
if ($start && $start>$now) { $livedc = 0; } |
|
if ($end && $end <$now) { $livedc = 0; } |
|
return $livedc; |
|
} |
|
return; |
|
} |
|
|
sub recurse_options { |
sub recurse_options { |
my ($currkey,$currlist,$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept) = @_; |
my ($currkey,$currlist,$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept) = @_; |
Line 366 sub print_course_listing {
|
Line 384 sub print_course_listing {
|
my ($domain) = @_; |
my ($domain) = @_; |
my $output; |
my $output; |
my %courses; |
my %courses; |
|
my $knownuser = &user_is_known(); |
|
my $details = $env{'form.coursenum'}; |
|
if (&user_is_dc($domain)) { |
|
if ($env{'form.showdetails'}) { |
|
$details = 1; |
|
} |
|
} |
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'}, |
Line 380 sub print_course_listing {
|
Line 405 sub print_course_listing {
|
$output = &mt('No courses match the criteria you selected.'); |
$output = &mt('No courses match the criteria you selected.'); |
return $output; |
return $output; |
} |
} |
if (&user_is_known()) { |
if ($knownuser && !$env{'form.showdetails'}) { |
$output = &mt('<b>Note for students:</b> If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.<br /><br />'); |
$output = &mt('<b>Note for students:</b> If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.<br /><br />'); |
} |
} |
} |
} |
$output .= &Apache::loncommon::start_data_table(). |
$output .= &construct_data_table($knownuser,\%courses,$details); |
&Apache::loncommon::start_data_table_header_row(); |
$output .= &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby','showdetails']); |
my @coltitles = ('Code','Sections','Crosslisted','Title','Owner'); |
return $output; |
|
} |
|
|
|
sub construct_data_table { |
|
my ($knownuser,$courses,$details,$usersections) = @_; |
my %sortname; |
my %sortname; |
if ($env{'form.coursenum'} eq '') { |
if (($details eq '') || ($env{'form.showdetails'})) { |
$sortname{'Code'} = 'code'; |
$sortname{'Code'} = 'code'; |
$sortname{'Title'} = 'title'; |
$sortname{'Title'} = 'title'; |
$sortname{'Owner'} = 'owner'; |
$sortname{'Owner'} = 'owner'; |
} |
} |
|
my $output = &Apache::loncommon::start_data_table(). |
|
&Apache::loncommon::start_data_table_header_row(); |
|
my @coltitles = ('Code','Sections','Crosslisted','Title','Owner'); |
|
if (ref($usersections) eq 'HASH') { |
|
$coltitles[1] = 'Your Section'; |
|
} |
foreach my $item (@coltitles) { |
foreach my $item (@coltitles) { |
$output .= '<th>'; |
$output .= '<th>'; |
if (defined($sortname{$item})) { |
if (defined($sortname{$item})) { |
Line 402 sub print_course_listing {
|
Line 437 sub print_course_listing {
|
} |
} |
$output .= '</th>'; |
$output .= '</th>'; |
} |
} |
if (&user_is_known()) { |
if ($knownuser) { |
if ($env{'form.coursenum'} eq '') { |
if ($details) { |
$output .= '<th> </th>'; |
|
} else { |
|
$output .= |
$output .= |
'<th>'.&mt('Default Access Dates for Students').'</th>'. |
'<th>'.&mt('Default Access Dates for Students').'</th>'. |
'<th>'.&mt('Student Counts').'</th>'. |
'<th>'.&mt('Student Counts').'</th>'. |
'<th>'.&mt('Auto-enrollment of <br />registered students').'</th>'; |
'<th>'.&mt('Auto-enrollment of <br />registered students').'</th>'; |
|
} else { |
|
$output .= '<th> </th>'; |
} |
} |
} |
} |
&Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
my %courseinfo = &build_courseinfo_hash(%courses); |
my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$details, |
|
$usersections); |
my %Sortby; |
my %Sortby; |
foreach my $course (sort(keys(%courses))) { |
foreach my $course (sort(keys(%{$courses}))) { |
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') { |
Line 433 sub print_course_listing {
|
Line 469 sub print_course_listing {
|
foreach my $item (@sorted_courses) { |
foreach my $item (@sorted_courses) { |
foreach my $course (@{$Sortby{$item}}) { |
foreach my $course (@{$Sortby{$item}}) { |
$output.=&Apache::loncommon::start_data_table_row(); |
$output.=&Apache::loncommon::start_data_table_row(); |
$output.=&courseinfo_row($courseinfo{$course}); |
$output.=&courseinfo_row($courseinfo{$course},$knownuser,$details); |
$output.=&Apache::loncommon::end_data_table_row(); |
$output.=&Apache::loncommon::end_data_table_row(); |
} |
} |
} |
} |
$output .= &Apache::loncommon::end_data_table(); |
$output .= &Apache::loncommon::end_data_table(); |
my $echo = &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby']); |
|
$output .= $echo; |
|
return $output; |
return $output; |
} |
} |
|
|
sub build_courseinfo_hash { |
sub build_courseinfo_hash { |
my (%courses) = @_; |
my ($courses,$knownuser,$details,$usersections) = @_; |
my %courseinfo; |
my %courseinfo; |
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 ($courses->{$course} =~ m/^([^:]*):/i) { |
$descr = &unescape($1); |
$descr = &unescape($1); |
} else { |
} else { |
$descr = &unescape($courses{$course}); |
$descr = &unescape($courses->{$course}); |
} |
} |
my $cleandesc=&HTML::Entities::encode($descr,'<>&"'); |
my $cleandesc=&HTML::Entities::encode($descr,'<>&"'); |
$cleandesc=~s/'/\\'/g; |
$cleandesc=~s/'/\\'/g; |
$cleandesc =~ s/^\s+//; |
$cleandesc =~ s/^\s+//; |
my ($cdom,$cnum)=split(/\_/,$course); |
my ($cdom,$cnum)=split(/\_/,$course); |
|
|
my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses{$course}); |
my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses->{$course}); |
$owner = &unescape($owner); |
$owner = &unescape($owner); |
my ($ownername,$ownerdom); |
my ($ownername,$ownerdom); |
if ($owner =~ /:/) { |
if ($owner =~ /:/) { |
Line 484 sub build_courseinfo_hash {
|
Line 518 sub build_courseinfo_hash {
|
my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); |
my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); |
my @classids; |
my @classids; |
my @crosslistings; |
my @crosslistings; |
my $seclist = &identify_sections($coursehash{'internal.sectionnums'}); |
my ($seclist,$numsec) = |
|
&identify_sections($coursehash{'internal.sectionnums'}); |
|
if (ref($usersections) eq 'HASH') { |
|
if (ref($usersections->{$course}) eq 'ARRAY') { |
|
$seclist = join(', ',@{$usersections->{$course}}); |
|
} |
|
} |
$courseinfo{$course}{'seclist'} = $seclist; |
$courseinfo{$course}{'seclist'} = $seclist; |
my $xlist_items = &identify_sections($coursehash{'internal.crosslistings'}); |
my ($xlist_items,$numxlist) = |
|
&identify_sections($coursehash{'internal.crosslistings'}); |
my $showsyllabus = 1; # default is to include a syllabus link |
my $showsyllabus = 1; # default is to include a syllabus link |
if (defined($coursehash{'showsyllabus'})) { |
if (defined($coursehash{'showsyllabus'})) { |
$showsyllabus = $coursehash{'showsyllabus'}; |
$showsyllabus = $coursehash{'showsyllabus'}; |
} |
} |
$courseinfo{$course}{'showsyllabus'} = $showsyllabus; |
$courseinfo{$course}{'showsyllabus'} = $showsyllabus; |
if (defined($env{'form.coursenum'})) { |
if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) || |
if ($cnum eq $env{'form.coursenum'}) { |
($knownuser && ($details == 1))) { |
$courseinfo{$course}{'counts'} = &count_students($cdom,$cnum); |
$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,$owner,$cdom,$cnum); |
|
|
my $startaccess = ''; |
my $startaccess = ''; |
my $endaccess = ''; |
my $endaccess = ''; |
my $accessdates; |
my $accessdates; |
if ( defined($coursehash{'default_enrollment_start_date'}) ) { |
if ( defined($coursehash{'default_enrollment_start_date'}) ) { |
$startaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_start_date'}); |
$startaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_start_date'}); |
} |
} |
if ( defined($coursehash{'default_enrollment_end_date'}) ) { |
if ( defined($coursehash{'default_enrollment_end_date'}) ) { |
$endaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_end_date'}); |
$endaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_end_date'}); |
if ($coursehash{'default_enrollment_end_date'} == 0) { |
if ($coursehash{'default_enrollment_end_date'} == 0) { |
$endaccess = "No ending date"; |
$endaccess = "No ending date"; |
} |
} |
} |
} |
if ($startaccess) { |
if ($startaccess) { |
$accessdates .= &mt('<i>From:</i> ').$startaccess.'<br />'; |
$accessdates .= &mt('<i>From:</i> ').$startaccess.'<br />'; |
} |
} |
if ($endaccess) { |
if ($endaccess) { |
$accessdates .= &mt('<i>To:</i> ').$endaccess.'<br />'; |
$accessdates .= &mt('<i>To:</i> ').$endaccess.'<br />'; |
} |
|
$courseinfo{$course}{'access'} = $accessdates; |
|
} |
} |
|
$courseinfo{$course}{'access'} = $accessdates; |
} |
} |
if ($xlist_items eq '') { |
if ($xlist_items eq '') { |
$xlist_items = &mt('No'); |
$xlist_items = &mt('No'); |
Line 529 sub build_courseinfo_hash {
|
Line 569 sub build_courseinfo_hash {
|
} |
} |
|
|
sub count_students { |
sub count_students { |
my ($cdom,$cnum) = @_; |
my ($cdom,$cnum,$numsec) = @_; |
my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum); |
my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum); |
my %student_count = ( |
my %student_count = ( |
Active => 0, |
Active => 0, |
Line 548 sub count_students {
|
Line 588 sub count_students {
|
$student_count{$data->[$idx{'status'}]} ++; |
$student_count{$data->[$idx{'status'}]} ++; |
} |
} |
|
|
my $countslist; |
my $countslist = &mt('[quant,_1,section]',$numsec).':<br />'; |
foreach my $status ('Active','Future') { |
foreach my $status ('Active','Future') { |
$countslist .= '<nobr>'.$status_title{$status}.': '. |
$countslist .= '<nobr>'.$status_title{$status}.': '. |
$student_count{$status}.'</nobr><br />'; |
$student_count{$status}.'</nobr><br />'; |
Line 557 sub count_students {
|
Line 597 sub count_students {
|
} |
} |
|
|
sub courseinfo_row { |
sub courseinfo_row { |
my ($info) = @_; |
my ($info,$knownuser,$details) = @_; |
my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items, |
my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items, |
$accessdates,$showsyllabus,$counts,$autoenrollment,$output); |
$accessdates,$showsyllabus,$counts,$autoenrollment,$output); |
if (ref($info) eq 'HASH') { |
if (ref($info) eq 'HASH') { |
Line 589 sub courseinfo_row {
|
Line 629 sub courseinfo_row {
|
} |
} |
$output .= '</font></td>'. |
$output .= '</font></td>'. |
'<td>'.$ownerlast.'</td>'; |
'<td>'.$ownerlast.'</td>'; |
if (&user_is_known()) { |
if ($knownuser) { |
if ($env{'form.coursenum'} eq '') { |
if ($details) { |
$output .= "<td><a href=\"javascript:setCourseId('$cnum')\">".&mt('Show more details').'</a></td>'; |
|
} else { |
|
$output .= |
$output .= |
'<td>'.$accessdates.'</td>'. |
'<td>'.$accessdates.'</td>'. |
'<td>'.$counts.'</td>'. |
'<td>'.$counts.'</td>'. |
'<td>'.$autoenrollment.'</td>'; |
'<td>'.$autoenrollment.'</td>'; |
|
} else { |
|
$output .= "<td><a href=\"javascript:setCourseId('$cnum')\">".&mt('Show more details').'</a></td>'; |
} |
} |
} |
} |
return $output; |
return $output; |
Line 621 sub identify_sections {
|
Line 661 sub identify_sections {
|
} |
} |
@secnums = sort {$a <=> $b} @secnums; |
@secnums = sort {$a <=> $b} @secnums; |
my $seclist = join(', ',@secnums); |
my $seclist = join(', ',@secnums); |
return $seclist; |
my $numsec = @secnums; |
|
return ($seclist,$numsec); |
} |
} |
|
|
sub get_valid_classes { |
sub get_valid_classes { |
Line 632 sub get_valid_classes {
|
Line 673 sub get_valid_classes {
|
@{$validations{'xlists'}} = (); |
@{$validations{'xlists'}} = (); |
my $totalitems = 0; |
my $totalitems = 0; |
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,$owner, |
$class) eq 'ok') { |
$class) eq 'ok') { |
Line 644 sub get_valid_classes {
|
Line 685 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,$owner, |
$item) eq 'ok') { |
$item) eq 'ok') { |
if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) { |
if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) { |
Line 657 sub get_valid_classes {
|
Line 698 sub get_valid_classes {
|
if ($totalitems > 0) { |
if ($totalitems > 0) { |
if (@{$validations{'sections'}}) { |
if (@{$validations{'sections'}}) { |
$response = &mt('Sections: '). |
$response = &mt('Sections: '). |
join(',',@{$validations{'sections'}}).'<br />'; |
join(', ',@{$validations{'sections'}}).'<br />'; |
} |
} |
if (@{$validations{'xlists'}}) { |
if (@{$validations{'xlists'}}) { |
$response .= &mt('Courses: '). |
$response .= &mt('Courses: '). |
join(',',@{$validations{'xlists'}}); |
join(', ',@{$validations{'xlists'}}); |
} |
} |
} |
} |
return $response; |
return $response; |