--- loncom/interface/lonpickcourse.pm 2009/05/01 01:38:20 1.78 +++ loncom/interface/lonpickcourse.pm 2009/05/08 17:22:17 1.81 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.78 2009/05/01 01:38:20 raeburn Exp $ +# $Id: lonpickcourse.pm,v 1.81 2009/05/08 17:22:17 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,7 +51,6 @@ sub handler { ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement', 'cdomelement','cnameelement','roleelement', 'multiple','type','setroles','fixeddom']); - my ($type,$title,$jscript,$multelement,$multiple,$roleelement, $lastaction,$autosubmit,$submitopener); @@ -116,17 +115,30 @@ sub handler { if ($env{'form.gosearch'} || $onlyown) { $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction)); } - $r->print(''); + $r->print(''); $r->print($submitopener); # ------------------------------------------ Display of filters to limit search my $filter = {}; my $action = '/adm/pickcourse'; - my $numtitles; + my ($numtitles,$showroles,$nohost); if (!$onlyown) { my $filterlist = ['domainfilter','descriptfilter', - 'instcodefilter','ownerfilter', - 'ownerdomfilter']; + 'instcodefilter']; + if ($env{'form.form'} eq 'rules') { + push(@{$filterlist},'personfilter'); + if (($env{'form.personfilter'} ne '') && ($env{'form.persondomfilter'} ne '')) { + if (&Apache::lonnet::homeserver($env{'form.personfilter'}, + $env{'form.persondomfilter'}) eq 'no_host') { + $nohost = 1; + } else { + $showroles = 1; + } + } + } else { + push(@{$filterlist},'ownerfilter'); + } # course ID filter for DCs only if ($env{'user.adv'} && $env{'form.domainfilter'} && exists($env{'user.role.dc./'.$env{'form.domainfilter'}.'/'})) { @@ -139,7 +151,14 @@ sub handler { # ---------------------------------------------------------------- Get the data if ($env{'form.gosearch'} || $onlyown) { my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles); - &display_matched_courses($r,$type,$multiple,$action,%courses); + if ($nohost) { + $r->print (''. + &mt('User does not exist - username: [_1], domain: [_2].', + ''.$filter->{'personfilter'}.'', + ''.$filter->{'persondomfilter'}.'').''); + } else { + &display_matched_courses($r,$type,$multiple,$action,$showroles,%courses); + } } $r->print(&Apache::loncommon::end_page()); return OK; @@ -217,7 +236,7 @@ function setSections() { } sub display_matched_courses { - my ($r,$type,$multiple,$action,%courses) = @_; + my ($r,$type,$multiple,$action,$showroles,%courses) = @_; if ($env{'form.form'} eq 'portform') { $action = '/adm/portfolio'; } @@ -281,6 +300,11 @@ sub display_matched_courses { .''.&mt('Owner/Co-owner(s)').'' .''.&mt('Type').'' ); + if ($showroles) { + $r->print(''.&mt("Role(s) for [_1]", + &Apache::loncommon::plainname($env{'form.personfilter'}, + $env{'form.persondomfilter'},'firstname')).''); + } $r->print(&Apache::loncommon::end_data_table_header_row()); } foreach my $description (sort { lc($a) cmp lc($b) } (keys(%by_descrip))) { @@ -327,6 +351,23 @@ sub display_matched_courses { $r->print(' '); } $r->print(''); + if ($showroles) { + $r->print(''); + my $rolestr; + if (ref($courses{$course}{'roles'}) eq 'ARRAY') { + my @roles = sort(@{$courses{$course}{'roles'}}); + foreach my $role (@roles) { + if ($role =~ /^cr/) { + my (undef,$crdom,$crname,$crtitle) = split('/',$role); + $rolestr .= $crtitle.', '; + } else { + $rolestr .= &Apache::lonnet::plaintext($role,$ttype).', '; + } + } + $rolestr =~ s/\, $//; + } + $r->print($rolestr.''); + } if ($multiple) { $r->print("\n"); } $r->print(&Apache::loncommon::end_data_table_row()); # $r->print("
\n"); @@ -381,24 +422,44 @@ sub multiples_tag { sub build_filters { my ($filterlist,$type,$roleelement,$multelement,$filter,$action, - $numtitlesref) = @_; + $numtitlesref,$caller) = @_; my $list; my $formname; my ($fixeddom,$codedom,$jscript); if (defined($env{'form.form'})) { - $formname = $env{'form.form'}; + $formname = $env{'form.form'}; + } else { + $formname = $caller; } - my ($domainselectform,$sincefilterform,$ownerdomselectform, + my ($domainselectform,$sincefilterform,$ownerdomselectform,$persondomselectform, $instcodeform,$typeselectform,$instcodetitle); foreach my $item (@{$filterlist}) { $filter->{$item} = $env{'form.'.$item}; if ($item ne 'descriptfilter' && $item ne 'instcodefilter') { - if ($item eq 'domainfilter' || $item eq 'ownerdomfilter') { + if ($item eq 'domainfilter') { $filter->{$item} = &LONCAPA::clean_domain($filter->{$item}); } elsif ($item eq 'coursefilter') { $filter->{$item} = &LONCAPA::clean_courseid($filter->{$item}); } elsif ($item eq 'ownerfilter') { $filter->{$item} = &LONCAPA::clean_username($filter->{$item}); + $filter->{'ownerdomfilter'} = + &LONCAPA::clean_domain($env{'form.ownerdomfilter'}); + $ownerdomselectform = + &Apache::loncommon::select_dom_form($filter->{'ownerdomfilter'}, + 'ownerdomfilter',1); + } elsif ($item eq 'personfilter') { + $filter->{$item} = &LONCAPA::clean_username($filter->{$item}); + if ($env{'form.persondomfilter'} eq '') { + unless ($env{'form.gosearch'}) { + $filter->{'persondomfilter'} = $env{'request.role.domain'}; + } + } else { + $filter->{'persondomfilter'} = + &LONCAPA::clean_domain($env{'form.persondomfilter'}); + } + $persondomselectform = + &Apache::loncommon::select_dom_form($filter->{'persondomfilter'}, + 'persondomfilter',1); } else { $filter->{$item} =~ s/\W//g; } @@ -421,16 +482,13 @@ sub build_filters { &Apache::lonnet::domain($env{'request.role.domain'}, 'description'); $codedom = $env{'request.role.domain'}; - } else { + } else { $domainselectform = &Apache::loncommon::select_dom_form($filter->{$item}, 'domainfilter', $allow_blank); $codedom = $filter->{'domainfilter'}; } - } elsif ($item eq 'ownerdomfilter') { - $ownerdomselectform = - &Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1); } else { $list->{$item} = &HTML::Entities::encode($filter->{$item},'<>&"'); } @@ -458,16 +516,18 @@ sub build_filters { 'cdo' => &mt("$type Domain"), 'ins' => &mt('Institutional Code'), 'inc' => &mt('Institutional Categorization'), - 'cow' => &mt("$type Owner's Username"), - 'cod' => &mt("$type Owner's Domain"), + 'cow' => &mt("$type Owner/Co-owner"), + 'cop' => &mt("$type Personnel Includes"), 'cog' => &mt('Course Type') ); $typeselectform = '' - .&Apache::lonhtmlcommon::row_closure() - .&Apache::lonhtmlcommon::row_title($lt{'cod'}) - .$ownerdomselectform - .&Apache::lonhtmlcommon::row_closure(); + $output .= &Apache::lonhtmlcommon::row_title($lt{'cow'}). + '
'.&mt('Username').'
'. + '		'.&mt('Domain').'
'. + $ownerdomselectform.'
'. + &Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'personfilter'})) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cop'}). + '
'.&mt('Username').'
'. + '		'.&mt('Domain').'
'. + $persondomselectform.'
'. + &Apache::lonhtmlcommon::row_closure(); } if (exists($filter->{'coursefilter'})) { $output .= &Apache::lonhtmlcommon::row_title(&mt('LON-CAPA course ID')) @@ -567,16 +634,27 @@ $multelement } sub instcode_selectors { - my ($codedom,$formname) = @_; + my ($codedom,$formname,$officialjs) = @_; my ($output,@codetitles,%cat_titles,%cat_order,%cat_items); my ($jscript,$totcodes,$numtitles,$lasttitle) = &Apache::courseclassifier::instcode_selectors_data($codedom,$formname, - \%cat_items,\@codetitles,\%cat_titles,\%cat_order); + \%cat_items,\@codetitles,\%cat_titles,\%cat_order,$officialjs); if ($numtitles > 0) { - $output = &Apache::courseclassifier::build_instcode_selectors($numtitles, - $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)."\n". - ''."\n". - ''."\n"; + my $unofficial = ' checked="checked" '; + my $official = ''; + if ($env{'form.official'}) { + $official = $unofficial; + $unofficial = ''; + } + $output .= ''.&mt('Official course:').' '.(' 'x3).'
'. + &Apache::courseclassifier::build_instcode_selectors($numtitles, + $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)."\n". + ''."\n". + ''."\n"; } return ($output,$jscript,$numtitles); @@ -584,7 +662,7 @@ sub instcode_selectors { sub search_courses { my ($r,$type,$onlyown,$filter,$numtitles) = @_; - my %courses; + my (%courses,%showcourses); if (!$onlyown) { $r->print(&mt('Searching ...').'
 
