--- loncom/interface/lonrequestcourse.pm 2009/08/22 21:08:39 1.23 +++ loncom/interface/lonrequestcourse.pm 2009/09/07 06:30:49 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.23 2009/08/22 21:08:39 raeburn Exp $ +# $Id: lonrequestcourse.pm,v 1.30 2009/09/07 06:30:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,6 +44,8 @@ described at http://www.lon-capa.org. =item handler() +=item get_breadcrumbs() + =item header() =item form_elements() @@ -58,10 +60,16 @@ described at http://www.lon-capa.org. =item request_administration() +=item close_popup_form() + +=item get_instcode() + =item print_request_form() =item print_enrollment_menu() +=item show_invalid_crosslists() + =item inst_section_selector() =item date_setting_table() @@ -94,12 +102,14 @@ described at http://www.lon-capa.org. =item check_autolimit() -=item build_batchcreatehash() - =item retrieve_settings() =item get_request_settings() +=item extract_instcode() + +=item generate_date_items() + =back =cut @@ -112,6 +122,7 @@ use Apache::lonnet; use Apache::loncommon; use Apache::lonlocal; use Apache::loncoursequeueadmin; +use Apache::lonuserutils; use LONCAPA qw(:DEFAULT :match); sub handler { @@ -122,38 +133,16 @@ sub handler { return OK; } + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['action','showdom','cnum','state']); &Apache::lonhtmlcommon::clear_breadcrumbs(); my $dom = &get_course_dom(); my $action = $env{'form.action'}; my $state = $env{'form.state'}; - my %stored; - my $jscript; - if ((defined($state)) && (defined($action))) { - if (($action eq 'view') && ($state eq 'details')) { - if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) { - my $result = &retrieve_settings($env{'form.showdom'},$env{'form.cnum'}); - } - } - my %elements = &form_elements($dom); - my $elementsref = {}; - if (ref($elements{$action}) eq 'HASH') { - if (ref($elements{$action}{$state}) eq 'HASH') { - $elementsref = $elements{$action}{$state}; - } - } - if (($state eq 'courseinfo') && ($env{'form.clonedom'} eq '')) { - $env{'form.clonedom'} = $dom; - } - $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored); - } - - if ($state eq 'personnel') { - $jscript .= "\n".&Apache::loncommon::userbrowser_javascript(); - } - - my $loaditems = &onload_action($action,$state); + my (%states,%stored); + my ($jscript,$uname,$udom,$result,$warning); - my %states; + $states{'display'} = ['details']; $states{'view'} = ['pick_request','details','cancel','removal']; $states{'log'} = ['filter','display']; $states{'new'} = ['courseinfo','enrollment','personnel','review','process']; @@ -170,6 +159,7 @@ sub handler { } } + my @invalidcrosslist; my %trail = ( crstype => 'Course Request Action', codepick => 'Category', @@ -186,46 +176,106 @@ sub handler { if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) { $trail{'enrollment'} = 'Enrollment'; - } + } - my $page = 0; - my $crumb; - if (defined($action)) { - my $done = 0; - my $i=0; - if (ref($states{$action}) eq 'ARRAY') { - while ($i<@{$states{$action}} && !$done) { - if ($states{$action}[$i] eq $state) { - $page = $i; - $done = 1; - } - $i++; - } - } - for (my $i=0; $i<@{$states{$action}}; $i++) { - if ($state eq $states{$action}[$i]) { - &Apache::lonhtmlcommon::add_breadcrumb( - {text=>"$trail{$state}"}); - $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'); - last; - } else { - if (($state eq 'process') && ($i > 0)) { - &Apache::lonhtmlcommon::add_breadcrumb( - {href=>"javascript:backPage(document.requestcrs,'$states{$action}[0]')", - text=>"$trail{$states{$action}[$i]}"}); + my ($page,$crumb,$newinstcode,$codechk,$checkedcode) = + &get_breadcrumbs($dom,$action,\$state,\%states,\%trail); + if ($action eq 'display') { + if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) { + my $namespace = 'courserequestqueue'; + if ($env{'form.cnum'} ne '') { + my $cnum = $env{'form.cnum'}; + my $reqkey = $cnum.'_approval'; + my $namespace = 'courserequestqueue'; + my $domconfig = &Apache::lonnet::get_domainconfiguser($dom); + my %queued = + &Apache::lonnet::get($namespace,[$reqkey],$dom,$domconfig); + if (ref($queued{$reqkey}) eq 'HASH') { + $uname = $queued{$reqkey}{'ownername'}; + $udom = $queued{$reqkey}{'ownerdom'}; + if (($udom =~ /^$match_domain$/) && ($uname =~ /^$match_username$/)) { + $result = &retrieve_settings($dom,$cnum,$udom,$uname); + } else { + $warning = &mt('Invalid username or domain for course requestor'); + } } else { - &Apache::lonhtmlcommon::add_breadcrumb( - {href=>"javascript:backPage(document.requestcrs,'$states{$action}[$i]')", - text=>"$trail{$states{$action}[$i]}"}); + $warning = &mt('No information was found for this course request.'); + } + } else { + $warning = &mt('No course request ID provided.'); + } + } else { + $warning = &mt('You do not have rights to view course request information.'); + } + } elsif ((defined($state)) && (defined($action))) { + if (($action eq 'view') && ($state eq 'details')) { + if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) { + my $result = &retrieve_settings($env{'form.showdom'},$env{'form.cnum'}); + } + } elsif ($env{'form.crstype'} eq 'official') { + if (&Apache::lonnet::auto_run('',$dom)) { + if (($action eq 'new') && (($state eq 'enrollment') || + ($state eq 'personnel'))) { + my $checkcrosslist = 0; + for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) { + if ($env{'form.crosslist_'.$i}) { + $checkcrosslist ++; + } + } + if ($checkcrosslist) { + my %codechk; + my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem); + &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles, + \%cat_titles, + \%cat_order, + \@code_order); + my $numtitles = scalar(@codetitles); + if ($numtitles) { + for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) { + if ($env{'form.crosslist_'.$i}) { + my $codecheck; + my $crosslistcode = ''; + foreach my $item (@code_order) { + $crosslistcode .= $env{'form.crosslist_'.$i.'_'.$item}; + } + if ($crosslistcode ne '') { + $codechk{$i} = + &Apache::lonnet::auto_validate_instcode('',$dom,$crosslistcode); + } + unless ($codechk{$i} eq 'valid') { + $env{'form.crosslist_'.$i} = ''; + push(@invalidcrosslist,$crosslistcode); + } + } + } + } + } } } } - } else { - &Apache::lonhtmlcommon::add_breadcrumb( - {text=>'Pick Action'}); - $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'); + my %elements = &form_elements($dom); + my $elementsref = {}; + if (ref($elements{$action}) eq 'HASH') { + if (ref($elements{$action}{$state}) eq 'HASH') { + $elementsref = $elements{$action}{$state}; + } + } + if (($state eq 'courseinfo') && ($env{'form.clonedom'} eq '')) { + $env{'form.clonedom'} = $dom; + } + if ($state eq 'crstype') { + $jscript = &mainmenu_javascript(); + } else { + $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored); + } + } + + if ($state eq 'personnel') { + $jscript .= "\n".&Apache::loncommon::userbrowser_javascript(); } + my $loaditems = &onload_action($action,$state); + my %can_request; my $canreq = &check_can_request($dom,\%can_request); if ($action eq 'new') { @@ -234,8 +284,9 @@ sub handler { &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems, $crumb); } else { - &request_administration($r,$action,$state,$page,\%states,$dom,$jscript, - $loaditems,$crumb); + &request_administration($r,$action,$state,$page,\%states,$dom, + $jscript,$loaditems,$crumb,$newinstcode, + $codechk,$checkedcode,\@invalidcrosslist); } } else { $r->print(&header('Course Requests').$crumb. @@ -245,10 +296,21 @@ sub handler { } } elsif ($action eq 'view') { if ($state eq 'crstype') { - &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb); + &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,$crumb); + } else { + &request_administration($r,$action,$state,$page,\%states,$dom,$jscript, + $loaditems,$crumb); + } + } elsif ($action eq 'display') { + if ($warning ne '') { + my $args = { only_body => 1 }; + $r->print(&header('Course Requests','','',$args).$crumb. + '

