--- loncom/interface/lonpickcourse.pm 2009/05/04 13:24:12 1.79 +++ loncom/interface/lonpickcourse.pm 2010/06/08 16:37:20 1.96 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.79 2009/05/04 13:24:12 raeburn Exp $ +# $Id: lonpickcourse.pm,v 1.96 2010/06/08 16:37:20 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,7 +36,7 @@ use Apache::lonnet; use Apache::lonlocal; use Apache::longroup; use Apache::courseclassifier; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); sub handler { my $r = shift; @@ -50,23 +50,22 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement', 'cdomelement','cnameelement','roleelement', - 'multiple','type','setroles','fixeddom']); + 'multiple','type','setroles','fixeddom','cloner']); + my ($type,$title,$jscript,$multelement,$multiple,$roleelement,$typeelement, + $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom); - my ($type,$title,$jscript,$multelement,$multiple,$roleelement, - $lastaction,$autosubmit,$submitopener); - - # Get course type - Course or Non-standard Course. + # Get course type - Course or Community. $type = $env{'form.type'}; if (!defined($env{'form.type'})) { $type = 'Course'; } - $title = &mt('Selecting a [_1]',$type); + $title = 'Selecting a '.$type; # Setup for multiple course selections, if flag for multiples set. $multiple = $env{'form.multiple'}; if ($multiple) { ($jscript,$multelement) = &multiples_tag(); - $title = &mt('Selecting [_1](s)',lc($type)); + $title = 'Selecting '.$type.'(s)'; } # if called when a DC is selecting a course @@ -76,6 +75,20 @@ sub handler { $submitopener = &processpick(); $autosubmit = 'process_pick("'.$roledom.'")'; } + if ($env{'form.typeelement'} ne '') { + $typeelement = ''; + } + + # if called when a DC is creating a course for another user. + if ($env{'form.form'} eq 'ccrs') { + ($cloneruname,$clonerudom) = ($env{'form.cloner'} =~ /^($match_username):($match_domain)$/); + } + + # if called when requesting a course + if ($env{'form.form'} eq 'requestcrs') { + $cloneruname = $env{'user.name'}; + $clonerudom = $env{'user.domain'}; + } my $onlyown = 0; # if called to assign course-based portfolio access control @@ -84,15 +97,18 @@ sub handler { } my %loaditem; - if ($env{'form.numtitles'}) { - $loaditem{'onload'} = 'setElements(); '; + if (($env{'form.type'} eq 'Course') && ($env{'form.numtitles'})) { + if (($env{'form.official'} eq 'on') && ($env{'form.state'} eq 'listing')) { + $loaditem{'onload'} = 'setElements(document.filterpicker); '; + } } if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && ($env{'form.pickedcourse'})) { - $loaditem{'onload'} .= 'setSections()'; + $loaditem{'onload'} .= 'setRoles();setSections();'; } - $r->print(&Apache::loncommon::start_page($title,undef, + my $js = &js_changer(); + $r->print(&Apache::loncommon::start_page($title,$js, {'add_entries' => \%loaditem, 'no_nav_bar' => 1, })); @@ -113,7 +129,8 @@ sub handler { } # print javascript functions for choosing a course - if ($env{'form.gosearch'} || $onlyown) { + if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) || + $onlyown) { $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction)); } $r->print(' + +ENDJS + +} + sub processpick { my $openerform = 'rolechoice'; if ($env{'form.form'} eq 'studentform') { @@ -181,7 +232,12 @@ ENDONE $process_pick .= <<"ENDTWO"; if (pickedDomain == dom) { if (pickedCourse != '') { - var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse + var ccrole = "cc"; + var pickedType = "$env{'form.type'}"; + if (pickedType == "Community") { + ccrole = "co"; + } + var courseTarget = ccrole+"./"+pickedDomain+"/"+pickedCourse opener.document.title='Role selected. Please stand by.'; opener.status='Role selected. Please stand by.'; opener.document.rolechoice.newrole.value=courseTarget @@ -213,7 +269,12 @@ sub create_user_javascript { my $output; #javascript for reporting sections and groups then closing if ($env{'form.pickedcourse'}) { - my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'}; + my %coursedescription = + &Apache::lonnet::coursedescription($env{'form.pickedcourse'}, + {'one_time' => '1'}); + my $cdom = $coursedescription{'domain'}; + my $cnum = $coursedescription{'num'}; + my $crstype = $coursedescription{'type'}; my $sec_element = 'currsec'; my $grplist_element = 'groups'; my ($sections,$groups) = @@ -227,7 +288,10 @@ sub create_user_javascript { function setSections() { opener.document.$env{"form.form"}.$grplist_element.value='$groupslist'; window.opener.setSect('$seclist'); - self.close() + self.close(); +} +function setRoles() { + window.opener.setRole('$crstype'); } |; @@ -237,7 +301,7 @@ function setSections() { } sub display_matched_courses { - my ($r,$type,$multiple,$action,$showroles,%courses) = @_; + my ($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,%courses) = @_; if ($env{'form.form'} eq 'portform') { $action = '/adm/portfolio'; } @@ -245,25 +309,34 @@ sub display_matched_courses { $r->print('
'); if ($env{'form.form'} eq 'modifycourse') { if ($numcourses > 0) { - my $cctitle = &Apache::lonnet::plaintext('cc',$type); - my $dctitle = &Apache::lonnet::plaintext('dc'); - my $ccrolechk = ' checked="checked" '; - my $menuchk = ' '; - if ($env{'form.prevphase'} ne '') { - $ccrolechk = ' '; - $menuchk = ' checked="checked" '; + my $ccrole = 'cc'; + if ($type eq 'Community') { + $ccrole = 'co'; } + my $cctitle = &Apache::lonnet::plaintext($ccrole,$type); + my $dctitle = &Apache::lonnet::plaintext('dc'); + my $ccrolechk = ' '; + my $menuchk = ' checked="checked" '; $r->print( '
' .''.&mt('Action').'' .'
' + .' '); + if ($type eq 'Community') { + $r->print(&mt('Enter the community with the role of [_1].',$cctitle)); + } else { + $r->print(&mt('Enter the course with the role of [_1].',$cctitle)); + } + $r->print('' .'
' + .' '); + if ($type eq 'Community') { + $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle)); + } else { + $r->print(&mt('View or modify course settings which only a [_1] may modify.',$dctitle)); + } + $r->print('' .'
' .'
' ); @@ -294,13 +367,17 @@ sub display_matched_courses { if (%courses) { $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); + my $titlehdr = &mt('Course Title'); + if ($type eq 'Community') { + $titlehdr = &mt('Community Title'); + } $r->print(''.&mt('Select').'' - .''.&mt('Course Title').'' - .''.&mt('Domain').'' - .''.&mt('Course Code').'' - .''.&mt('Owner/Co-owner(s)').'' - .''.&mt('Type').'' - ); + .''.$titlehdr.'' + .''.&mt('Domain').''); + unless ($type eq 'Community') { + $r->print(''.&mt('Course Code').''); + } + $r->print(''.&mt('Owner/Co-owner(s)').''); if ($showroles) { $r->print(''.&mt("Role(s) for [_1]", &Apache::loncommon::plainname($env{'form.personfilter'}, @@ -308,17 +385,45 @@ sub display_matched_courses { } $r->print(&Apache::loncommon::end_data_table_header_row()); } + my %cc_cloneable; + if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) { + my ($coord_cloneable,$warning) = + &get_coordinator_cloneable($cloneruname,$clonerudom,$type); + if ($coord_cloneable) { + map {$cc_cloneable{$_} = 1;} split('&',$coord_cloneable); + } + } foreach my $description (sort { lc($a) cmp lc($b) } (keys(%by_descrip))) { foreach my $course (@{$by_descrip{$description}}) { $r->print(&Apache::loncommon::start_data_table_row()); my $cleandesc=&HTML::Entities::encode($description,'<>&"'); $cleandesc=~s/'/\\'/g; my ($cdom,$cnum)=split(/\_/,$course); - my ($descr,$instcode,$ttype,@owners); + my ($descr,$instcode,$ttype,$canclone,@owners); if (ref($courses{$course}) eq 'HASH') { $descr = $courses{$course}{'description'}; - $instcode = $courses{$course}{'inst_code'}; - $ttype = $courses{$course}{'type'}; + $instcode = $courses{$course}{'inst_code'}; + $ttype = $courses{$course}{'type'}; + if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) { + if ($cc_cloneable{$courses{$course}{'cnum'}.':'.$courses{$course}{'domain'}}) { + $canclone = 1; + } + unless ($canclone) { + my $cloners = $courses{$course}{'cloners'}; + if ($cloners ne '') { + my @cloneable = split(',',$cloners); + if (grep(/^\*$/,@cloneable)) { + $canclone = 1; + } + if (grep(/^\*:\Q$env{'form.clonerudom'}\E$/,@cloneable)) { + $canclone = 1; + } + if (grep(/^\Q$cloneruname\E:\Q$clonerudom\E$/,@cloneable)) { + $canclone = 1; + } + } + } + } push(@owners,&unescape($courses{$course}{'owner'})); if (ref($courses{$course}{'co-owners'}) eq 'ARRAY') { foreach my $item (@{$courses{$course}{'co-owners'}}) { @@ -330,28 +435,23 @@ sub display_matched_courses { ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course}); push(@owners,&unescape($singleowner)); } - my $ownerstr = join(', ',@owners); - $r->print(''.&course_chooser($multiple,$cdom,$cnum,$cleandesc).''); + my $ownerstr = join(', ',map { &Apache::loncommon::plainname(split(':',$_)); } @owners); + $r->print(''.&course_chooser($multiple,$cdom,$cnum,$cleandesc,$canclone).''); $r->print(''.$description.''); $r->print(''); $r->print(&Apache::lonnet::domain($cdom,'description')? $cdom.' ('.&Apache::lonnet::domain($cdom,'description').')':$cdom); $r->print(''); - $r->print(''); - if ($instcode ne '') { - $r->print(&unescape($instcode)); - } else { - $r->print(' '); + unless ($type eq 'Community') { + $r->print(''); + if ($instcode ne '') { + $r->print(&unescape($instcode)); + } else { + $r->print(' '); + } + $r->print(''); } - $r->print(''); $r->print(''.$ownerstr.''); - $r->print(''); - if ($ttype ne '') { - $r->print(&mt(&unescape($ttype))); - } else { - $r->print(' '); - } - $r->print(''); if ($showroles) { $r->print(''); my $rolestr; @@ -362,7 +462,7 @@ sub display_matched_courses { my (undef,$crdom,$crname,$crtitle) = split('/',$role); $rolestr .= $crtitle.', '; } else { - $rolestr .= &Apache::lonnet::plaintext($role,$ttype).', '; + $rolestr .= &Apache::lonnet::plaintext($role,$type).', '; } } $rolestr =~ s/\, $//; @@ -402,6 +502,11 @@ sub display_matched_courses { $env{'form.cnumelement'}.'" />'."\n". ''."\n"); + if ($env{'form.typeelement'} ne '') { + $r->print(''."\n"); + + } } if ((exists($env{'form.fixeddom'})) && ($env{'form.form'} eq 'rules')) { $r->print(' &mt("$type Title"), - 'cdo' => &mt("$type Domain"), - 'ins' => &mt('Institutional Code'), - 'inc' => &mt('Institutional Categorization'), - 'cow' => &mt("$type Owner/Co-owner"), - 'cop' => &mt("$type Personnel Includes"), - 'cog' => &mt('Course Type') + $sincefilterform = &timebased_select_form('sincefilter',$filter); + + # course created filter and selection + if (exists($filter->{'createdfilter'})) { + $createdfilterform = &timebased_select_form('createdfilter',$filter); + } + + my %lt = &Apache::lonlocal::texthash( + 'cac' => "$type Activity", + 'ccr' => "$type Created", + 'cde' => "$type Title", + 'cdo' => "$type Domain", + 'ins' => 'Institutional Code', + 'inc' => 'Institutional Categorization', + 'cow' => "$type Owner/Co-owner", + 'cop' => "$type Personnel Includes", + 'cog' => 'Type', ); - $typeselectform = ''; - $instcodetitle = $lt{'ins'}; - } else { - $instcodetitle = $lt{'inc'}; + if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) { + my $typeval = 'Course'; + if ($type eq 'Community') { + $typeval = 'Community'; } - if ($env{'form.fixeddom'}) { - $instcodetitle .= '
('.$codedom.')'; - } - if ($jscript ne '') { - $jscript = ''."\n"; + $typeselectform = ''; + } else { + $typeselectform = '"; + } + + my ($cloneableonlyform,$cloneabletitle); + if (exists($filter->{'cloneableonly'})) { + my $cloneableon = ''; + my $cloneableoff = ' checked="checked"'; + if ($filter->{'cloneableonly'}) { + $cloneableon = $cloneableoff; + $cloneableoff = ''; + } + $cloneableonlyform = ''.(' 'x3).''; + if ($env{'form.form'} eq 'ccrs') { + $cloneabletitle = &mt('Cloneable for').' '.$cloneruname.':'.$clonerudom; + } else { + $cloneabletitle = &mt('Cloneable by you'); } } - foreach my $posstype ('Course','Non-standard Course') { - $typeselectform.='\n"; + my $officialjs; + if ($type eq 'Course') { + if (exists($filter->{'instcodefilter'})) { + if (($env{'form.fixeddom'}) || ($formname eq 'requestcrs') + || ($formname eq 'modifycourse')) { + $officialjs = 1; + ($instcodeform,$jscript,$$numtitlesref) = + &instcode_selectors($codedom,'filterpicker',$officialjs); + if ($jscript) { + $jscript = ''."\n"; + } + } + if ($instcodeform eq '') { + $instcodeform = + ''; + $instcodetitle = $lt{'ins'}; + } else { + $instcodetitle = $lt{'inc'}; + } + if ($env{'form.fixeddom'}) { + $instcodetitle .= '
('.$codedom.')'; + } + } } - $typeselectform.=""; + my $output = qq| @@ -567,6 +702,7 @@ sub build_filters { $name_input $roleelement $multelement +$typeelement |; if ($formname eq 'portform') { $output .= ''."\n"; @@ -581,15 +717,24 @@ $multelement .$sincefilterform .&Apache::lonhtmlcommon::row_closure(); } + if ($createdfilterform) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'ccr'}) + .$createdfilterform + .&Apache::lonhtmlcommon::row_closure(); + } if ($domainselectform) { $output .= &Apache::lonhtmlcommon::row_title($lt{'cdo'}) .$domainselectform .&Apache::lonhtmlcommon::row_closure(); } if ($typeselectform) { - $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'}) - .$typeselectform - .&Apache::lonhtmlcommon::row_closure(); + if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) { + $output .= $typeselectform; + } else { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'}) + .$typeselectform + .&Apache::lonhtmlcommon::row_closure(); + } } if ($instcodeform) { $output .= &Apache::lonhtmlcommon::row_title($instcodetitle) @@ -618,37 +763,115 @@ $multelement .$list->{'coursefilter'}.'" />' .&Apache::lonhtmlcommon::row_closure(); } + if ($cloneableonlyform) { + $output .= &Apache::lonhtmlcommon::row_title($cloneabletitle). + $cloneableonlyform.&Apache::lonhtmlcommon::row_closure(); + } if (exists($filter->{'descriptfilter'})) { $output .= &Apache::lonhtmlcommon::row_title($lt{'cde'}) .'' .&Apache::lonhtmlcommon::row_closure(1); } - $output .= &Apache::lonhtmlcommon::end_pick_box(); - $output .= '

'."\n"; + } + if ($coord_cloneable) { + $output .= ''; + } + } + $output .= ''."\n". + '

'."\n".'
'."\n".'
'."\n"; - return $jscript.$output; + return $jscript.$warning.$output; +} + +sub timebased_select_form { + my ($item,$filter) = @_; + if (ref($filter) eq 'HASH') { + $filter->{$item} = $env{'form.'.$item}; + $filter->{$item} =~ s/[^\d-]//g; + if (!$filter->{$item}) { $filter->{$item}=-1; } + return &Apache::loncommon::select_form( + $filter->{$item}, + $item, + { '-1' => '', + '86400' => &mt('today'), + '604800' => &mt('last week'), + '2592000' => &mt('last month'), + '7776000' => &mt('last three months'), + '15552000' => &mt('last six months'), + '31104000' => &mt('last year'), + 'select_form_order' => + ['-1','86400','604800','2592000','7776000', + '15552000','31104000']}); + } +} + +sub get_coordinator_cloneable { + my ($cloneruname,$clonerudom,$type) = @_; + if (&Apache::lonnet::homeserver($cloneruname,$clonerudom) eq 'no_host') { + my $warning = '
'.&mt('Intended course owner does not exist'). + '
'; + return ('',$warning); + } else { + my ($cc_clone,$ccrole); + if ($type eq 'Community') { + $ccrole = 'co'; + } elsif ($type eq 'Course') { + $ccrole = 'cc'; + } + my %ccroles = &Apache::lonnet::get_my_roles($cloneruname,$clonerudom, + 'userroles',['active'], [$ccrole]); + foreach my $key (sort(keys(%ccroles))) { + my ($cnum,$cdom,$role) = split(':',$key); + $cc_clone .= $cdom.':'.$cnum.'&'; + } + $cc_clone =~ s/\&$//; + return ($cc_clone); + } } 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 $official = ' checked="checked" '; + my $unofficial = ''; + if ($env{'form.official'} eq 'off') { + $unofficial = $official; + $official = ''; + } + $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); } sub search_courses { - my ($r,$type,$onlyown,$filter,$numtitles) = @_; - my (%courses,%showcourses); + my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom) = @_; + my (%courses,%showcourses,$cloner,$ccrole); + if ($type eq 'Community') { + $ccrole = 'co'; + } else { + $ccrole = 'cc'; + } if (!$onlyown) { $r->print(&mt('Searching ...').'
 
'); $r->rflush(); @@ -657,24 +880,40 @@ 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 $now = time; my $timefilter = - ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'}); + ($filter->{'sincefilter'}==-1?1:$now-$filter->{'sincefilter'}); + my ($createdbefore,$createdafter); + if (($filter->{'createdfilter'} ne '') && ($filter->{'createdfilter'} !=-1)) { + $createdbefore = $now; + $createdafter = $now-$filter->{'createdfilter'}; + } my ($instcodefilter,$regexpok); if ($numtitles) { - $instcodefilter = - &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'}, - $numtitles); - $regexpok = 1; + if ($env{'form.official'} eq 'on') { + $instcodefilter = + &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles); + $regexpok = 1; + } elsif ($env{'form.official'} eq 'off') { + $instcodefilter = &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles); + unless ($instcodefilter eq '') { + $regexpok = -1; + } + } } else { $instcodefilter = $filter->{'instcodefilter'}; } + if ($instcodefilter eq '') { $instcodefilter = '.'; } + if ($type eq '') { $type = '.'; } + + if (($clonerudom ne '') && ($cloneruname ne '')) { + $cloner = $cloneruname.':'.$clonerudom; + } %courses = &Apache::lonnet::courseiddump($filter->{'domainfilter'}, $filter->{'descriptfilter'}, @@ -682,12 +921,15 @@ sub search_courses { $instcodefilter, $filter->{'combownerfilter'}, $filter->{'coursefilter'}, - undef,undef,$type,$regexpok); + undef,undef,$type,$regexpok,undef,undef, + undef,undef,$cloner,$env{'form.cc_clone'}, + $filter->{'cloneableonly'}, + $createdbefore,$createdafter); 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'], + [$ccrole,'in','ad','ep','ta','cr'], $filter->{'domainfilter'}); foreach my $role (keys(%rolehash)) { my ($cnum,$cdom,$courserole) = split(':',$role); @@ -718,10 +960,16 @@ sub search_courses { } sub course_chooser { - my ($multiple,$cdom,$cnum,$cleandesc) = @_; + my ($multiple,$cdom,$cnum,$cleandesc,$canclone) = @_; my $output; if ($multiple) { $output = '