'); $r->rflush(); @@ -593,24 +671,26 @@ sub search_courses { $filter->{'combownerfilter'} = $filter->{'ownerfilter'}.':'. $filter->{'ownerdomfilter'}; } - foreach my $item ('descriptfilter','instcodefilter','coursefilter', - 'combownerfilter') { + foreach my $item ('descriptfilter','coursefilter','combownerfilter') { if (!$filter->{$item}) { $filter->{$item}='.'; } } - if ($type eq '') { $type = '.'; } my $timefilter = ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'}); my ($instcodefilter,$regexpok); if ($numtitles) { - $instcodefilter = - &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'}, - $numtitles); - $regexpok = 1; + if ($env{'form.official'}) { + $instcodefilter = + &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'}, + $numtitles); + $regexpok = 1; + } } else { $instcodefilter = $filter->{'instcodefilter'}; } + if ($instcodefilter eq '') { $instcodefilter = '.'; } + if ($type eq '') { $type = '.'; } %courses = &Apache::lonnet::courseiddump($filter->{'domainfilter'}, $filter->{'descriptfilter'}, @@ -619,6 +699,30 @@ sub search_courses { $filter->{'combownerfilter'}, $filter->{'coursefilter'}, undef,undef,$type,$regexpok); + if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) { + my %rolehash = &Apache::lonnet::get_my_roles($filter->{'personfilter'}, + $filter->{'persondomfilter'}, + 'userroles',undef, + ['cc','in','ad','ep','ta','cr'], + $filter->{'domainfilter'}); + foreach my $role (keys(%rolehash)) { + my ($cnum,$cdom,$courserole) = split(':',$role); + my $cid = $cdom.'_'.$cnum; + if (exists($courses{$cid})) { + if (ref($courses{$cid}) eq 'HASH') { + if (ref($courses{$cid}{roles}) eq 'ARRAY') { + if (!grep(/^\Q$courserole\E$/,@{$courses{$cid}{roles}})) { + push (@{$courses{$cid}{roles}},$courserole); + } + } else { + $courses{$cid}{roles} = [$courserole]; + } + $showcourses{$cid} = $courses{$cid}; + } + } + } + %courses = %showcourses; + } } else { $r->print('
'); my %coursehash = &Apache::loncommon::findallcourses(); @@ -830,9 +934,9 @@ javascript code for reporting selected s =item * X -B: +B: -Input: 5 - request object, course type, multiple (0 or 1), form action; hash of courses. +Input: 7 - request object, course type, multiple (0 or 1), form action, whether to show roles (for course personnel filter), hash of courses. Output: 0 @@ -851,10 +955,10 @@ Side Effects: None =item * X -B: +B: -Input: 7 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number). +Input: 7 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number); caller context (e.g., set to 'modifycourse' when routine is called from lonmodifycourse.pm). Output: 1 - $output - HTML for display of search criteria, and hidden form elements.