'.&mt('Course Request Details').'

'. + '
'.$warning.'
'. + &close_popup_form()); } else { - &request_administration($r,$action,$state,$page,\%states,$dom,$jscript, - $loaditems,$crumb); + &request_administration($r,$action,$state,$page,\%states,$dom,$jscript, + $loaditems,$crumb,'','','','',$uname,$udom); } } elsif ($action eq 'log') { &print_request_logs($jscript,$loaditems,$crumb); @@ -258,19 +320,124 @@ sub handler { return OK; } +sub mainmenu_javascript { + return <<"END"; +function setType(courseForm) { + for (var i=0; i{$action}) eq 'ARRAY') { + while ($i<@{$states->{$action}} && !$done) { + if ($states->{$action}[$i] eq $$state) { + $page = $i; + $done = 1; + } + $i++; + } + } + if ($env{'form.crstype'} eq 'official') { + if ($page > 1) { + if ($states->{$action}[$page-1] eq 'codepick') { + if ($env{'form.instcode'} eq '') { + ($newinstcode,$numtitles) = &get_instcode($dom); + if ($numtitles) { + if ($newinstcode eq '') { + $$state = 'codepick'; + $page --; + } else { + $codechk = + &Apache::lonnet::auto_validate_instcode('', + $dom,$newinstcode); + if ($codechk ne 'valid') { + $$state = 'codepick'; + $page --; + } + $checkedcode = 1; + } + } + } + } + } + } + for (my $i=0; $i<@{$states->{$action}}; $i++) { + if ($$state eq $states->{$action}[$i]) { + &Apache::lonhtmlcommon::add_breadcrumb( + {text=>"$trail->{$$state}"}); + $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'); + last; + } else { + if (($$state eq 'process') || ($$state eq 'removal')) { + &Apache::lonhtmlcommon::add_breadcrumb( + { href => '/adm/requestcourse', + text => "$trail->{$states->{$action}[$i]}", + } + ); + } else { + &Apache::lonhtmlcommon::add_breadcrumb( + { href => "javascript:backPage(document.requestcrs,'$states->{$action}[$i]')", + text => "$trail->{$states->{$action}[$i]}", } + ); + } + } + } + } else { + &Apache::lonhtmlcommon::add_breadcrumb( + {text=>'Pick Action'}); + $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'); + } + } else { + &Apache::lonhtmlcommon::add_breadcrumb( + {text=>'Pick Action'}); + $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'); + } + return ($page,$crumb,$newinstcode,$codechk,$checkedcode); +} + sub header { - my ($bodytitle,$jscript,$loaditems,$jsextra) = @_; + my ($bodytitle,$jscript,$loaditems,$jsextra,$args) = @_; if ($jscript) { $jscript = ''."\n"; } if ($loaditems) { - $loaditems = {'add_entries' => $loaditems,}; - return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$loaditems); - } else { - return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra); + if (ref($args) eq 'HASH') { + my %loadhash = ( + 'add_entries' => $loaditems, + ); + my %arghash = (%loadhash,%{$args}); + $args = \%arghash; + } else { + $args = {'add_entries' => $loaditems,}; + } } + return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$args); } sub form_elements { @@ -354,7 +521,6 @@ sub form_elements { enrollend_year => 'text', enrollend_minute => 'text', enrollend_second => 'text', - crosslisttotal => 'hidden', addcrosslist => 'checkbox', autoadds => 'radio', autodrops => 'radio', @@ -363,30 +529,29 @@ sub form_elements { for (my $i=0; $i<$env{'form.sectotal'}; $i++) { $extras{'sec_'.$i} = 'checkbox', $extras{'secnum_'.$i} = 'text', - $extras{'loncapasec_'.$i} = 'checkbox', + $extras{'loncapasec_'.$i} = 'text', } } my $crosslisttotal = $env{'form.crosslisttotal'}; if ($env{'form.addcrosslist'}) { $crosslisttotal ++; } - if (!defined($crosslisttotal)) { + if (!$crosslisttotal) { $crosslisttotal = 1; } - if ($crosslisttotal > 0) { - for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) { - if ($numtitles) { - $extras{'crosslist_'.$i.'_'.$lastitem} = 'text'; - } - if (@codetitles > 0) { - foreach my $item (@codetitles) { - $extras{'crosslist_'.$i.'_'.$item} = 'selectbox'; - } + + for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) { + if ($numtitles) { + $extras{'crosslist_'.$i.'_'.$lastitem} = 'text'; + } + if (@codetitles > 0) { + foreach my $item (@codetitles) { + $extras{'crosslist_'.$i.'_'.$item} = 'selectbox'; } - $extras{'crosslist_'.$i} = 'checkbox'; - $extras{'crosslist_'.$i.'_instsec'} = 'text', - $extras{'crosslist_'.$i.'_lcsec'} = 'text', } + $extras{'crosslist_'.$i} = 'checkbox'; + $extras{'crosslist_'.$i.'_instsec'} = 'text', + $extras{'crosslist_'.$i.'_lcsec'} = 'text', } my %mergedhash = (%{$elements{'new'}{'enrollment'}},%extras); %{$elements{'new'}{'enrollment'}} = %mergedhash; @@ -419,7 +584,11 @@ sub onload_action { my ($action,$state) = @_; my %loaditems; if (($action eq 'new') || ($action eq 'view')) { - $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)'; + if ($state eq 'crstype') { + $loaditems{'onload'} = 'javascript:setAction(document.mainmenu_action);javascript:setType(document.mainmenu_coursetype)'; + } else { + $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)'; + } } return \%loaditems; } @@ -491,14 +660,16 @@ sub print_main_menu { my $js = <<"END"; function nextPage(formname) { - var crschoice = document.requestcrs.crstype.value; - var actionchoice = document.requestcrs.action.value; + var crschoice = document.mainmenu_coursetype.crstype.value; + var actionchoice = document.mainmenu_action.action.value; if (check_can_request(crschoice,actionchoice) == true) { if ((actionchoice == 'new') && (crschoice == 'official')) { nextstate = 'codepick'; } else { $nextstate_setter - } + } + formname.crstype.value = crschoice; + formname.action.value = actionchoice; formname.state.value= nextstate; formname.submit(); } @@ -553,33 +724,29 @@ END END - $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb. - '
'. - '
'. + $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.'
'. &Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title('Course Domain'). + &Apache::lonhtmlcommon::row_title(&mt('Course Domain')). + ''. &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange)); if (!$onchange) { $r->print(' '); } - $r->print(&Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::end_pick_box().'
'); + $r->print(''.&Apache::lonhtmlcommon::row_closure()); my $formname = 'requestcrs'; my $nexttext = &mt('Next'); - $r->print( - '
'. - &Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title('Action').' - + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).' + '. - &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title('Course Type').' +
'. + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::row_title(&mt('Course Type')).' +
-'. - &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::end_pick_box().'
- -
'); + $r->print(''."\n". + &Apache::lonhtmlcommon::row_closure(1)."\n". + &Apache::lonhtmlcommon::end_pick_box().'
'."\n". + '
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + '
'); $r->print(&Apache::loncommon::end_page()); return; } sub request_administration { - my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb) = @_; + my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb, + $newinstcode,$codechk,$checkedcode,$invalidcrosslist,$uname,$udom) = @_; my $js; if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) { $js = <print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb); - &print_request_form($r,$action,$state,$page,$states,$dom); + &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode, + $codechk,$checkedcode,$invalidcrosslist); } elsif ($action eq 'view') { my $jsextra; my $formname = 'requestcrs'; @@ -651,7 +825,7 @@ END my $form = '
'; if ($state eq 'pick_request') { $r->print('

'.&mt('Pending course requests').'

'."\n".$form."\n". - &print_request_status($dom).''); + &print_request_status($dom).'
'); } elsif ($state eq 'details') { my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk); my $origcnum = $env{'form.cnum'}; @@ -663,7 +837,7 @@ END \%cat_order,\@code_order); } $r->print('

'.&mt('Course Request Details').'

'."\n".$form."\n". - &print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order, + &print_review($dom,\@codetitles,\%cat_titles,\%cat_order, \@code_order)."\n". ''."\n"); my @excluded = &get_excluded_elements($dom,$states,'new','review'); @@ -736,6 +910,18 @@ END } $r->print(''); } + } elsif ($action eq 'display') { + my $formname = 'requestcrs'; + my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk); + if ($env{'form.crstype'} eq 'official') { + &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, + \%cat_order,\@code_order); + } + $r->print(&header('Course Request','','','',{ 'only_body' => 1}). + $crumb."\n".'

'.&mt('Course Request Details').'

'. + &print_review($dom,\@codetitles,\%cat_titles,\%cat_order, + \@code_order,$uname,$udom)."\n".'
'. + &close_popup_form()); } elsif ($action eq 'log') { $r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb); } @@ -743,8 +929,34 @@ END return; } +sub close_popup_form { + my $close= &mt('Close Window'); + return << "END"; +

+ +

+END +} + +sub get_instcode { + my ($dom) = @_; + my ($instcode,$numtitles); + my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk); + &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, + \%cat_order,\@code_order); + $numtitles = scalar(@codetitles); + if (@code_order > 0) { + my $message; + foreach my $item (@code_order) { + $instcode .= $env{'form.instcode_'.$item}; + } + } + return ($instcode,$numtitles); +} + sub print_request_form { - my ($r,$action,$state,$page,$states,$dom) = @_; + my ($r,$action,$state,$page,$states,$dom,$newinstcode,$codechk,$checkedcode, + $invalidcrosslist) = @_; my $formname = 'requestcrs'; my ($next,$prev,$message,$output,$codepicker,$crstype); $prev = $states->{$action}[$page-1]; @@ -755,44 +967,28 @@ sub print_request_form { ); $crstype = $env{'form.crstype'}; $r->print('
'); - my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk); + my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk, + @disallowed); if ($crstype eq 'official') { if ($env{'form.instcode'} ne '') { $instcode = $env{'form.instcode'}; + } elsif ($newinstcode ne '') { + $instcode = $newinstcode; } - } - if ($prev eq 'codepick') { - if ($crstype eq 'official') { - &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, - \%cat_order,\@code_order); - } - if (@code_order > 0) { - my $message; - if ($instcode eq '') { - foreach my $item (@code_order) { - $instcode .= $env{'form.instcode_'.$item}; - } - $r->print(''."\n"); - } - if ($instcode ne '') { - $code_chk = &Apache::lonnet::auto_validate_instcode('',$dom,$instcode); - if ($code_chk eq 'valid') { - $message = '
'. - &mt('The chosen course category [_1] is valid.',''. - $instcode.'').'
'; - } else { - $message = '
'. - &mt('No course was found matching your choice of institutional course category.'); - if ($code_chk ne '') { - $message .= '
'.$code_chk; - } - $message .= '
'; - } + if ($checkedcode) { + if ($codechk eq 'valid') { + $message = '
'. + &mt('The chosen course category [_1] is valid.',''. + $instcode.''). + '
'; } else { $message = '
'. - &mt('No course was found matching your choice of institutional course category.'); - } - unless ($code_chk eq 'valid') { + &mt('No course was found matching your choice of institutional course category.'); + if ($codechk ne '') { + $message .= '
'.$codechk; + } + $message .= '
'; $prev = 'crstype'; } $r->print($message); @@ -820,7 +1016,7 @@ sub print_request_form { $r->print(&courseinfo_form($dom,$formname,$crstype,$next)); } } elsif ($prev eq 'codepick') { - if ($env{'form.instcode'} eq '') { + if ($instcode eq '') { $prev = $states->{$action}[$page-2]; } $r->print(&courseinfo_form($dom,$formname,$crstype,$next)); @@ -830,10 +1026,84 @@ sub print_request_form { \%cat_order,\@code_order); } $r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles, - \%cat_titles,\%cat_order,\@code_order)); + \%cat_titles,\%cat_order,\@code_order, + $invalidcrosslist)); } elsif ($state eq 'personnel') { - $r->print(&print_personnel_menu($dom,$formname,$crstype)); + $r->print(&print_personnel_menu($dom,$formname,$crstype,$invalidcrosslist)); } elsif ($state eq 'review') { + my (%alerts,%rulematch,%inst_results,%curr_rules,%got_rules,%disallowmsg); + my $now = time; + for (my $i=0; $i<$env{'form.persontotal'}; $i++) { + my $personname = $env{'form.person_'.$i.'_uname'}; + my $persondom = $env{'form.person_'.$i.'_dom'}; + if (($personname =~ /^$match_username$/) && + ($persondom =~ /^$match_domain$/)) { + if (&Apache::lonnet::domain($persondom)) { + my $personhome = + &Apache::lonnet::homeserver($personname,$persondom); + if ($personhome eq 'no_host') { + if ($persondom ne $dom) { + my $skipuser = 1; + if ($env{'user.role.dc./'.$persondom.'/'}) { + my ($start,$end) = split('.',$env{'user.role.dc./'.$persondom.'/'}); + if (((!$start) || ($start < $now)) && + ((!$end) || ($end > $now))) { + $skipuser = 0; + } + } + if ($skipuser) { + push(@disallowed,$i); + $disallowmsg{$i} = &mt('[_1] was excluded because new users need be from the course domain',''.$personname.':'.$persondom.''); + next; + } + } + if (&get_cancreate_status($persondom,$personname,$dom)) { + my ($allowed,$msg) = + &check_newuser_rules($persondom,$personname, + \%alerts,\%rulematch,\%inst_results, + \%curr_rules,\%got_rules); + if ($allowed) { + if (ref($inst_results{$personname.':'.$persondom}) eq 'HASH') { + if ($inst_results{$personname.':'.$persondom}{'lastname'} ne '') { + $env{'form.person_'.$i.'_lastname'} = $inst_results{$personname.':'.$persondom}{'lastname'}; + } + if ($inst_results{$personname.':'.$persondom}{'firstname'} ne '') { + $env{'form.person_'.$i.'_firstname'} = $inst_results{$personname.':'.$persondom}{'firstname'}; + } + if ($inst_results{$personname.':'.$persondom}{'permanentemail'} ne '') { + $env{'form.person_'.$i.'_emailaddr'} = $inst_results{$personname.':'.$persondom}{'permanentemail'}; + } + } + } else { + push(@disallowed,$i); + $disallowmsg{$i} = &mt('[_1] was excluded because the username violated format rules for the domain',''.$personname.':'.$persondom.''); + } + } else { + push(@disallowed,$i); + $disallowmsg{$i} = &mt('[_1] was excluded because you may not request new users in the domain',''.$personname.':'.$persondom.''); + } + } else { + my %userenv = + &Apache::lonnet::userenvironment($persondom,$personname,'lastname','firstname','permanentemail'); + if ($env{'form.person_'.$i.'_lastname'} eq '') { + $env{'form.person_'.$i.'_lastname'} = $userenv{'lastname'}; + } + if ($env{'form.person_'.$i.'_firstname'} eq '') { + $env{'form.person_'.$i.'_firstname'} = $userenv{'firstname'}; + } + if ($env{'form.person_'.$i.'_emailaddr'} eq '') { + $env{'form.person_'.$i.'_emailaddr'} = $userenv{'permanentemail'}; + } + } + } elsif ($personname ne '') { + push(@disallowed,$i); + $disallowmsg{$i} = &mt('[_1] was excluded because the domain is invalid',''.$personname.':'.$persondom.''); + } + } elsif ($personname ne '') { + push(@disallowed,$i); + $disallowmsg{$i} = &mt('[_1] was excluded because the username or domain is invalid.',''.$personname.':'.$persondom.''); + } + } my $cnum; if ($env{'form.origcnum'} =~ /^($match_courseid)$/) { $cnum = $env{'form.origcnum'}; @@ -842,9 +1112,8 @@ sub print_request_form { } &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); - $r->print('

'.&mt('Review the details of the course request before submission.').'

'. - &print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order, - \@code_order). + $r->print('

'.&mt('Review course request details before submission').'

'. + &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg). ''); $navtxt{'next'} = &mt('Submit course request'); } elsif ($state eq 'process') { @@ -852,15 +1121,96 @@ sub print_request_form { &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); } - my $result = &print_request_outcome($dom,\@codetitles,\@code_order); + my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles, + \@code_order); $r->print($result); + if (($storeresult eq 'ok') || ($storeresult eq 'created')) { + $r->print('

'); + if ($storeresult eq 'ok') { + $r->print(''. + &mt('Modify this request').''.(' 'x4)); + } + $r->print(''.&mt('Make another request').'

'); + return; + } } my @excluded = &get_excluded_elements($dom,$states,$action,$state); + if ($state eq 'personnel') { + push(@excluded,'persontotal'); + } + if ($state eq 'review') { + if (@disallowed > 0) { + my @items = qw(uname dom lastname firstname emailaddr hidedom role newsec); + my @currsecs = ¤t_lc_sections(); + if (@currsecs) { + push(@items,'sec'); + } + my $count = 0; + for (my $i=0; $i<$env{'form.persontotal'}; $i++) { + unless ($env{'form.person_'.$i.'_uname'} eq '') { + if (grep(/^$i$/,@disallowed)) { + foreach my $item (@items) { + $env{'form.person_'.$i.'_'.$item} = ''; + } + } else { + foreach my $item (@items) { + $env{'form.person_'.$count.'_'.$item} = $env{'form.person_'.$i.'_'.$item}; + } + } + } + $count ++; + } + $env{'form.persontotal'} = $count; + + } + } + if ($state eq 'enrollment') { + push(@excluded,'crosslisttotal'); + } $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'
'); &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state); return; } +sub get_cancreate_status { + my ($persondom,$personname,$dom) = @_; + my ($rules,$ruleorder) = + &Apache::lonnet::inst_userrules($persondom,'username'); + my $usertype = &Apache::lonuserutils::check_usertype($persondom,$personname, + $rules); + return &Apache::lonuserutils::can_create_user($dom,'requestcrs',$usertype); +} + +sub check_newuser_rules { + my ($persondom,$personname,$alerts,$rulematch,$inst_results,$curr_rules, + $got_rules) = @_; + my $allowed = 1; + my $newuser = 1; + my ($checkhash,$userchkmsg); + my $checks = { 'username' => 1 }; + $checkhash->{$personname.':'.$persondom} = { 'newuser' => $newuser }; + &Apache::loncommon::user_rule_check($checkhash,$checks,$alerts,$rulematch, + $inst_results,$curr_rules,$got_rules); + if (ref($alerts->{'username'}) eq 'HASH') { + if (ref($alerts->{'username'}{$persondom}) eq 'HASH') { + my $domdesc = + &Apache::lonnet::domain($persondom,'description'); + if ($alerts->{'username'}{$persondom}{$personname}) { + if (ref($curr_rules->{$persondom}) eq 'HASH') { + $userchkmsg = + &Apache::loncommon::instrule_disallow_msg('username', + $domdesc,1). + &Apache::loncommon::user_rule_formats($persondom, + $domdesc,$curr_rules->{$persondom}{'username'}, + 'username'); + } + $allowed = 0; + } + } + } + return ($allowed,$userchkmsg); +} + sub get_excluded_elements { my ($dom,$states,$action,$state) = @_; my @excluded = ('counter'); @@ -890,8 +1240,9 @@ sub get_excluded_elements { } sub print_enrollment_menu { - my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order) =@_; - my ($sections,$autoenroll,$access_dates); + my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order, + $invalidcrosslist) =@_; + my ($sections,$autoenroll,$access_dates,$output); my $starttime = time; my $endtime = time+(6*30*24*60*60); # 6 months from now, approx @@ -905,10 +1256,17 @@ sub print_enrollment_menu { ); if ($env{'form.crstype'} eq 'official') { if (&Apache::lonnet::auto_run('',$dom)) { - my ($section_form,$crosslist_form,$autoenroll_form); + $output = &show_invalid_crosslists($invalidcrosslist); + my ($section_form,$crosslist_form); $section_form = &inst_section_selector($dom,$instcode); + if ($section_form) { + $sections = &Apache::lonhtmlcommon::row_headline(). + '

'.&mt('Sections for auto-enrollment').'

'. + &Apache::lonhtmlcommon::row_closure(1). + $section_form; + } my $crosslisttotal = $env{'form.crosslisttotal'}; - if (!defined($crosslisttotal)) { + if (!$crosslisttotal) { $crosslisttotal = 1; } if ($env{'form.addcrosslist'}) { @@ -924,65 +1282,96 @@ sub print_enrollment_menu { ''. ''.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1); + "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(); + $sections .= &Apache::lonhtmlcommon::row_headline. + '

'.&mt('Crosslisted courses for auto-enrollment').'

'. + &Apache::lonhtmlcommon::row_closure(1). + $crosslist_form; } - if ($section_form || $crosslist_form) { - $sections = '
'.&Apache::lonhtmlcommon::start_pick_box(). - $section_form.$crosslist_form. - &Apache::lonhtmlcommon::end_pick_box().'
'."\n"; - } - $autoenroll_form = + $autoenroll = &Apache::lonhtmlcommon::row_title(&mt('Add registered students automatically')). ''.(' 'x3).''. - &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::row_title(&mt('Drop unregistered students automatically')). ''.(' 'x3).''. - &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_closure(1). &date_setting_table($starttime,$endtime,$formname,'enroll',%enrolltitles); - if ($autoenroll_form) { - $autoenroll = '
'.&Apache::lonhtmlcommon::start_pick_box(). - $autoenroll_form. - &Apache::lonhtmlcommon::end_pick_box().'
'."\n"; - } } } - my $access_dates_form = + my $access_dates = &date_setting_table($starttime,$endtime,$formname,'access',%accesstitles); - if ($access_dates_form) { - $access_dates = '
'.&Apache::lonhtmlcommon::start_pick_box(). - $access_dates_form. - &Apache::lonhtmlcommon::end_pick_box().'
'."\n"; + $output .= &Apache::lonhtmlcommon::start_pick_box(); + if ($sections) { + $output .= $sections; + } + if ($autoenroll) { + $output .= &Apache::lonhtmlcommon::row_headline('Auto-enroll'). + '

'.&mt('Auto-enrollment settings').'

'. + &Apache::lonhtmlcommon::row_closure(1). + $autoenroll; + } + if ($access_dates) { + my $header = &mt('Access dates for students'); + if ($env{'form.crstype'} eq 'community') { + $header = &mt('Access dates for community members'); + } + $output .= &Apache::lonhtmlcommon::row_headline('Access'). + '

'.$header.'

'. + &Apache::lonhtmlcommon::row_closure(1). + $access_dates } - return $sections.$autoenroll.$access_dates; + return '
'.&Apache::lonhtmlcommon::start_pick_box().$output. + &Apache::lonhtmlcommon::end_pick_box().'
'; +} + +sub show_invalid_crosslists { + my ($invalidcrosslist) = @_; + my $output; + if (ref($invalidcrosslist) eq 'ARRAY') { + if (@{$invalidcrosslist} > 0) { + $output = '
'. + &mt('The following crosslisted courses were invalid:').'
    '; + foreach my $item (@{$invalidcrosslist}) { + $output .= '
  • '.$item.'
    • '; + } + $output .= '

'; + } + } + return $output; } + sub inst_section_selector { my ($dom,$instcode) = @_; my @sections = &Apache::lonnet::auto_get_sections(undef,$dom,$instcode); my $sectotal = scalar(@sections); my $output; if ($sectotal) { - $output .= &Apache::lonhtmlcommon::row_title('Sections'). + $output .= &Apache::lonhtmlcommon::row_title(&mt('Sections of [_1]',$instcode)). &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). ''.&mt('Include?').''. + 'value="'.$sectotal.'" />'. ''.&mt('Institutional Section').''. ''.&mt('LON-CAPA section').''. &Apache::loncommon::end_data_table_row(); for (my $i=0; $i<@sections; $i++) { my $colflag = $i%2; + my $checked = ' checked="checked"'; + if ($env{'form.origcnum'}) { + $checked=''; + } $output .= &Apache::loncommon::start_data_table_row(). ''. + '"'.$checked.' value="1" />'. ''.$sections[$i]. ''. @@ -1003,23 +1392,31 @@ sub date_setting_table { $starttime,'','','',1,'','','',1); my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end', $endtime,'','','',1,'','','',1); + my $closure = ''; if ($prefix eq 'access') { $perpetual = ' '; + $closure = '1'; } $table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}). $startform. - &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::row_title($datetitles{'end'}). $endform.$perpetual. - &Apache::lonhtmlcommon::row_closure(1); + &Apache::lonhtmlcommon::row_closure($closure); return $table; } sub print_personnel_menu { - my ($dom,$formname,$crstype) = @_; - my $output = '
'.&Apache::lonhtmlcommon::start_pick_box(); + my ($dom,$formname,$crstype,$invalidcrosslist) = @_; + my $output; + if ($crstype eq 'official') { + if (&Apache::lonnet::auto_run('',$dom)) { + $output .= &show_invalid_crosslists($invalidcrosslist); + } + } + $output .= '
'.&Apache::lonhtmlcommon::start_pick_box(); my $persontotal = $env{'form.persontotal'}; if ((!defined($persontotal)) || (!$persontotal)) { $persontotal = 1; @@ -1027,7 +1424,6 @@ sub print_personnel_menu { if ($env{'form.addperson'}) { $persontotal ++; } - my $userlinktxt = &mt('Set User'); my @items = ('uname','dom','lastname','firstname','emailaddr','hidedom'); my $roleoptions; @@ -1037,29 +1433,18 @@ sub print_personnel_menu { $type = 'Community'; } foreach my $role (@roles) { - my $plrole=&Apache::lonnet::plaintext($role,$type); + my $plrole = &Apache::lonnet::plaintext($role,$type); $roleoptions .= ' '."\n"; } my %customroles=&Apache::lonuserutils::my_custom_roles(); if (keys(%customroles) > 0) { foreach my $cust (sort(keys(%customroles))) { - my $custrole='cr_cr_'.$env{'user.domain'}. - '_'.$env{'user.name'}.'_'.$cust; + my $custrole="cr/$env{'user.domain'}/$env{'user.name'}/$cust"; $roleoptions .= ' '."\n"; } } - my @currsecs; - if ($env{'form.sectotal'}) { - for (my $i=0; $i<$env{'form.sectotal'}; $i++) { - if (defined($env{'form.loncapasec_'.$i})) { - my $lcsec = $env{'form.loncapasec_'.$i}; - unless (grep(/^\Q$lcsec\E$/,@currsecs)) { - push(@currsecs,$lcsec); - } - } - } - } + my @currsecs = ¤t_lc_sections(); my ($existtitle,$existops,$existmult,$newtitle,$seccolspan); if (@currsecs) { @@ -1080,19 +1465,19 @@ sub print_personnel_menu { $newtitle = &mt('Other').': '; } + if ($persontotal) { + $output .= &Apache::lonhtmlcommon::row_headline(). + '

'.&mt('Requestor is automatically assigned Course Coordinator role.').' '.&mt('Include other personnel?').'

'; + } for (my $i=0; $i<$persontotal; $i++) { my @linkargs = map { 'person_'.$i.'_'.$_ } (@items); my $linkargstr = join("','",@linkargs); - my $userlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,$userlinktxt); - my $uname_form = ''; + my $uname_form = ''; my $onchange = 'javascript:fix_domain('."'$formname','person_".$i."_dom',". - "'person_".$i."_hidedom'".');'. - 'openuserbrowser('."'$formname','$linkargstr','$dom'".');'; + "'person_".$i."_hidedom','person_".$i."_uname'".');'; my $udom_form = &Apache::loncommon::select_dom_form($dom,'person_'.$i.'_dom','', 1,$onchange). - ''; + ''; my %form_elems; foreach my $item (@items) { next if (($item eq 'dom') || ($item eq 'uname') || ($item eq 'hidedom')); @@ -1108,12 +1493,19 @@ sub print_personnel_menu { } $sectionselector .= $newtitle. ''."\n"; + my $usersrchlinktxt = &mt('Search for user'); + my $usersrchlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom, + $usersrchlinktxt); + my $userchklinktxt = &mt('Check username'); + my $userchklink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom, + $userchklinktxt,'checkusername'); $output .= - &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel').'
'. - ''.$userlink. - ''). - ''."\n". - ''."\n". + &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel')). + '
'.&mt('Username').'
'.$uname_form.'		'.&mt('Domain').'
'.$udom_form.'
'."\n". + ''. + ''."\n".''. ''."\n". ''."\n". ''."\n". @@ -1130,6 +1522,21 @@ sub print_personnel_menu { return $output; } +sub current_lc_sections { + my @currsecs; + if ($env{'form.sectotal'}) { + for (my $i=0; $i<$env{'form.sectotal'}; $i++) { + if (defined($env{'form.loncapasec_'.$i})) { + my $lcsec = $env{'form.loncapasec_'.$i}; + unless (grep(/^\Q$lcsec\E$/,@currsecs)) { + push(@currsecs,$lcsec); + } + } + } + } + return @currsecs; +} + sub print_request_status { my ($dom) = @_; my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'}, @@ -1238,8 +1645,7 @@ sub print_request_status { $output .= '
'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'
'; } $output .= ' -
-'; +
'; return $output; } @@ -1345,13 +1751,17 @@ sub print_request_logs { } sub print_review { - my ($formname,$dom,$codetitles,$cat_titles,$cat_order,$code_order) = @_; + my ($dom,$codetitles,$cat_titles,$cat_order,$code_order,$uname,$udom, + $disallowed,$disallowmsg) = @_; my ($types,$typename) = &course_types(); my ($owner,$ownername,$owneremail); - $owner = $env{'user.name'}.':'.$env{'user.domain'}; - $ownername = &Apache::loncommon::plainname($env{'user.name'}, - $env{'user.domain'},'first'); - my %emails = &Apache::loncommon::getemails(); + if ($uname eq '' || $udom eq '') { + $uname = $env{'user.name'}; + $udom = $env{'user.domain'}; + } + $owner = $uname.':'.$udom; + $ownername = &Apache::loncommon::plainname($uname,$udom,'first'); + my %emails = &Apache::loncommon::getemails($uname,$udom); foreach my $email ('permanentemail','critnotification','notification') { $owneremail = $emails{$email}; last if ($owneremail ne ''); @@ -1430,32 +1840,35 @@ sub print_review { &mt('Institutional course/section').''. ''; my $xlistinfo; - if ($env{'form.crosslisttotal'}) { - for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) { - if ($env{'form.crosslist_'.$i}) { - $xlistinfo .= ''; } + $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'}.''; } } if ($xlistinfo eq '') { $xlistinfo = ''; } - $section_values .= $xlistinfo.'
'.$usersrchlink.''. + &mt('Username').': '.$uname_form.' '.$userchklink.'
'."\n". + ''.&mt('Domain').': '.$udom_form.'
'.&mt('First Name').'
'.$form_elems{'firstname'}.'		'.&mt('Last Name').'
'.$form_elems{'lastname'}.'		'.&mt('E-mail').'
'.$form_elems{'emailaddr'}.'
'.&mt('LON-CAPA section').'
'; - if (ref($code_order) eq 'ARRAY') { - if (@{$code_order} > 0) { - foreach my $item (@{$code_order}) { - $xlistinfo .= $env{'form.crosslist_'.$i.'_'.$item}; - } + my $crosslisttotal = $env{'form.crosslisttotal'}; + if (!$crosslisttotal) { + $crosslisttotal = 1; + } + for (my $i=0; $i<$crosslisttotal; $i++) { + if ($env{'form.crosslist_'.$i}) { + $xlistinfo .= '
'; + if (ref($code_order) eq 'ARRAY') { + if (@{$code_order} > 0) { + foreach my $item (@{$code_order}) { + $xlistinfo .= $env{'form.crosslist_'.$i.'_'.$item}; } } - $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'}.''; - if ($env{'form.crosslist_'.$i.'_lcsec'}) { - $xlistinfo .= $env{'form.crosslist_'.$i.'_lcsec'}; - } else { - $xlistinfo .= &mt('None'); - } - $xlistinfo .= '
'; + if ($env{'form.crosslist_'.$i.'_lcsec'}) { + $xlistinfo .= $env{'form.crosslist_'.$i.'_lcsec'}; + } else { + $xlistinfo .= &mt('None'); + } + $xlistinfo .= '
'.&mt('None').'
'; + $section_values .= $xlistinfo; } + $section_values .= ''; } my %ctxt = &clone_text(); @@ -1517,6 +1930,9 @@ sub print_review { ''.&mt('None').''; for (my $i=0; $i<$env{'form.persontotal'}; $i++) { if ($env{'form.person_'.$i.'_uname'} ne '') { + if (ref($disallowed) eq 'ARRAY') { + next if (grep(/^$i$/,@{$disallowed})); + } my @allsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec'); my $newsec = $env{'form.person_'.$i.'_newsec'}; $newsec =~ s/^\s+//; @@ -1531,22 +1947,40 @@ sub print_review { } } } - my $showsec = 'None'; + my $showsec; if (@allsecs) { $showsec = join(', ',@allsecs); } + if ($showsec eq '') { + $showsec = &mt('None'); + } + if ($env{'form.person_'.$i.'_role'} eq 'cc') { + $showsec = &mt('None'); + } + my $role = $env{'form.person_'.$i.'_role'}; $personnel_values .= ''.$env{'form.person_'.$i.'_firstname'}.' '. $env{'form.person_'.$i.'_lastname'}.''. ''.$env{'form.person_'.$i.'_uname'}.':'. $env{'form.person_'.$i.'_dom'}.''. - ''.&Apache::lonnet::plaintext($env{'form.person_'.$i.'_role'}, - $container).''. + ''.&Apache::lonnet::plaintext($role,$container).''. ''.$showsec.''; } } - my $output = - '
'.&Apache::lonhtmlcommon::start_pick_box(). + my $output; + if (ref($disallowed) eq 'ARRAY') { + if (@{$disallowed} > 0) { + if (ref($disallowmsg) eq 'HASH') { + $output = '

