--- loncom/interface/lonpickcourse.pm 2005/11/15 20:46:40 1.35 +++ loncom/interface/lonpickcourse.pm 2006/08/11 22:14:10 1.50.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.35 2005/11/15 20:46:40 raeburn Exp $ +# $Id: lonpickcourse.pm,v 1.50.2.2 2006/08/11 22:14:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,6 +34,9 @@ use Apache::loncommon; use Apache::loncoursedata; use Apache::lonnet; use Apache::lonlocal; +use Apache::longroup; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; sub handler { my $r = shift; @@ -42,20 +45,15 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA - -ENDDOCUMENT + # Get parameters from query string &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter', 'sincefilter','form','cnumelement', 'cdomelement','cnameelement','roleelement', 'pickedcourse','instcodefilter', - 'ownerfilter','coursefilter','multiple']); + 'ownerfilter','coursefilter','multiple', + 'type','ownerdomfilter']); # domain filter and selection my $domainfilter=$env{'form.domainfilter'}; $domainfilter=~s/\W//g; @@ -72,8 +70,13 @@ ENDDOCUMENT my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"'); # course owner filter my $ownerfilter=$env{'form.ownerfilter'}; - unless ($ownerfilter) { $ownerfilter=''; } + $ownerfilter=~s/\W//g; my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"'); +# course ownerdomain filter + my $ownerdomfilter=$env{'form.ownerdomfilter'}; + $ownerdomfilter=~s/\W//g; + my $ownerdomselectform= + &Apache::loncommon::select_dom_form($ownerdomfilter,'ownerdomfilter',1); # course ID filter for DCs only my ($courseidtag,$coursefilter); if ($env{'user.adv'} && $domainfilter && exists($env{'user.role.dc./'. @@ -82,7 +85,7 @@ ENDDOCUMENT unless ($coursefilter) { $coursefilter=''; } my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"'); $courseidtag = &mt('LON-CAPA course ID'); - $courseidtag .= qq| + $courseidtag .= qq|:
|; } @@ -102,36 +105,153 @@ ENDDOCUMENT ['-1','86400','604800','2592000','7776000', '15552000','31104000'])); # if called from loncreateuser, report sections, then close - my ($loaditem,$seclist); + my (%loaditem,$seclist,$groupslist,$roleslist,$rolesnameslist, + $accesslist,$accessnameslist); + my $sec_element = 'currsec'; + my $grplist_element = 'groups'; my $num_sections = 0; + my $num_groups = 0; + my $num_roles = 0; + my $num_access = 0; + my ($cdom,$cnum); + if ($env{'form.pickedcourse'}) { + ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'}; + } + my $type = $env{'form.type'}; + if (!defined($env{'form.type'})) { + $type = 'Course'; + } if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) { - $loaditem = 'onLoad="setSections()"'; - my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'}; - my %sections_count = (); - $num_sections = &Apache::loncommon::get_sections($cdom,$cnum,\%sections_count); - my @sections = (); - if ($num_sections > 0) { - @sections = (sort {$a <=> $b} keys(%sections_count)); - $seclist = join('","',@sections); + $loaditem{'onload'} ="setSections()"; + ($seclist,$num_sections,$groupslist,$num_groups) = + &build_selection_lists($cdom,$cnum,$type,undef,undef, + $env{'form.form'}); + } +# if called from portfolio, report roles, sections, groups and close + my ($roles_element,$groups_element,$status_element,$setitems_function); + if ($env{'form.form'} eq 'portform' && $env{'form.pickedcourse'}) { + my ($row_id) = ($env{'form.cnumelement'} =~ /^crsnum_(\d+)$/); + $roles_element = 'role_'.$row_id.'_1'; + $groups_element = 'group_'.$row_id.'_1'; + $sec_element = 'section_'.$row_id.'_1'; + $status_element = 'access_'.$row_id.'_1'; + $grplist_element = 'grplist_'.$row_id.'_1'; + $loaditem{'onload'} ="setItems()"; + ($seclist,$num_sections,$groupslist,$num_groups,$roleslist,$num_roles, + $rolesnameslist,$accesslist,$num_access,$accessnameslist) = + &build_selection_lists($cdom,$cnum,$type,1,1,$env{'form.form'}); + $setitems_function = qq| +function setItems() { + opener.document.$env{"form.form"}.activate.checked = true; + setRoles(); + setGroups(); + setStatus(); + setSections(); +} + +function setRoles() { + var numRoles = $num_roles + var rolesArray = new Array("$roleslist"); + var roleNamesArray = new Array("$rolesnameslist"); + opener.document.$env{"form.form"}.$roles_element.length = 0; + if (numRoles == 0) { + opener.document.$env{"form.form"}.$roles_element.multiple=false; + opener.document.$env{"form.form"}.$roles_element.size=1; + opener.document.$env{"form.form"}.$roles_element.options[0] = new Option('No existing roles','',false,false); + } else { + if (numRoles == 1) { + opener.document.$env{"form.form"}.$roles_element.multiple=false; + opener.document.$env{"form.form"}.$roles_element.size=1; + opener.document.$env{"form.form"}.$roles_element.options[0] = new Option('Select','',true,true); + opener.document.$env{"form.form"}.$roles_element.options[1] = new Option(roleNamesArray[0],rolesArray[0],false,false); + } else { + for (var i=0; i$posstype\n"; + } + $typeselectform.=""; + my $title = &mt('Selecting a [_1]',$type); # Setup for multiple course selections, if flag for multiples set. my $multiple = $env{'form.multiple'}; my $multelement; if ($multiple) { - $title = 'Selecting course(s)'; + $title = &mt('Selecting [_1](s)',lc($type)); $jscript = &Apache::loncommon::check_uncheck_jscript(); $multelement = ''; } - $r->print(&Apache::loncommon::bodytag($title,undef,$loaditem,undef,undef,undef,undef,1)); - my %lt=&Apache::lonlocal::texthash( - 'cac' => 'Course Activity', - 'cde' => 'Course Description', - 'cdo' => 'Course Domain', - 'cin' => 'Course Institutional Code', - 'cow' => "Course Owner's usename"); + $r->print(&Apache::loncommon::start_page($title,undef, + {'add_entries' => \%loaditem, + 'no_nav_bar' => 1, })); + my %lt = ( + 'cac' => &mt('[_1] Activity',$type), + 'cde' => &mt('[_1] Description',$type), + 'cdo' => &mt('[_1] Domain',$type), + 'cin' => &mt('Course Institutional Code'), + 'cow' => &mt("[_1] Owner's Username",$type), + 'cod' => &mt("[_1] Owner's Domain", $type), + 'cog' => &mt('Course or Group') + ); + my ($name_code,$name_input); if (defined($env{'form.cnameelement'}) && $env{'form.cnameelement'} ne '') { $name_code = "opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=cdesc;"; @@ -146,12 +266,34 @@ ENDDOCUMENT $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n". 'document.courselist.submit();'; } + if ($env{'form.form'} eq 'portform') { + $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n". + 'document.courselist.submit();'; + } my $roledom = $env{'form.roleelement'}; if ($roledom) { $roleelement = ''; - $submitopener = &Apache::lonroles::processpick($roledom); + $submitopener = &Apache::lonroles::processpick(); $autosubmit = 'process_pick("'.$roledom.'")'; } + my $instcodeform; + if ($type eq 'Course') { + $instcodeform = $lt{'cin'}.':
'; + } + my %elements = ( + Course => { + name => 'coursepick', + total => 'coursetotal', + list => 'courselist', + }, + Group => { + name => 'grouppick', + total => 'grouptotal', + list => 'grouplist', + }, + ); + $r->print(< function gochoose(cname,cdom,cdesc,multiple,caller) { @@ -173,26 +315,26 @@ function gochoose(cname,cdom,cdesc,multi } } } - opener.document.$env{'form.form'}.coursetotal.value = courseCount; - if (typeof(opener.document.$env{'form.form'}.coursepick.length) == + opener.document.$env{'form.form'}.$elements{$type}{'total'}.value = courseCount; + if (typeof(opener.document.$env{'form.form'}.$elements{$type}{'name'}.length) == 'undefined') { - if (opener.document.$env{'form.form'}.coursepick.value == 'specific') { - opener.document.$env{'form.form'}.coursepick.checked = true; + if (opener.document.$env{'form.form'}.$elements{$type}{'name'}.value == 'specific') { + opener.document.$env{'form.form'}.$elements{$type}{'name'}.checked = true; } else { - opener.document.$env{'form.form'}.coursepick.checked = false; + opener.document.$env{'form.form'}.$elements{$type}{'name'}.checked = false; } } else { - for (var j=0; j 0) { courses = courses.substr(0,courses.length-2); - opener.document.$env{'form.form'}.courselist.value = courses; + opener.document.$env{'form.form'}.$elements{$type}{'list'}.value = courses; } } else { $name_code @@ -215,38 +357,41 @@ function gochoose(cname,cdom,cdesc,multi function setSections() { var numSections = $num_sections var sectionsArray = new Array("$seclist") - opener.document.$env{"form.form"}.currsec.length = 0 + opener.document.$env{"form.form"}.$sec_element.length = 0 if (numSections == 0) { - opener.document.$env{"form.form"}.currsec.multiple=false - opener.document.$env{"form.form"}.currsec.size=1; - opener.document.$env{"form.form"}.currsec.options[0] = new Option('No existing sections','',false,false) + opener.document.$env{"form.form"}.$sec_element.multiple=false + opener.document.$env{"form.form"}.$sec_element.size=1; + opener.document.$env{"form.form"}.$sec_element.options[0] = new Option('No existing sections','',false,false) } else { if (numSections == 1) { - opener.document.$env{"form.form"}.currsec.multiple=false; - opener.document.$env{"form.form"}.currsec.size=1; - opener.document.$env{"form.form"}.currsec.options[0] = new Option('Select','',true,true); - opener.document.$env{"form.form"}.currsec.options[1] = new Option('No section','',false,false) - opener.document.$env{"form.form"}.currsec.options[2] = new Option(sectionsArray[0],sectionsArray[0],false,false); + opener.document.$env{"form.form"}.$sec_element.multiple=false; + opener.document.$env{"form.form"}.$sec_element.size=1; + opener.document.$env{"form.form"}.$sec_element.options[0] = new Option('Select','',true,true); + opener.document.$env{"form.form"}.$sec_element.options[1] = new Option('No section','',false,false) + opener.document.$env{"form.form"}.$sec_element.options[2] = new Option(sectionsArray[0],sectionsArray[0],false,false); } else { for (var i=0; i $submitopener -
+ $name_input @@ -256,13 +401,15 @@ $multelement $lt{'cac'}: $sincefilterform
$lt{'cdo'}: $domainselectform +
-$lt{'cin'}: - -
+$instcodeform $lt{'cow'}:
+$lt{'cod'}: $ownerdomselectform +
$courseidtag $lt{'cde'}: @@ -276,23 +423,28 @@ ENDSCRIPT $r->rflush(); unless ($descriptfilter) { $descriptfilter='.'; } unless ($instcodefilter) { $instcodefilter='.'; } - unless ($ownerfilter) { $ownerfilter='.'; } - unless ($coursefilter) { $coursefilter='.'; } + my $combownerfilter; + if (($ownerfilter ne '') || ($ownerdomfilter ne '')) { + $combownerfilter = $ownerfilter.':'.$ownerdomfilter; + } + if ($combownerfilter eq '') { $combownerfilter='.'; } + if ($coursefilter eq '') { $coursefilter='.'; } + if ($type eq '') { $type = '.'; } my $timefilter=($sincefilter==-1?1:time-$sincefilter); - my %courses= - &Apache::lonnet::courseiddump - ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter); - $r->print(''); + my %courses = &Apache::lonnet::courseiddump($domainfilter,$descriptfilter, + $timefilter,$instcodefilter,$combownerfilter, + $coursefilter,undef,undef,$type); + $r->print(''); my %by_descrip; my $numcourses = keys(%courses); foreach my $course (keys(%courses)) { my $descr; - if ($courses{$course} =~ m/^([^:]*):/) { - $descr = &Apache::lonnet::unescape($1); + if ($courses{$course} =~ m/^([^:]*):/i) { + $descr = &unescape($1); } else { - $descr = &Apache::lonnet::unescape($courses{$course}); + $descr = &unescape($courses{$course}); } - my $description = lc($descr); + my $description = $descr; push (@{$by_descrip{$description}}, $course); } if ($numcourses > 1 && $multiple) { @@ -301,21 +453,25 @@ ENDSCRIPT onclick="javascript:uncheckAll(document.courselist.course_id)" />

'); } - foreach my $description (sort(keys(%by_descrip))) { + foreach my $description (sort + { lc($a) cmp lc($b) } (keys(%by_descrip))) { foreach my $course (@{$by_descrip{$description}}) { my $cleandesc=&HTML::Entities::encode($description,'<>&"'); $cleandesc=~s/'/\\'/g; my ($cdom,$cnum)=split(/\_/,$course); - my ($descr,$instcode,$owner) = split/:/,$courses{$course}; + my ($descr,$instcode,$owner,$ttype) = split/:/,$courses{$course}; $r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc)); $r->print($description.'('. ($Apache::lonnet::domaindescription{$cdom}? $Apache::lonnet::domaindescription{$cdom}:$cdom).")"); unless ($instcode eq '') { - $r->print(" - ".&Apache::lonnet::unescape($instcode)); + $r->print(" - ".&unescape($instcode)); } unless ($owner eq '') { - $r->print(", owner - ".&Apache::lonnet::unescape($owner)); + $r->print(", owner - ".&unescape($owner)); + } + unless ($ttype eq '') { + $r->print('('.&Apache::lonnet::unescape($ttype).')'); } if ($multiple) { $r->print("\n"); } $r->print("
\n"); @@ -330,9 +486,13 @@ ENDSCRIPT ''."\n". ''."\n". ''."\n". - '
'); + ''."\n"); + if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) { + $r->print(''."\n"); + } + $r->print("\n"); } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; } @@ -346,7 +506,53 @@ sub course_chooser { "'".$cnum."','".$cdom."','".$cleandesc."')".'" />'."\n"; } return $output; -} +} + +sub build_selection_lists { + my ($cdom,$cnum,$type,$needroles,$needaccess,$caller) = @_; + my ($sections,$groups,$allroles,$roleshash,$accesshash) = + &Apache::loncommon::get_secgrprole_info($cdom,$cnum,$needroles,$type); + if ($caller eq 'portform') { + if (@{$sections} == 0) { + @{$sections} = ('none'); + } else { + unshift(@{$sections},('all','none')); + } + if (@{$groups} == 0) { + @{$groups} = ('none'); + } else { + unshift(@{$groups},('all','none')); + } + + } + my $num_sections = scalar(@{$sections}); + my $seclist = join('","',@{$sections}); + my $num_groups = scalar(@{$groups}); + my $groupslist = join('","',@{$groups}); + my ($roleslist,$num_roles,$rolesnameslist,$num_access,$accesslist, + $accessnameslist); + if ($needroles) { + $num_roles = @{$allroles}; + $roleslist = join('","',@{$allroles}); + my @allrolesnames; + foreach my $role (@{$allroles}) { + push(@allrolesnames,$$roleshash{$role}); + } + $rolesnameslist = join('","',@allrolesnames); + } + if ($needaccess) { + $num_access = keys(%{$accesshash}); + my (@allaccess,@allaccessnames); + foreach my $key (sort(keys(%{$accesshash}))) { + push(@allaccess,$key); + push(@allaccessnames,$$accesshash{$key}); + } + $accesslist = join('","',@allaccess); + $accessnameslist = join('","',@allaccessnames); + } + return ($seclist,$num_sections,$groupslist,$num_groups,$roleslist, + $num_roles,$rolesnameslist,$accesslist,$num_access,$accessnameslist); +} 1; __END__