--- loncom/interface/lonrequestcourse.pm 2009/08/12 14:39:23 1.12 +++ loncom/interface/lonrequestcourse.pm 2009/08/17 04:39:15 1.15 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.12 2009/08/12 14:39:23 raeburn Exp $ +# $Id: lonrequestcourse.pm,v 1.15 2009/08/17 04:39:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -276,30 +276,33 @@ sub form_elements { }, courseinfo => { cdescr => 'text', - clonecourse => 'text', - clonedomain => 'selectbox', + clonecrs => 'text', + clonedom => 'selectbox', datemode => 'radio', dateshift => 'text', }, enrollment => { - startaccess_month => 'selectbox', - startaccess_hour => 'selectbox', - endaccess_month => 'selectbox', - endaccess_hour => 'selectbox', - startaccess_day => 'text', - startaccess_year => 'text', - startaccess_minute => 'text', - startaccess_second => 'text', - endaccess_day => 'text', - endaccess_year => 'text', - endaccess_minute => 'text', - endaccess_second => 'text', + accessstart_month => 'selectbox', + accessstart_hour => 'selectbox', + accessend_month => 'selectbox', + accessend_hour => 'selectbox', + accessstart_day => 'text', + accessstart_year => 'text', + accessstart_minute => 'text', + accessstart_second => 'text', + accessend_day => 'text', + accessend_year => 'text', + accessend_minute => 'text', + accessend_second => 'text', no_end_date => 'checkbox', }, personnel => { persontotal => 'hidden', addperson => 'checkbox', }, + review => { + cnum => 'hidden', + }, }, view => { crstype => { @@ -308,6 +311,13 @@ sub form_elements { }, }, ); + my %servers = &Apache::lonnet::get_servers($dom,'library'); + my $numlib = keys(%servers); + if ($numlib > 1) { + $elements{'new'}{'courseinfo'}{'chome'} = 'selectbox'; + } else { + $elements{'new'}{'courseinfo'}{'chome'} = 'hidden'; + } my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem); &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); @@ -324,18 +334,18 @@ sub form_elements { if (&Apache::lonnet::auto_run('',$dom)) { my %extras = ( sectotal => 'hidden', - startenroll_month => 'selectbox', - startenroll_hour => 'selectbox', - endenroll_month => 'selectbox', - endenroll_hour => 'selectbox', - startenroll_day => 'text', - startenroll_year => 'text', - startenroll_minute => 'text', - startenroll_second => 'text', - endenroll_day => 'text', - endenroll_year => 'text', - endenroll_minute => 'text', - endenroll_second => 'text', + enrollstart_month => 'selectbox', + enrollstart_hour => 'selectbox', + enrollend_month => 'selectbox', + enrollend_hour => 'selectbox', + enrollstart_day => 'text', + enrollstart_year => 'text', + enrollstart_minute => 'text', + enrollstart_second => 'text', + enrollend_day => 'text', + enrollend_year => 'text', + enrollend_minute => 'text', + enrollend_second => 'text', crosslisttotal => 'hidden', addcrosslist => 'checkbox', autoadds => 'radio', @@ -376,16 +386,15 @@ sub form_elements { $persontotal = 1; } for (my $i=0; $i<$persontotal; $i++) { - $people{'person_'.$i.'_uname'} = 'text', - $people{'person_'.$i.'_dom'} = 'selectbox', - $people{'person_'.$i.'_hidedom'} = 'hidden', - $people{'person_'.$i.'_first'} = 'text', - $people{'person_'.$i.'_last'} = 'text', - $people{'person_'.$i.'_email'} = 'text', - $people{'person_'.$i.'_role'} = 'selectbox', - $people{'person_'.$i.'_sec'} = 'selectbox', - $people{'person_'.$i.'_newsec'} = 'text', - $people{'person_'.$i.'_sections'} = 'hidden', + $people{'person_'.$i.'_uname'} = 'text', + $people{'person_'.$i.'_dom'} = 'selectbox', + $people{'person_'.$i.'_hidedom'} = 'hidden', + $people{'person_'.$i.'_firstname'} = 'text', + $people{'person_'.$i.'_lastname'} = 'text', + $people{'person_'.$i.'_emailaddr'} = 'text', + $people{'person_'.$i.'_role'} = 'selectbox', + $people{'person_'.$i.'_sec'} = 'selectbox', + $people{'person_'.$i.'_newsec'} = 'text', } my %personnelhash = (%{$elements{'new'}{'personnel'}},%people); %{$elements{'new'}{'personnel'}} = %personnelhash; @@ -543,7 +552,8 @@ END my $formname = 'requestcrs'; my $nexttext = &mt('Next'); - $r->print('
'. + $r->print( + '
'. &Apache::lonhtmlcommon::start_pick_box(). &Apache::lonhtmlcommon::row_title('Action').' @@ -679,13 +689,13 @@ sub print_request_form { $r->print('
'.&Apache::lonhtmlcommon::start_pick_box().$codepicker. &Apache::lonhtmlcommon::end_pick_box().'
'); } else { - $r->print(&courseinfo_form($dom,$formname,$crstype)); + $r->print(&courseinfo_form($dom,$formname,$crstype,$next)); } } else { - $r->print(&courseinfo_form($dom,$formname,$crstype)); + $r->print(&courseinfo_form($dom,$formname,$crstype,$next)); } } elsif ($prev eq 'codepick') { - $r->print(&courseinfo_form($dom,$formname,$crstype)); + $r->print(&courseinfo_form($dom,$formname,$crstype,$next)); } elsif ($state eq 'enrollment') { if ($crstype eq 'official') { &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, @@ -707,6 +717,7 @@ sub print_request_form { \%cat_order,\@code_order); } my $result = &print_request_outcome($dom,\@codetitles,\@code_order); + $r->print($result); } my @excluded = ('counter'); my %elements = &form_elements($dom); @@ -732,7 +743,7 @@ sub print_request_form { push(@excluded,'instcode'); } $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).''); - &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'}); + &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state); return; } @@ -844,13 +855,13 @@ sub inst_section_selector { } sub date_setting_table { - my ($starttime,$endtime,$formname,$suffix,%datetitles) = @_; + my ($starttime,$endtime,$formname,$prefix,%datetitles) = @_; my ($perpetual,$table); - my $startform = &Apache::lonhtmlcommon::date_setter($formname,'start'.$suffix, + my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start', $starttime,'','','',1,'','','',1); - my $endform = &Apache::lonhtmlcommon::date_setter($formname,'end'.$suffix, + my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end', $endtime,'','','',1,'','','',1); - if ($suffix eq 'access') { + if ($prefix eq 'access') { $perpetual = ' '; @@ -875,7 +886,7 @@ sub print_personnel_menu { $persontotal ++; } my $userlinktxt = &mt('Set User'); - my @items = ('uname','dom','last','first','email','hidedom'); + my @items = ('uname','dom','lastname','firstname','emailaddr','hidedom'); my $roleoptions; my @roles = &Apache::lonuserutils::roles_by_context('course'); @@ -954,18 +965,16 @@ sub print_personnel_menu { $existmult.'>'."\n".$existops.''.(' ' x3); } $sectionselector .= $newtitle. - ''. - ''."\n"; - + ''."\n"; $output .= &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel').'
'. ''.$userlink. ''). ''."\n". ''."\n". - ''."\n". - ''."\n". - ''."\n". + ''."\n". + ''."\n". + ''."\n". ''."\n". ''.&mt('Section(s)').'
'.$sectionselector.''."\n". '
'.&mt('Username').'
'.$uname_form.'		'.&mt('Domain').'
'.$udom_form.'
'.&mt('First Name').'
'.$form_elems{'first'}.'		'.&mt('Last Name').'
'.$form_elems{'last'}.'		'.&mt('E-mail').'
'.$form_elems{email}.'
'.&mt('First Name').'
'.$form_elems{'firstname'}.'		'.&mt('Last Name').'
'.$form_elems{'lastname'}.'		'.&mt('E-mail').'
'.$form_elems{'emailaddr'}.'
'.&mt('Role').'
'.$roleselector.'
'.&Apache::lonhtmlcommon::row_closure(); @@ -981,40 +990,56 @@ sub print_personnel_menu { sub print_request_status { my ($dom) = @_; - my %requests = &Apache::lonnet::dumpstore('courserequests',$env{'user.domain'}, - $env{'user.name'}); - my ($output,$formname,%queue_by_date); - foreach my $key (keys(%requests)) { - if (ref($requests{$key}) eq 'HASH') { - my ($cdom,$cnum) = split('_',$key); - next if ($cdom ne $dom); - my $entry; - my $timestamp = $requests{$key}{'timestamp'}; - my $crstype = $requests{$key}{'crstype'}; - my $status = $requests{$key}{'status'}; - next unless (($env{'form.crstype'} eq 'all') || - ($env{'form.crstype'} eq $crstype)); - next unless (($status eq 'approval') || ($status eq 'pending')); - if (ref($requests{$key}{'details'}) eq 'HASH') { - $entry = $key.':'.$crstype.':'.$requests{$key}{'details'}{'cdesc'}; - if ($crstype eq 'official') { - $entry .= ':'.$requests{$key}{'details'}{'instcode'}; - } - } - if ($entry ne '') { - if (exists($queue_by_date{$timestamp})) { - if (ref($queue_by_date{$timestamp}) eq 'ARRAY') { - push(@{$queue_by_date{$timestamp}},$entry); + my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'}, + $env{'user.name'},'^status:'.$dom); + my ($output,$formname,%queue_by_date,%typenames); + if ($env{'form.crstype'} eq 'any') { + %typenames = &Apache::lonlocal::texthash ( + official => 'Official course', + unofficial => 'Unofficial course', + community => 'Community', + ); + } + foreach my $key (keys(%statusinfo)) { + if (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')) { + (undef,my($cdom,$cnum)) = split(':',$key); + next if ($cdom ne $dom); + my $requestkey = $cdom.'_'.$cnum; + if ($requestkey =~ /^($match_domain)_($match_courseid)$/) { + my %history = &Apache::lonnet::restore($requestkey,'courserequests', + $env{'user.domain'},$env{'user.name'}); + my $entry; + my $timestamp = $history{'reqtime'}; + my $crstype = $history{'crstype'}; + my $disposition = $history{'disposition'}; + next if ((exists($history{'status'})) && ($history{'status'} eq 'created')); + next unless (($env{'form.crstype'} eq 'any') || + ($env{'form.crstype'} eq $crstype)); + next unless (($disposition eq 'approval') || + ($disposition eq 'pending')); + if (ref($history{'details'}) eq 'HASH') { + $entry = $requestkey.':'.$crstype.':'. + &escape($history{'details'}{'cdescr'}); + if ($crstype eq 'official') { + $entry .= ':'.&escape($history{'details'}{'instcode'}); + } + } + if ($entry ne '') { + if (exists($queue_by_date{$timestamp})) { + if (ref($queue_by_date{$timestamp}) eq 'ARRAY') { + push(@{$queue_by_date{$timestamp}},$entry); + } + } else { + @{$queue_by_date{$timestamp}} = ($entry); } - } else { - @{$queue_by_date{$timestamp}} = ($entry); } } } } $formname = 'requestcrs'; my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date)); - $output = '
'."\n". + $output = '

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

'."\n". + ''."\n". ''."\n". ''."\n". ''."\n"; @@ -1022,11 +1047,12 @@ sub print_request_status { $output .= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). ''.&mt('Action').''. - ''.&mt('Description').''; - if ($env{'form.crstype'} eq 'all') { + ''.&mt('Course Description').''. + ''.&mt('Domain').''; + if ($env{'form.crstype'} eq 'any') { $output .= ''.&mt('Type').''; } - if (($env{'form.crstype'} eq 'all') || ($env{'form.crstype'} eq 'official')) { + if (($env{'form.crstype'} eq 'any') || ($env{'form.crstype'} eq 'official')) { $output .= ''.&mt('Institutional Code').''; } $output .= ''.&mt('Date requested').''. @@ -1040,13 +1066,24 @@ sub print_request_status { my ($cdom,$cnum) = split('_',$key); $output .= &Apache::loncommon::start_data_table_row(). ''. - ''.$desc.''; - if ($env{'form.crstype'} eq 'all') { - $output .= ''.&course_types($type).''; + ''.&unescape($desc).''. + ''.$cdom.''; + if ($env{'form.crstype'} eq 'any') { + my $typename = $typenames{$type}; + if ($typename eq '') { + $typename = &mt('Unknown type'); + } + $output .= ''.$typename.''; } - if (($env{'form.crstype'} eq 'all') || + if (($env{'form.crstype'} eq 'any') || ($env{'form.crstype'} eq 'official')) { - $output .= ''.$instcode.''; + my $showinstcode; + if ($type eq 'official') { + $showinstcode = &unescape($instcode); + } else { + $showinstcode = &mt('Not applicable'); + } + $output .= ''.$showinstcode.''; } $output .= ''.$showtime.''. &Apache::loncommon::end_data_table_row(); @@ -1058,8 +1095,8 @@ 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; } @@ -1116,12 +1153,12 @@ sub print_review { $section_headers = ''.&mt('Sections').''. ''.&mt('Crosslistings').''; - my ($startenroll,$endenroll) = &dates_from_form('startenroll','endenroll'); + my ($enrollstart,$enrollend) = &dates_from_form('enrollstart','enrollend'); my @autoroster = (&mt('No'),&mt('Yes')); $enroll_values = ''.$autoroster[$env{'form.autoadds'}].''. ''.$autoroster[$env{'form.autodrops'}].''. - ''.&Apache::lonlocal::locallocaltime($startenroll).''. - ''.&Apache::lonlocal::locallocaltime($endenroll).''; + ''.&Apache::lonlocal::locallocaltime($enrollstart).''. + ''.&Apache::lonlocal::locallocaltime($enrollend).''; $section_values = ''. ''; @@ -1177,46 +1214,48 @@ sub print_review { my %ctxt = &clone_text(); $inst_headers .= ''; - if (($env{'form.clonecourse'} =~ /^$match_name$/) && - ($env{'form.clonedomain'} =~ /^$match_domain$/)) { - my %coursehash = - &Apache::lonnet::courseiddump($env{'form.clonedomain'},'.',1,'.','.', - $env{'form.clonecourse'},undef,undef,'.'); - my $cloneid = $env{'form.clonedomain'}.'_'.$env{'form.clonecourse'}; - if (ref($coursehash{$cloneid}) eq 'HASH') { - $inst_headers .= ''; - my $clonedesc = $coursehash{$cloneid}{'description'}; - my $cloneinst = $coursehash{$cloneid}{'inst_code'}; - - $inst_values .= ''; - } else { - $inst_values .= ''; - } + if (($env{'form.clonecrs'} =~ /^$match_name$/) && + ($env{'form.clonedom'} =~ /^$match_domain$/)) { + my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'}, + $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'}); + if ($canclone) { + my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'}, + $env{'form.clonecrs'},('description','internal.coursecode')); + if (keys(%courseenv) > 0) { + $inst_headers .= ''; + $inst_values .= ''; + } else { + $inst_values .= ''; + } + } else { + $inst_values .= ''; + } } else { $inst_values .= ''; } $enroll_headers .= ''. ''; - my ($startaccess,$endaccess) = &dates_from_form('startaccess','endaccess'); - $enroll_values .= ''; - if ($endaccess == 0) { + my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend'); + $enroll_values .= ''; + if ($accessend == 0) { $enroll_values .= ''; } else { - $enroll_values .= ''; + $enroll_values .= ''; } my $container = 'Course'; @@ -1232,14 +1271,32 @@ sub print_review { ''; for (my $i=0; $i<$env{'form.persontotal'}; $i++) { if ($env{'form.person_'.$i.'_uname'} ne '') { + my @allsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec'); + my $newsec = $env{'form.person_'.$i.'_newsec'}; + $newsec =~ s/^\s+//; + $newsec =~s/\s+$//; + my @newsecs = split(/[\s,;]+/,$newsec); + foreach my $sec (@newsecs) { + next if ($sec =~ /\W/); + next if ($newsec eq 'none'); + if ($sec ne '') { + unless (grep(/^\Q$sec\E$/,@allsecs)) { + push(@allsecs,$sec); + } + } + } + my $showsec = 'None'; + if (@allsecs) { + $showsec = join(', ',@allsecs); + } $personnel_values .= - ''. + ''. ''. ''. - ''; + ''; } } my $output = '

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