'. + &mt('Not all requested personnel could be included.').'

    '; + foreach my $item (@{$disallowed}) { + $output .= '
  • '.$disallowmsg->{$item}.'
    • '; + } + $output .= '

'; + } + } + } + $output .= '
'.&Apache::lonhtmlcommon::start_pick_box(). &Apache::lonhtmlcommon::row_title(&mt('Owner')). ''. ''. @@ -1575,7 +2009,7 @@ sub print_review { '
'.&mt('Name').'
'.$personnel_headers.''."\n". $personnel_values.'
'."\n". &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::end_pick_box(); + &Apache::lonhtmlcommon::end_pick_box().'
'; return $output; } @@ -1609,9 +2043,15 @@ function validateForm() { ENDJS - + my $title = &mt('Brief Course Description'); + if ($crstype eq 'community') { + $title = &mt('Brief Community Description'); + } my $output .= $js_validate."\n".'
'.&Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title('Course Description'). + &Apache::lonhtmlcommon::row_headline(). + '

'.$title.'

'. + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::row_title(&mt('Description')). ''; my ($home_server_pick,$numlib) = &Apache::loncommon::home_server_form_item($dom,'chome', @@ -1621,9 +2061,12 @@ ENDJS &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course')); } $output .= $home_server_pick. + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_headline(). + '