'. @@ -1282,7 +1339,7 @@ sub dates_from_form { my ($startname,$endname) = @_; my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname); my $enddate = &Apache::lonhtmlcommon::get_date_from_form($endname); - if ($endname eq 'endaccess') { + if ($endname eq 'accessend') { if (exists($env{'form.no_end_date'}) ) { $enddate = 0; } @@ -1291,13 +1348,39 @@ sub dates_from_form { } sub courseinfo_form { - my ($dom,$formname,$crstype) = @_; - my $output = '
'.&Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title('Course Description'). - ''. - &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::end_pick_box().'
'. - '
'.&clone_form($dom,$formname,$crstype).'
'."\n"; + my ($dom,$formname,$crstype,$next) = @_; + my $nodescr = &mt('You must provide a (brief) course description.'); + my $js_validate = <<"ENDJS"; + + +ENDJS + + my $output .= $js_validate."\n".'
'.&Apache::lonhtmlcommon::start_pick_box(). + &Apache::lonhtmlcommon::row_title('Course Description'). + ''; + my ($home_server_pick,$numlib) = + &Apache::loncommon::home_server_form_item($dom,'chome', + 'default','hide'); + if ($numlib > 1) { + $output .= &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title( + &mt('Home Server for Course')); + } + $output .= $home_server_pick. + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::end_pick_box().'
'. + '
'.&clone_form($dom,$formname,$crstype).'
'."\n"; return $output; } @@ -1307,14 +1390,14 @@ sub clone_form { if ($crstype eq 'community') { $type = 'Community'; } - my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedomain'). - &Apache::loncommon::selectcourse_link($formname,'clonecourse','clonedomain','','','',$type); + my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom'). + &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(). @@ -1446,7 +1529,7 @@ sub get_course_dom { } sub display_navbuttons { - my ($r,$formname,$prev,$prevtext,$next,$nexttext) = @_; + my ($r,$formname,$prev,$prevtext,$next,$nexttext,$state) = @_; $r->print('
'); if ($prev) { $r->print(' @@ -1459,7 +1542,10 @@ sub display_navbuttons { onclick="javascript:history.back()"/>    '); } - if ($next) { + if ($state eq 'courseinfo') { + $r->print(' + '); + } elsif ($next) { $r->print(' '); @@ -1469,7 +1555,7 @@ sub display_navbuttons { sub print_request_outcome { my ($dom,$codetitles,$code_order) = @_; - my ($output,$cnum,$now,$req_notifylist,$crstype,$startenroll,$endenroll, + my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend, %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,); $cnum = $env{'form.cnum'}; unless ($cnum =~ /^$match_courseid$/) { @@ -1487,12 +1573,13 @@ sub print_request_outcome { $crstype = $env{'form.crstype'}; if ($crstype eq 'official') { if (&Apache::lonnet::auto_run('',$dom)) { - ($startenroll,$endenroll)=&dates_from_form('startenroll','endenroll'); + ($enrollstart,$enrollend)=&dates_from_form('enrollstart','enrollend'); } for (my $i=0; $i<$env{'form.sectotal'}; $i++) { if ($env{'form.sec_'.$i}) { if ($env{'form.secnum_'.$i} ne '') { - $sections{$env{'form.secnum_'.$i}} = $env{'form.loncapasec_'.$i}; + $sections{$i}{'inst'} = $env{'form.secnum_'.$i}; + $sections{$i}{'loncapa'} = $env{'form.loncapasec_'.$i}; } } } @@ -1507,23 +1594,56 @@ sub print_request_outcome { } } $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'}; - $crosslistings{$xlistinfo} = $env{'form.crosslist_'.$i.'_lcsec'}; + $crosslistings{$i}{'inst'} = $xlistinfo; + $crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'}; } } + } else { + $enrollstart = ''; + $enrollend = ''; } - for (my $i=0; $i<$env{'form.persontotal'}; $i++) { my $uname = $env{'form.person_'.$i.'_uname'}; my $udom = $env{'form.person_'.$i.'_uname'}; if (($uname =~ /^$match_username$/) && ($udom =~ /^$match_domain$/)) { if (&Apache::lonnet::domain($udom) ne '') { - $personnel{$uname.':'.$udom} = { - first => $env{'form.person_'.$i.'_first'}, - last => $env{'form.person_'.$i.'_last'}, - email => $env{'form.person_'.$i.'_email'}, - role => $env{'form.person_'.$i.'_role'}, - sections => $env{'form.person_'.$i.'_sections'}, - }; + unless (ref($personnel{$uname.':'.$udom}) eq 'HASH') { + $personnel{$uname.':'.$udom} = { + firstname => $env{'form.person_'.$i.'_firstname'}, + lastname => $env{'form.person_'.$i.'_lastname'}, + emailaddr => $env{'form.person_'.$i.'_emailaddr'}, + }; + } + my $role = $env{'form.person_'.$i.'_role'}; + unless ($role eq '') { + if (ref(@{$personnel{$uname.':'.$udom}{'roles'}}) eq 'ARRAY') { + my @curr_roles = @{$personnel{$uname.':'.$udom}{'roles'}}; + unless (grep(/^\Q$role\E$/,@curr_roles)) { + push(@{$personnel{$uname.':'.$udom}{'roles'}},$role); + } + } else { + @{$personnel{$uname.':'.$udom}{'roles'}} = ($role); + } + if ($role eq 'cc') { + @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = (); + } else { + my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec'); + my $newsec = $env{'form.person_'.$i.'_newsec'}; + $newsec =~ s/^\s+//; + $newsec =~s/\s+$//; + my @newsecs = split(/[\s,;]+/,$newsec); + foreach my $sec (@newsecs) { + next if ($sec =~ /\W/); + next if ($newsec eq 'none'); + if ($sec ne '') { + unless (grep(/^\Q$sec\E$/,@currsec)) { + push(@currsec,$sec); + } + } + } + @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @currsec; + } + } } else { push(@missingdom,$uname.':'.$udom); } @@ -1531,30 +1651,67 @@ sub print_request_outcome { push(@baduname,$uname.':'.$udom); } } - - my ($startaccess,$endaccess) = &dates_from_form('startaccess','endacess'); + my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend'); + my $autodrops = 0; + if ($env{'form.autodrops'}) { + $autodrops = $env{'form.autodrops'}; + } + my $autoadds = 0; + 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'}; + } + my $clonecrs = ''; + my $clonedom = ''; + if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) && + ($env{'form.clonedom'} =~ /^($match_domain)$/)) { + my $clonehome = &Apache::lonnet::homeserver($env{'form.clonedom'},$env{'form.clonecrs'}); + if ($clonehome ne 'no_host') { + my $canclone = &can_clone_course($env{'user.name'},$env{'user.domain'}, + $env{'form.clonecrs'}, $env{'form.clonedom'}); + if ($canclone) { + $clonecrs = $env{'form.clonecrs'}; + $clonedom = $env{'form.clonedom'}; + } + } + } my $details = { owner => $env{'user.name'}, domain => $env{'user.domain'}, cdom => $dom, cnum => $cnum, - cdesc => $env{'form.cdesc'}, + coursehome => $env{'form.chome'}, + cdescr => $env{'form.cdescr'}, crstype => $env{'form.crstype'}, - instcode => $env{'form.instcode'}, - clonedomain => $env{'form.clonedomain'}, - clonecourse => $env{'form.clonecourse'}, + instcode => $instcode, + clonedom => $clonedom, + clonecrs => $clonecrs, datemode => $env{'form.datemode'}, - dateshift => $env{'form.datshift'}, - sectotal => $env{'form.sectotal'}, + dateshift => $env{'form.dateshift'}, + sectotal => $sectotal, sections => \%sections, - crosslisttotal => $env{'form.crosslisttotal'}, - crosslistings => \%crosslistings, - autoadds => $env{'form.autoadds'}, - autodrops => $env{'form.autodrops'}, - startenroll => $startenroll, - endenroll => $endenroll, - startaccess => $startaccess, - endaccess => $endaccess, + crosslisttotal => $crosslisttotal, + crosslists => \%crosslistings, + autoadds => $autoadds, + autodrops => $autodrops, + enrollstart => $enrollstart, + enrollend => $enrollend, + accessstart => $accessstart, + accessend => $accessend, personnel => \%personnel, }; my @inststatuses; @@ -1570,9 +1727,9 @@ sub print_request_outcome { $output = &mt('Unrecognized course type: [_1]',$crstype); } } else { - my ($disposition,$message); + my ($disposition,$message,$reqstatus); my %reqhash = ( - timestamp => $now, + reqtime => $now, crstype => $crstype, details => $details, ); @@ -1590,30 +1747,39 @@ sub print_request_outcome { } else { $disposition = 'approval'; } - $reqhash{'status'} = $disposition; + $reqhash{'disposition'} = $disposition; + $reqstatus = $disposition; if ($disposition eq 'rejected') { $output = &mt('Your course request was rejected.'); if ($message) { $output .= '
'.$message.'
'; } } elsif ($disposition eq 'process') { + my %domdefs = &Apache::lonnet::get_domain_defaults($dom); + my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles); + my @roles = &Apache::lonuserutils::roles_by_context('course'); my $type = 'Course'; if ($crstype eq 'community') { $type = 'Community'; } - my ($logmsg,$newusermsg,$addresult,$enrollcount,$output,$keysmsg,%longroles); - my @roles = &Apache::lonuserutils::roles_by_context('course'); foreach my $role (@roles) { $longroles{$role}=&Apache::lonnet::plaintext($role,$type); } - my %reqdetails = &build_batchcreatehash($details); - my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'request',\%reqdetails,\%longroles,\$logmsg,\$newusermsg,\$addresult,\$enrollcount,\$output,\$keysmsg,$env{'user.domain'},$env{'user.name'},$cnum); - $disposition = 'created'; - if ($cid eq $cnum) { + my $result = &Apache::loncoursequeueadmin::course_creation($dom,$cnum, + 'autocreate',$details,\$logmsg,\$newusermsg,\$addresult, + \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles); + if ($result eq 'created') { $disposition = '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.'); + $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.'); } 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.'); + $output = ''. + &mt('An error occurred when processing your course request.'). + '
'. + &mt('You may want to review the request details and submit the request again.'). + ''; } } else { my $requestid = $cnum.'_'.$disposition; @@ -1623,7 +1789,7 @@ sub print_request_outcome { crstype => $crstype, ownername => $env{'user.name'}, ownerdom => $env{'user.domain'}, - description => $env{'form.cdesc'}, + description => $env{'form.cdescr'}, }, }; my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request, @@ -1639,16 +1805,16 @@ sub print_request_outcome { } $output = &mt('Your course request has been recorded.').'
'; if ($disposition eq 'approval') { - $output .= &mt('Your course request has been recorded.').'
'. - &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').'
'. - &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'
'; + $output .= &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').'
'. + &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'
'; if ($address ne '') { $output.= &mt('An e-mail will also be sent to: [_1] when this occurs.',$address).'
'; } if ($req_notifylist) { my $fullname = &Apache::loncommon::plainname($env{'user.name'}, $env{'user.domain'}); - &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,$fullname,$now,$dom,$details); + my $sender = $env{'user.name'}.':'.$env{'user.domain'}; + &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,"$fullname ($env{'user.name'}:$env{'user.domain'})",$cnum,$env{'form.cdescr'},$now,'coursereq',$sender); } } else { $output .= '
'. @@ -1658,23 +1824,32 @@ sub print_request_outcome { '
'; } } else { - $reqhash{'status'} = 'domainerror'; + $reqstatus = 'domainerror'; $reqhash{'disposition'} = $disposition; my $warning = &mt('An error occurred saving your request in the pending requests queue.'); $output = ''.$warning.'
'; } } - my $storeresult; + my ($storeresult,$statusresult); if ($requestkey =~ /^($match_domain)_($match_courseid)$/) { $storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey, 'courserequests'); + if ($storeresult eq 'ok') { + my %status = ( + 'status:'.$dom.':'.$cnum => $reqstatus, + ); + $statusresult = &Apache::lonnet::put('courserequests',\%status); + } } else { $storeresult = 'error: invalid requestkey format'; } if ($storeresult ne 'ok') { - $output .= ''.&mt('An error occurred saving a record of the details of your request.').'
'; - &logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult"); + $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).'
'; + &Apache::lonnet::logthis("Error saving course request status for $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult"); } } return $output; @@ -1704,7 +1879,7 @@ sub get_processtype { if ($userenv{'inststatus'} ne '') { @{$inststatuses} = split(',',$userenv{'inststatus'}); } else { - @{$inststatuses} = ('other'); + @{$inststatuses} = ('default'); } foreach my $status (@{$inststatuses}) { if (exists($settings{$crstype}{$status})) { @@ -1722,6 +1897,7 @@ sub get_processtype { } } my $maxlimit = 0; + foreach my $key (sort(keys(%alltasks))) { if ($key =~ /^autolimit=(\d*)$/) { if ($1 eq '') { @@ -1795,30 +1971,21 @@ sub check_autolimit { return; } -sub build_batchcreatehash { - my ($details) = @_; - my %batchhash; - if (ref($details) eq 'HASH') { - - } - return %batchhash; -} - sub retrieve_settings { my ($dom,$request_id) = @_; my %reqinfo = &get_request_settings($request_id,$dom); my %stored; $stored{'cdescr'} = &unescape($reqinfo{'description'}); - $stored{'startaccess'} = $reqinfo{'startaccess'}; - $stored{'endaccess'} = $reqinfo{'endaccess'}; - if ($stored{'endaccess'} == 0) { + $stored{'accessstart'} = $reqinfo{'accessstart'}; + $stored{'accessend'} = $reqinfo{'accessend'}; + if ($stored{'accessend'} == 0) { $stored{'no_end_date'} = 1; } - $stored{'startenroll'} = $reqinfo{'startenroll'}; - $stored{'endenroll'} = $reqinfo{'endenroll'}; + $stored{'enrollstart'} = $reqinfo{'enrollstart'}; + $stored{'enrollend'} = $reqinfo{'enrollend'}; $stored{'crosslist'} = $reqinfo{'crosslist'}; - $stored{'clonecourse'} = $reqinfo{'clonecourse'}; - $stored{'clonedomain'} = $reqinfo{'clonedomain'}; + $stored{'clonecrs'} = $reqinfo{'clonecrs'}; + $stored{'clonedom'} = $reqinfo{'clonedom'}; $stored{'sections'} = $reqinfo{'sections'}; $stored{'personnel'} = $reqinfo{'personnel'};
'. &mt('Institutional section').''.&mt('LON-CAPA section').'
'.&mt('Clone From').''.$ctxt{'dsh'}.''.$clonedesc.' '; - if ($cloneinst ne '') { - $inst_values .= &mt('([_1] in [_2])',$cloneinst,$env{'form.clonedomain'}); - } else { - $inst_values .= &mt('(from [_1])',$env{'form.clonedomain'}); - } - $inst_values .= ''; - if ($env{'form.datemode'} eq 'preserve') { - $inst_values .= $ctxt{'pcd'}; - } elsif ($env{'form.datemode'} eq 'shift') { - $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'}); - } else { - $inst_values .= $ctxt{'ncd'}; - } - $inst_values .= ''.&mt('Unknown').''.$ctxt{'dsh'}.''.$courseenv{'description'}.' '; + my $cloneinst = $courseenv{'internal.coursecode'}; + if ($cloneinst ne '') { + $inst_values .= &mt('([_1] in [_2])',$cloneinst,$env{'form.clonedom'}); + } else { + $inst_values .= &mt('(from [_1])',$env{'form.clonedom'}); + } + $inst_values .= ''; + if ($env{'form.datemode'} eq 'preserve') { + $inst_values .= $ctxt{'pcd'}; + } elsif ($env{'form.datemode'} eq 'shift') { + $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'}); + } else { + $inst_values .= $ctxt{'ncd'}; + } + $inst_values .= ''.&mt('Unknown').''.&mt('Not permitted'),''.&mt('None').''.&mt('Access Starts').''.&mt('Access Ends').''.&Apache::lonlocal::locallocaltime($startaccess).''.&Apache::lonlocal::locallocaltime($accessstart).''.&mt('No end date').''.&Apache::lonlocal::locallocaltime($endaccess).''.&Apache::lonlocal::locallocaltime($accessend).''.&mt('None').'
'.$env{'form.person_'.$i.'_first'}.' '. - $env{'form.person_'.$i.'_last'}.'
'.$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).''.$env{'form.person_'.$i.'_sections'}.'
'.$showsec.'