'.&mt('Clone content and settings from an existing course?').'

'. &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::end_pick_box().'
'. - '
'.&clone_form($dom,$formname,$crstype).'
'."\n"; + &clone_form($dom,$formname,$crstype). + &Apache::lonhtmlcommon::end_pick_box().'
'."\n"; return $output; } @@ -1637,13 +2080,11 @@ sub clone_form { &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type); my %lt = &clone_text(); my $output .= - &Apache::lonhtmlcommon::start_pick_box(). &Apache::lonhtmlcommon::row_title($lt{'cid'}).''.&Apache::lonhtmlcommon::row_closure(1).''. - $cloneform.''.&Apache::lonhtmlcommon::row_closure(). + $cloneform.''.&Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::row_title($lt{'dsh'}).'
'. ''. - &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::end_pick_box(); + &Apache::lonhtmlcommon::row_closure(1); return $output; } @@ -1832,6 +2272,8 @@ sub print_request_outcome { my ($dom,$codetitles,$code_order) = @_; my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend, %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,); + my $sectotal = $env{'form.sectotal'}; + my $crosslisttotal = 0; $cnum = $env{'form.cnum'}; unless ($cnum =~ /^$match_courseid$/) { $output = &mt('Invalid LON-CAPA course number for the new course')."\n"; @@ -1874,6 +2316,9 @@ sub print_request_outcome { } } $crosslistings{$i}{'instcode'} = $xlistinfo; + if ($xlistinfo ne '') { + $crosslisttotal ++; + } $crosslistings{$i}{'instsec'} = $env{'form.crosslist_'.$i.'_instsec'}; $crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'}; } @@ -1940,17 +2385,9 @@ sub print_request_outcome { if ($env{'form.autoadds'}) { $autodrops = $env{'form.autoadds'}; } - my $sectotal = 0; - if ($env{'form.sectotal'}) { - $sectotal = $env{'form.sectotal'}; - } if ($env{'form.autoadds'}) { $autodrops = $env{'form.autoadds'}; } - my $crosslisttotal = 0; - if ($env{'form.crosslisttotal'}) { - $crosslisttotal = $env{'form.crosslisttotal'}; - } my $instcode = ''; if (exists($env{'form.instcode'})) { $instcode = $env{'form.instcode'}; @@ -1996,7 +2433,7 @@ sub print_request_outcome { accessend => $accessend, personnel => \%personnel, }; - my @inststatuses; + my (@inststatuses,$storeresult,$creationresult); my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig); if ($val eq '') { if ($crstype eq 'official') { @@ -2008,6 +2445,7 @@ sub print_request_outcome { } else { $output = &mt('Unrecognized course type: [_1]',$crstype); } + $storeresult = 'notpermitted'; } else { my ($disposition,$message,$reqstatus); my %reqhash = ( @@ -2058,6 +2496,7 @@ sub print_request_outcome { if ($message) { $output .= '
'.$message.'
'; } + $storeresult = 'rejected'; } elsif ($disposition eq 'process') { my %domdefs = &Apache::lonnet::get_domain_defaults($dom); my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles); @@ -2075,15 +2514,18 @@ sub print_request_outcome { if ($result eq 'created') { $disposition = 'created'; $reqstatus = 'created'; - $output = &mt('Your course request has been processed and the course has been created.'). - '
'. - &mt('You will need to logout and log-in again to be able to select a role in the course.'); + my $role_result = &update_requestors_roles($dom,$cnum,$crstype,$details, + \%longroles); + $output = '

'.&mt('Your course request has been processed and the course has been created.'). + '
'.$role_result.'

'; + $creationresult = 'created'; } else { $output = ''. &mt('An error occurred when processing your course request.'). '
'. &mt('You may want to review the request details and submit the request again.'). ''; + $creationresult = 'error'; } } else { my $requestid = $cnum.'_'.$disposition; @@ -2101,9 +2543,10 @@ sub print_request_outcome { $env{'user.domain'},$env{'user.name'}); if ($userreqhash{$statuskey} ne '') { $modified = 1; - my %queuehash = &Apache::lonnet::get_dom('courserequestqueue', - [$cnum.'_approval', - $cnum.'_pending'],$dom); + my $uname = &Apache::lonnet::get_domainconfiguser($dom); + my %queuehash = &Apache::lonnet::get('courserequestqueue', + [$cnum.'_approval', + $cnum.'_pending'],$dom,$uname); if (($queuehash{$cnum.'_approval'} ne '') || ($queuehash{$cnum.'_pending'} ne '')) { $queued = 1; @@ -2124,7 +2567,7 @@ sub print_request_outcome { } } } - my ($storeresult,$statusresult); + my ($statusresult); if ($requestkey =~ /^($match_domain)_($match_courseid)$/) { $storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey, 'courserequests'); @@ -2132,7 +2575,7 @@ sub print_request_outcome { my %status = ( 'status:'.$dom.':'.$cnum => $reqstatus, ); - $statusresult = &Apache::lonnet::put('courserequests',\%status); + $statusresult = &Apache::lonnet::put('courserequests',\%status); } } else { $storeresult = 'error: invalid requestkey format'; @@ -2141,7 +2584,7 @@ sub print_request_outcome { $output .= ''.&mt('An error occurred saving a record of the details of your request: [_1].',$storeresult).'
'; &Apache::lonnet::logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult"); } elsif ($statusresult ne 'ok') { - $output .= ''.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).'
'; + $output .= ''.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).'
'; &Apache::lonnet::logthis("Error saving course request status for $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult"); } if ($modified && $queued && $storeresult eq 'ok') { @@ -2152,6 +2595,117 @@ sub print_request_outcome { $output .= ''.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'

'; } } + if ($creationresult ne '') { + return ($creationresult,$output); + } else { + return ($storeresult,$output); + } +} + +sub update_requestors_roles { + my ($dom,$cnum,$crstype,$details,$longroles) = @_; + my $now = time; + my ($active,$future,$numactive,$numfuture,$output); + my $owner = $env{'user.name'}.':'.$env{'user.domain'}; + if (ref($details) eq 'HASH') { + if (ref($details->{'personnel'}) eq 'HASH') { + if (ref($details->{'personnel'}{$owner}) eq 'HASH') { + my @roles; + if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') { + @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}}); + unless (grep(/^cc$/,@roles)) { + push(@roles,'cc'); + } + } else { + @roles = ('cc'); + } + foreach my $role (@roles) { + my $start = $now; + my $end = '0'; + if ($role eq 'st') { + if ($details->{'accessstart'} ne '') { + $start = $details->{'accessstart'}; + } + if ($details->{'accessend'} ne '') { + $end = $details->{'accessend'}; + } + } + my @usecs; + if ($role ne 'cc') { + if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') { + @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}}; + } + } + if ($role eq 'st') { + if (@usecs > 1) { + my $firstsec = $usecs[0]; + @usecs = ($firstsec); + } + } + if (@usecs == 0) { + push(@usecs,''); + } + foreach my $usec (@usecs) { + my (%userroles,%newrole,%newgroups,$spec,$area); + my $area = '/'.$dom.'/'.$cnum; + my $spec = $role.'.'.$area; + if ($usec ne '') { + $spec .= '/'.$usec; + $area .= '/'.$usec; + } + if ($role =~ /^cr\//) { + &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom, + $cnum,$spec,$area); + } else { + &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom, + $spec,$cnum,$area); + } + &Apache::lonnet::set_userprivs(\%userroles,\%newrole, + \%newgroups); + $userroles{'user.role.'.$spec} = $start.'.'.$end; + &Apache::lonnet::appenv(\%userroles,[$role,'cm']); + if (($end == 0) || ($end > $now)) { + my $showrole = $role; + if ($role =~ /^cr\//) { + $showrole = &Apache::lonnet::plaintext($role,$crstype); + } elsif (ref($longroles) eq 'HASH') { + if ($longroles->{$role} ne '') { + $showrole = $longroles->{$role}; + } + } + if ($start <= $now) { + $active .= '
  • '.$showrole; + if ($usec ne '') { + $active .= ' - '.&mt('section:').' '.$usec; + } + $active .= '
    • '; + $numactive ++; + } else { + $future .= '
  • '.$showrole; + if ($usec ne '') { + $future .= ' - '.&mt('section:').' '.$usec; + } + $future .= '
    • '; + $numfuture ++; + } + } + } + } + } + } + } + if ($active) { + if ($numactive == 1) { + $output = &mt('Use the following link to enter the course:'); + } else { + $output = &mt('Use the following links to your new roles to enter the course:'); + } + $output .= '
      '.$active.'

    '; + } + if ($future) { + $output .= &mt('The following course [quant,_1,role] will become available for selection from your [_2]roles page[_3], once the default student access start date - [_4] - has been reached:',$numfuture,'','',&Apache::lonlocal::locallocaltime($details->{'accessstart'})). + '
      '.$future.'
    '; + } return $output; } @@ -2315,11 +2869,14 @@ sub check_autolimit { } sub retrieve_settings { - my ($dom,$cnum) = @_; - my ($result,%reqinfo) = &get_request_settings($dom,$cnum); + my ($dom,$cnum,$udom,$uname) = @_; + if ($udom eq '' || $uname eq '') { + $udom = $env{'user.domain'}; + $uname = $env{'user.name'}; + } + my ($result,%reqinfo) = &get_request_settings($dom,$cnum,$udom,$uname); if ($result eq 'ok') { - if (($env{'user.name'} eq $reqinfo{'owner'}) && - ($env{'user.domain'} eq $reqinfo{'domain'})) { + if (($udom eq $reqinfo{'domain'}) && ($uname eq $reqinfo{'owner'})) { $env{'form.chome'} = $reqinfo{'coursehome'}; $env{'form.cdescr'} = $reqinfo{'cdescr'}; $env{'form.crstype'} = $reqinfo{'crstype'}; @@ -2342,17 +2899,18 @@ sub retrieve_settings { $env{'form.autoadds'} = $reqinfo{'autoadds'}; $env{'form.autdrops'} = $reqinfo{'autodrops'}; $env{'form.instcode'} = $reqinfo{'instcode'}; - my %crscode = ( - instcode => $reqinfo{'instcode'}, - ); - &extract_instcode($dom,'instcode',\%crscode); + my $crscode = { + $cnum => $reqinfo{'instcode'}, + }; + &extract_instcode($dom,'instcode',$crscode,$cnum); } my @currsec; if (ref($reqinfo{'sections'}) eq 'HASH') { foreach my $i (sort(keys(%{$reqinfo{'sections'}}))) { if (ref($reqinfo{'sections'}{$i}) eq 'HASH') { - my $sec = $reqinfo{'sections'}{$i}{'inst'};; + my $sec = $reqinfo{'sections'}{$i}{'inst'}; $env{'form.secnum_'.$i} = $sec; + $env{'form.sec_'.$i} = '1'; if (!grep(/^\Q$sec\E$/,@currsec)) { push(@currsec,$sec); } @@ -2360,15 +2918,19 @@ sub retrieve_settings { } } } - if (ref($reqinfo{'crosslistings'}) eq 'HASH') { - foreach my $i (sort(keys(%{$reqinfo{'crosslistings'}}))) { - if (ref($reqinfo{'crosslistings'}{$i}) eq 'HASH') { - $env{'form.crosslist_'.$i.'_lcsec'} = $reqinfo{'crosslistings'}{$i}{'loncapa'}; - my $xlistsec = $reqinfo{'crosslistings'}{$i}{'instsec'}; - my %crscode = ( - $i => $reqinfo{'crosslistings'}{$i}{'instcode'}, - ); - &extract_instcode($dom,'crosslist',\%crscode,$i,$xlistsec); + if (ref($reqinfo{'crosslists'}) eq 'HASH') { + foreach my $i (sort(keys(%{$reqinfo{'crosslists'}}))) { + if (ref($reqinfo{'crosslists'}{$i}) eq 'HASH') { + $env{'form.crosslist_'.$i} = '1'; + $env{'form.crosslist_'.$i.'_instsec'} = $reqinfo{'crosslists'}{$i}{'instsec'}; + $env{'form.crosslist_'.$i.'_lcsec'} = $reqinfo{'crosslists'}{$i}{'loncapa'}; + if ($reqinfo{'crosslists'}{$i}{'instcode'} ne '') { + my $key = $cnum.$i; + my $crscode = { + $key => $reqinfo{'crosslists'}{$i}{'instcode'}, + }; + &extract_instcode($dom,'crosslist',$crscode,$key,$i); + } } } } @@ -2416,12 +2978,11 @@ sub retrieve_settings { } sub get_request_settings { - my ($dom,$cnum) = @_; + my ($dom,$cnum,$udom,$uname) = @_; my $requestkey = $dom.'_'.$cnum; my ($result,%reqinfo); if ($requestkey =~ /^($match_domain)_($match_courseid)$/) { - my %history = &Apache::lonnet::restore($requestkey,'courserequests', - $env{'user.domain'},$env{'user.name'}); + my %history = &Apache::lonnet::restore($requestkey,'courserequests',$udom,$uname); my $disposition = $history{'disposition'}; if (($disposition eq 'approval') || ($disposition eq 'pending')) { if (ref($history{'details'}) eq 'HASH') { @@ -2440,26 +3001,19 @@ sub get_request_settings { } sub extract_instcode { - my ($cdom,$element,$crscodehashref,$counter,$xlistsec) = @_; + my ($cdom,$element,$crscode,$crskey,$counter) = @_; my (%codes,@codetitles,%cat_titles,%cat_order); - if (ref($crscodehashref) eq 'HASH') { - if (&Apache::lonnet::auto_instcode_format('requests',$cdom,$crscodehashref, - \%codes,\@codetitles,\%cat_titles,\%cat_order) eq 'ok') { + if (&Apache::lonnet::auto_instcode_format('requests',$cdom,$crscode,\%codes, + \@codetitles,\%cat_titles, + \%cat_order) eq 'ok') { + if (ref($codes{$crskey}) eq 'HASH') { if (@codetitles > 0) { my $sel = $element; if ($element eq 'crosslist') { $sel .= '_'.$counter; } - my $lastitem = pop(@codetitles); foreach my $title (@codetitles) { - if (ref($cat_order{$title}) eq 'ARRAY') { - if (@{$cat_order{$title}} > 0) { - $env{'form.'.$sel.'_'.$title} = $cat_order{$title}[0]; - } - } - } - if ($element eq 'crosslist') { - $env{'form.'.$sel.'_'.$lastitem} = $xlistsec; + $env{'form.'.$sel.'_'.$title} = $codes{$crskey}{$title}; } } }