--- loncom/interface/lonrequestcourse.pm 2009/08/15 01:59:04 1.13 +++ loncom/interface/lonrequestcourse.pm 2009/08/18 20:06:51 1.17 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.13 2009/08/15 01:59:04 raeburn Exp $ +# $Id: lonrequestcourse.pm,v 1.17 2009/08/18 20:06:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -128,22 +128,24 @@ sub handler { my $dom = &get_course_dom(); my $action = $env{'form.action'}; my $state = $env{'form.state'}; - my %stored; my $jscript; if ((defined($state)) && (defined($action))) { - my %elements = &form_elements($dom); - if (($action eq 'view') && ($state ne 'crstype')) { - if (defined($env{'form.request_id'})) { - %stored = &retrieve_settings($dom,$env{'form.request_id'}); + 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); } @@ -154,7 +156,7 @@ sub handler { my $loaditems = &onload_action($action,$state); my %states; - $states{'view'} = ['pick_request','details','review','process']; + $states{'view'} = ['pick_request','details','cancel','removal']; $states{'log'} = ['filter','display']; $states{'new'} = ['courseinfo','enrollment','personnel','review','process']; if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) { @@ -173,13 +175,20 @@ sub handler { crstype => 'Course Request Action', codepick => 'Category', courseinfo => 'Description', - enrollment => 'Enrollment', + enrollment => 'Access Dates', personnel => 'Personnel', review => 'Review', process => 'Result', pick_request => 'Display Summary', + details => 'Request Details', + cancel => 'Cancel Request', + removal => 'Outcome', ); + if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) { + $trail{'enrollment'} = 'Enrollment'; + } + my $page = 0; my $crumb; if (defined($action)) { @@ -273,6 +282,7 @@ sub form_elements { crstype => { crstype => 'selectbox', action => 'selectbox', + origcnum => 'hidden', }, courseinfo => { cdescr => 'text', @@ -297,7 +307,6 @@ sub form_elements { no_end_date => 'checkbox', }, personnel => { - persontotal => 'hidden', addperson => 'checkbox', }, review => { @@ -359,6 +368,9 @@ sub form_elements { } } my $crosslisttotal = $env{'form.crosslisttotal'}; + if ($env{'form.addcrosslist'}) { + $crosslisttotal ++; + } if (!defined($crosslisttotal)) { $crosslisttotal = 1; } @@ -382,7 +394,10 @@ sub form_elements { } my %people; my $persontotal = $env{'form.persontotal'}; - if (!defined($persontotal)) { + if ($env{'form.addperson'}) { + $persontotal ++; + } + if ((!defined($persontotal)) || (!$persontotal)) { $persontotal = 1; } for (my $i=0; $i<$persontotal; $i++) { @@ -395,7 +410,6 @@ sub form_elements { $people{'person_'.$i.'_role'} = 'selectbox', $people{'person_'.$i.'_sec'} = 'selectbox', $people{'person_'.$i.'_newsec'} = 'text', - $people{'person_'.$i.'_sections'} = 'hidden', } my %personnelhash = (%{$elements{'new'}{'personnel'}},%people); %{$elements{'new'}{'personnel'}} = %personnelhash; @@ -553,7 +567,8 @@ END my $formname = 'requestcrs'; my $nexttext = &mt('Next'); - $r->print('
'. + $r->print( + '
'. &Apache::lonhtmlcommon::start_pick_box(). &Apache::lonhtmlcommon::row_title('Action').' @@ -589,13 +604,19 @@ END sub request_administration { my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb) = @_; my $js; - if (($action eq 'new') || ($action eq 'view')) { + 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); } elsif ($action eq 'view') { - $r->print(&header('Manage course requests',$js.$jscript,$loaditems).$crumb); + my $jsextra; + my $formname = 'requestcrs'; + my $prev = $states->{$action}[$page-1]; + my $next = $states->{$action}[$page+1]; + if ($state eq 'pick_request') { + $next = $states->{$action}[$page+1]; + $jsextra = &viewrequest_javascript($formname,$next); + } elsif ($state eq 'details') { + $jsextra = &viewdetails_javascript($formname); + + } elsif ($state eq 'cancel') { + $jsextra = &viewcancel_javascript($formname); + } + $r->print(&header('Manage course requests',$js.$jscript.$jsextra,$loaditems). + $crumb); + my $form = ''; if ($state eq 'pick_request') { - $r->print(&print_request_status($dom)); + $r->print('

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

'."\n".$form."\n". + &print_request_status($dom).''); + } elsif ($state eq 'details') { + my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk); + my $origcnum = $env{'form.cnum'}; + if ($origcnum eq '') { + $origcnum = $env{'form.origcnum'}; + } + if ($env{'form.crstype'} eq 'official') { + &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, + \%cat_order,\@code_order); + } + $r->print('

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

'."\n".$form."\n". + &print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order, + \@code_order)."\n". + ''."\n"); + my @excluded = &get_excluded_elements($dom,$states,'new','review'); + push(@excluded,'origcnum'); + $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'
'); + my $other = 'modify'; + my %navtxt = &Apache::lonlocal::texthash ( + prev => 'Back', + other => 'Modify Request', + next => 'Cancel Request', + ); + &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'}, + $state,$other,$navtxt{'other'}); + $r->print(''); + } elsif ($state eq 'cancel') { + my ($result,$output) = &print_cancel_request($dom,$env{'form.origcnum'}); + $r->print('

'.&mt('Cancel course request').'

'."\n".$form."\n". + $output); + my @excluded = &get_excluded_elements($dom,$states,'view','cancel'); + $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'
'); + my %navtxt = &Apache::lonlocal::texthash ( + prev => 'Back', + next => 'Confirm Cancellation', + ); + if ($result eq 'ok') { + &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next, + $navtxt{'next'},$state); + } else { + &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},undef,'',$state); + } + $r->print(''); + } elsif ($state eq 'removal') { + my $cnum = $env{'form.origcnum'}; + my $statuskey = 'status:'.$dom.':'.$cnum; + my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey], + $env{'user.domain'},$env{'user.name'}); + my $currstatus = $userreqhash{$statuskey}; + my ($result,$error); + if (($currstatus eq 'approval') || ($currstatus eq 'pending')) { + my %status = ( + $statuskey => 'cancelled', + ); + my $statusresult = &Apache::lonnet::put('courserequests',\%status); + if ($statusresult eq 'ok') { + my $delresult = + &Apache::lonnet::del_dom('courserequestqueue', + [$cnum.'_'.$currstatus],$dom); + if ($delresult eq 'ok') { + $result = 'ok'; + } else { + $error = &mt('An error occurred when updating the pending requests queue: [_1]',$delresult); + } + } else { + $error = &mt("An error occurred when updating the status of this request in the requestor's records: [_1]",$statusresult); + } + } else { + $error = &mt('The current status of this request could not be verified as pending approval/institutional action.'); + } + $r->print('

'.&mt('Request Cancellation').'

'."\n".$form."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"); + if ($result eq 'ok') { + $r->print(&mt('Your course request has been cancelled.')); + } else { + $r->print('
'. + &mt('The request cancellation process was not complete.'). + '
'.$error.'
'); + } + $r->print(''); } } elsif ($action eq 'log') { $r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb); @@ -655,7 +775,7 @@ sub print_request_form { } if ($instcode ne '') { $code_chk = &Apache::lonnet::auto_validate_instcode('',$dom,$instcode); - if ($code_chk eq 'ok') { + if ($code_chk eq 'valid') { $message = '
'. &mt('The chosen course category [_1] is valid.',''. $instcode.'').'
'; @@ -689,13 +809,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, @@ -706,10 +826,18 @@ sub print_request_form { } elsif ($state eq 'personnel') { $r->print(&print_personnel_menu($dom,$formname,$crstype)); } elsif ($state eq 'review') { + my $cnum; + if ($env{'form.origcnum'} =~ /^($match_courseid)$/) { + $cnum = $env{'form.origcnum'}; + } else { + $cnum = &Apache::lonnet::generate_coursenum($dom); + } &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); - $r->print(&print_review($formname,$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). + ''); $navtxt{'next'} = &mt('Submit course request'); } elsif ($state eq 'process') { if ($crstype eq 'official') { @@ -719,6 +847,14 @@ sub print_request_form { my $result = &print_request_outcome($dom,\@codetitles,\@code_order); $r->print($result); } + my @excluded = &get_excluded_elements($dom,$states,$action,$state); + $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).''); + &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state); + return; +} + +sub get_excluded_elements { + my ($dom,$states,$action,$state) = @_; my @excluded = ('counter'); my %elements = &form_elements($dom); if (ref($states) eq 'HASH') { @@ -729,7 +865,7 @@ sub print_request_form { for (my $i=$numitems-1; $i>=0; $i--) { if (ref($elements{$action}) eq 'HASH') { if (ref($elements{$action}{$items[$i]}) eq 'HASH') { - foreach my $key (keys(%{$elements{$action}{$items[$i]}})) { + foreach my $key (keys(%{$elements{$action}{$items[$i]}})) { push(@excluded,$key); } } @@ -742,9 +878,7 @@ sub print_request_form { if (grep(/^instcode_/,@excluded)) { push(@excluded,'instcode'); } - $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).''); - &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'}); - return; + return @excluded; } sub print_enrollment_menu { @@ -755,7 +889,7 @@ sub print_enrollment_menu { my %accesstitles = ( 'start' => 'Default start access', - 'end' => 'Default end accss', + 'end' => 'Default end access', ); my %enrolltitles = ( 'start' => 'Start auto-enrollment', @@ -855,13 +989,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 = ' '; @@ -879,7 +1013,7 @@ sub print_personnel_menu { my ($dom,$formname,$crstype) = @_; my $output = '
'.&Apache::lonhtmlcommon::start_pick_box(); my $persontotal = $env{'form.persontotal'}; - if (!defined($persontotal)) { + if ((!defined($persontotal)) || (!$persontotal)) { $persontotal = 1; } if ($env{'form.addperson'}) { @@ -965,9 +1099,7 @@ sub print_personnel_menu { $existmult.'>'."\n".$existops.''.(' ' x3); } $sectionselector .= $newtitle. - ''. - ''."\n"; - + ''."\n"; $output .= &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel').'
'. ''.$userlink. @@ -992,52 +1124,70 @@ 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'}{'cdescr'}; - 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". - ''."\n". + $output = ''."\n". + ''."\n". - ''."\n"; + ''."\n". + ''."\n". + ''."\n"; if (@sortedtimes > 0) { $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').''. @@ -1050,14 +1200,25 @@ sub print_request_status { my ($key,$type,$desc,$instcode) = split(':',$request); 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(); @@ -1069,11 +1230,107 @@ 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; } +sub print_cancel_request { + my ($dom,$cnum) = @_; + my $requestkey = $dom.'_'.$cnum; + my ($result,$output); + if ($requestkey =~ /^($match_domain)_($match_courseid)$/) { + my %history = &Apache::lonnet::restore($requestkey,'courserequests', + $env{'user.domain'},$env{'user.name'}); + my $timestamp = $history{'reqtime'}; + my $crstype = $history{'crstype'}; + my $status = $history{'status'}; + if (($status eq 'cancelled') || ($status eq 'created')) { + if ($status eq 'cancelled') { + $output = &mt('This request has already been cancelled.'); + } elsif ($status eq 'created') { + $output = &mt('This request has already been processed, and a course created.'); + } + $output = &mt('No further action will be taken'); + } elsif (ref($history{'details'}) eq 'HASH') { + my ($types,$typename) = &course_types(); + my $showtype = $crstype; + if (defined($typename->{$crstype})) { + $showtype = $typename->{$crstype}; + } + $output = '

'.&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('Description').''.&mt('Requested').''. + ''.&mt('Type').''. + &Apache::loncommon::end_data_table_header_row(). + &Apache::loncommon::start_data_table_row(). + ''.$history{details}{'cdescr'}.''. + &Apache::lonlocal::locallocaltime($timestamp).''. + ''.$showtype.''. + &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table(). + '

'. + &mt('Cancelling the request will remove it from the queue of pending course requests').'
'; + $result = 'ok'; + } else { + $output = '
'.&mt('No record exists for the course ID').'
'; + } + } else { + $output = '
'.&mt('Invalid course ID').'
'; + } + return ($result,$output); +} + +sub viewrequest_javascript { + my ($formname,$next) = @_; + return <<"ENDJS"; + +function chooseRequest(cdom,cnum) { + document.$formname.showdom.value = cdom; + document.$formname.cnum.value = cnum; + nextPage(document.$formname,'$next'); +} + +ENDJS +} + +sub viewdetails_javascript { + my ($formname) = @_; + return << "ENDJS"; + +function nextPage(formname,nextstate) { + if (nextstate == "modify") { + formname.state.value = "personnel"; + formname.action.value = "new"; + } else { + formname.state.value = nextstate; + } + formname.submit(); +} + +function backPage(formname,prevstate) { + formname.state.value = prevstate; + formname.submit(); +} + +ENDJS +} + +sub viewcancel_javascript { + my $alert = &mt('Are you sure you want to cancel this request?\\n'. + 'Your request will be removed.'); + return << "ENDJS"; +function nextPage(formname,nextstate) { + if (confirm('$alert')) { + formname.state.value = nextstate; + formname.submit(); + } + return; +} + +ENDJS +} + sub print_request_logs { my ($jscript,$loaditems,$crumb) = @_; return; @@ -1100,10 +1357,16 @@ sub print_review { $crstypename = $typename->{$env{'form.crstype'}}; } } + my $category = 'Course'; + if ($env{'form.crstype'} eq 'community') { + $category = 'Community'; + } $inst_headers = ''.&mt('Description').''.&mt('Type').''; $inst_values = ''.$env{'form.cdescr'}.''.$crstypename.''; + my $enrollrow_title = &mt('Default Access Dates').'
'. + '('.&Apache::lonnet::plaintext('st',$category).')'; if ($env{'form.crstype'} eq 'official') { if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH')) { foreach my $title (@{$codetitles}) { @@ -1120,6 +1383,7 @@ sub print_review { } } if (&Apache::lonnet::auto_run('',$dom)) { + $enrollrow_title = &mt('Enrollment'); $enroll_headers = ''.&mt('Automatic Adds').''. ''.&mt('Automatic Drops').''. ''.&mt('Enrollment Starts').''. @@ -1190,33 +1454,35 @@ sub print_review { $inst_headers .= ''.&mt('Clone From').''; if (($env{'form.clonecrs'} =~ /^$match_name$/) && ($env{'form.clonedom'} =~ /^$match_domain$/)) { - my %coursehash = - &Apache::lonnet::courseiddump($env{'form.clonedom'},'.',1,'.','.', - $env{'form.clonecrs'},undef,undef,'.'); - my $cloneid = $env{'form.clonedom'}.'_'.$env{'form.clonecrs'}; - if (ref($coursehash{$cloneid}) eq 'HASH') { - $inst_headers .= ''.$ctxt{'dsh'}.''; - my $clonedesc = $coursehash{$cloneid}{'description'}; - my $cloneinst = $coursehash{$cloneid}{'inst_code'}; - - $inst_values .= ''.$clonedesc.' '; - 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 .= ''; - } else { - $inst_values .= ''.&mt('Unknown').''; - } + 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 .= ''.$ctxt{'dsh'}.''; + $inst_values .= ''.$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{'prd'}; + } elsif ($env{'form.datemode'} eq 'shift') { + $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'}); + } else { + $inst_values .= $ctxt{'ncd'}; + } + $inst_values .= ''; + } else { + $inst_values .= ''.&mt('Unknown').''; + } + } else { + $inst_values .= ''.&mt('Not permitted'),''; + } } else { $inst_values .= ''.&mt('None').''; } @@ -1243,6 +1509,24 @@ sub print_review { ''.&mt('None').''; 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 .= ''.$env{'form.person_'.$i.'_firstname'}.' '. $env{'form.person_'.$i.'_lastname'}.''. @@ -1250,10 +1534,10 @@ sub print_review { $env{'form.person_'.$i.'_dom'}.''. ''.&Apache::lonnet::plaintext($env{'form.person_'.$i.'_role'}, $container).''. - ''.$env{'form.person_'.$i.'_sections'}.''; + ''.$showsec.''; } } - my $output = '

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

'. + my $output = '
'.&Apache::lonhtmlcommon::start_pick_box(). &Apache::lonhtmlcommon::row_title(&mt('Owner')). ''. @@ -1269,7 +1553,7 @@ sub print_review { '
'.$inst_headers.''."\n". ''.$inst_values.'
'."\n". &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title(&mt('Enrollment')). + &Apache::lonhtmlcommon::row_title($enrollrow_title). ''.$enroll_headers.''."\n". ''.$enroll_values.'
'."\n". &Apache::lonhtmlcommon::row_closure(); @@ -1284,8 +1568,6 @@ sub print_review { $personnel_values.''."\n". &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::end_pick_box(); - my $cnum = &Apache::lonnet::generate_coursenum($dom); - $output .= ''; return $output; } @@ -1302,17 +1584,33 @@ sub dates_from_form { } sub courseinfo_form { - my ($dom,$formname,$crstype) = @_; - my $output = '
'.&Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title('Course Description'). + 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')); + &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course')); } $output .= $home_server_pick. &Apache::lonhtmlcommon::row_closure(1). @@ -1351,7 +1649,7 @@ sub clone_form { return $output; } -sub clone_text { +sub clone_text { return &Apache::lonlocal::texthash( 'cid' => 'Course ID', 'dmn' => 'Domain', @@ -1466,23 +1764,28 @@ sub get_course_dom { } sub display_navbuttons { - my ($r,$formname,$prev,$prevtext,$next,$nexttext) = @_; + my ($r,$formname,$prev,$prevtext,$next,$nexttext,$state,$other,$othertext) = @_; $r->print('
'); if ($prev) { - $r->print(' - -    '); + $r->print(''. + (' 'x3)); } elsif ($prevtext) { - $r->print(' - -    '); + $r->print(''.(' 'x3)); } - if ($next) { + if ($state eq 'details') { + $r->print(' '); + } + if ($state eq 'courseinfo') { + $r->print(''); + } elsif ($next) { $r->print(' - '); + '); } $r->print('
'); } @@ -1505,6 +1808,7 @@ sub print_request_outcome { } $now = time; $crstype = $env{'form.crstype'}; + my @instsections; if ($crstype eq 'official') { if (&Apache::lonnet::auto_run('',$dom)) { ($enrollstart,$enrollend)=&dates_from_form('enrollstart','enrollend'); @@ -1512,7 +1816,11 @@ sub print_request_outcome { for (my $i=0; $i<$env{'form.sectotal'}; $i++) { if ($env{'form.sec_'.$i}) { if ($env{'form.secnum_'.$i} ne '') { - $sections{$i}{'inst'} = $env{'form.secnum_'.$i}; + my $sec = $env{'form.secnum_'.$i}; + $sections{$i}{'inst'} = $sec; + if (($sec ne '') && (!grep(/^\Q$sec\E$/,@instsections))) { + push(@instsections,$sec); + } $sections{$i}{'loncapa'} = $env{'form.loncapasec_'.$i}; } } @@ -1532,11 +1840,13 @@ sub print_request_outcome { $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'}; + my $udom = $env{'form.person_'.$i.'_dom'}; if (($uname =~ /^$match_username$/) && ($udom =~ /^$match_domain$/)) { if (&Apache::lonnet::domain($udom) ne '') { unless (ref($personnel{$uname.':'.$udom}) eq 'HASH') { @@ -1548,7 +1858,7 @@ sub print_request_outcome { } my $role = $env{'form.person_'.$i.'_role'}; unless ($role eq '') { - if (ref(@{$personnel{$uname.':'.$udom}{'roles'}}) eq 'ARRAY') { + 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); @@ -1559,15 +1869,17 @@ sub print_request_outcome { if ($role eq 'cc') { @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = (); } else { - my @currsec; - if ($env{'form.person_'.$i.'_sections'} ne '') { - my @sections = split(',',$env{'form.person_'.$i.'_sections'}); - foreach my $sec (@sections) { - next if ($sec eq ''); - if (@currsec > 0) { - unless(grep(/^\Q$sec\E$/,@currsec)) { - push(@currsec,$sec); - } + 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); } } } @@ -1582,6 +1894,45 @@ sub print_request_outcome { } } 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.clonecrs'}, + $env{'form.clonedom'}); + if ($clonehome ne 'no_host') { + my $canclone = + &Apache::loncoursequeueadmin::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'}, @@ -1590,17 +1941,17 @@ sub print_request_outcome { coursehome => $env{'form.chome'}, cdescr => $env{'form.cdescr'}, crstype => $env{'form.crstype'}, - instcode => $env{'form.instcode'}, - clonedom => $env{'form.clonedom'}, - clonecrs => $env{'form.clonecrs'}, + 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'}, + crosslisttotal => $crosslisttotal, crosslists => \%crosslistings, - autoadds => $env{'form.autoadds'}, - autodrops => $env{'form.autodrops'}, + autoadds => $autoadds, + autodrops => $autodrops, enrollstart => $enrollstart, enrollend => $enrollend, accessstart => $accessstart, @@ -1620,13 +1971,14 @@ 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, ); my $requestkey = $dom.'_'.$cnum; + my $validationerror; if ($val eq 'autolimit=') { $disposition = 'process'; } elsif ($val =~ /^autolimit=(\d+)$/) { @@ -1634,43 +1986,69 @@ sub print_request_outcome { $disposition = &check_autolimit($env{'user.name'},$env{'user.domain'}, $dom,$crstype,$limit,\$message); } elsif ($val eq 'validate') { - $disposition = - &Apache::lonnet::auto_courserequest_validation($dom,$details, - \@inststatuses,\$message); + my $inststatuslist; + if (@inststatuses > 0) { + $inststatuslist = join(',',@inststatuses); + } + my $instseclist; + if (@instsections > 0) { + $instseclist = join(',',@instsections); + } + my $validation = + &Apache::lonnet::auto_validate_instcode('',$dom,$instcode, + $env{'user.name'}.':'.$env{'user.domain'},$inststatuslist, + $instseclist); + if ($validation eq 'valid') { + $disposition = 'process'; + } elsif ($validation eq 'rejected') { + $disposition = 'rejected'; + } elsif ($validation eq 'pending') { + $disposition = 'pending'; + } elsif ($disposition eq 'approval') { + $disposition = 'approval'; + } elsif ($disposition =~ /^error(.*)$/) { + $disposition = 'approval'; + $validationerror = $1; + } else { + $disposition = 'approval'; + } } else { $disposition = 'approval'; } - $reqhash{'status'} = $disposition; + $reqhash{'disposition'} = $disposition; + $reqstatus = $disposition; + my ($modified,$queued); 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 %domdefs = &Apache::lonnet::get_domain_defaults($dom); - my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles); - my @roles = &Apache::lonuserutils::roles_by_context('course'); foreach my $role (@roles) { $longroles{$role}=&Apache::lonnet::plaintext($role,$type); } - my $owneremail; - my %emails = &Apache::loncommon::getemails(); - foreach my $email ('permanentemail','critnotification','notification') { - $owneremail = $emails{$email}; - last if ($owneremail ne ''); - } - my %reqdetails = &build_batchcreatehash($dom,$details,$owneremail,\%domdefs); - my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',\%reqdetails,\%longroles,\$logmsg,\$newusermsg,\$addresult,\$enrollcount,\$output,\$keysmsg,$env{'user.domain'},$env{'user.name'},$cnum,$crstype); - $disposition = 'created'; - if ($cid eq "/$dom/$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; @@ -1683,60 +2061,102 @@ sub print_request_outcome { description => $env{'form.cdescr'}, }, }; - my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request, - $dom); - if ($putresult eq 'ok') { - my %emails = &Apache::loncommon::getemails(); - my $address; - if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) { - $address = $emails{'permanentemail'}; - if ($address eq '') { - $address = $emails{'notification'}; - } - } - $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".').'
'; - 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 $statuskey = 'status:'.$dom.':'.$cnum; + my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey], + $env{'user.domain'},$env{'user.name'}); + if ($userreqhash{$statuskey} ne '') { + $modified = 1; + my %queuehash = &Apache::lonnet::get_dom('courserequestqueue', + [$cnum.'_approval', + $cnum.'_pending'],$dom); + if (($queuehash{$cnum.'_approval'} ne '') || + ($queuehash{$cnum.'_pending'} ne '')) { + $queued = 1; + } + } + unless ($queued) { + my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request, + $dom); + if ($putresult eq 'ok') { + $output = &mt('Your course request has been recorded.').'
'. + ¬ification_information($disposition,$req_notifylist, + $cnum,$now); } else { - $output .= '
'. -&mt('Your request has been placed in a queue pending administrative action.').'
'. -&mt("Usually this means that your institution's information systems do not list you among the instructional personnel for this course.").'
'. -&mt('The list of instructional personnel for the course will be automatically checked daily, and once you are listed the request will be processed.'). - '
'; + $reqstatus = 'domainerror'; + $reqhash{'disposition'} = $disposition; + my $warning = &mt('An error occurred saving your request in the pending requests queue.'); + $output = ''.$warning.'
'; } - } else { - $reqhash{'status'} = '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: [_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"); + } + if ($modified && $queued && $storeresult eq 'ok') { + $output .= '

'.&mt('Your course request has been updated').'

'. + ¬ification_information($disposition,$req_notifylist,$cnum,$now); + } + if ($validationerror ne '') { + $output .= ''.&mt('An error occurred validating your request with institutional data sources: {_1].',$validationerror).'

'; } } return $output; } +sub notification_information { + my ($disposition,$req_notifylist,$cnum,$now) = @_; + my %emails = &Apache::loncommon::getemails(); + my $address; + if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) { + $address = $emails{'permanentemail'}; + if ($address eq '') { + $address = $emails{'notification'}; + } + } + my $output; + if ($disposition eq 'approval') { + $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'}); + 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); + } + } elsif ($disposition eq 'pending') { + $output .= '
'. +&mt('Your request has been placed in a queue pending administrative action.').'
'. +&mt("Usually this means that your institution's information systems do not list you among the instructional personnel for this course.").'
'. +&mt('The list of instructional personnel for the course will be automatically checked daily, and once you are listed the request will be processed.'). + '
'; + } else { + $output .= '
'. + &mt('Your request status is: [_1].',$disposition). + '
' + } + return $output; +} + sub get_processtype { my ($dom,$crstype,$inststatuses,$domconfig) = @_; return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH')); @@ -1853,61 +2273,169 @@ sub check_autolimit { return; } -sub build_batchcreatehash { - my ($dom,$details,$owneremail,$domdefs) = @_; - my %batchhash; - my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users}; - if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) { - my $emailenc = &Apache::lonnet::escape($owneremail); - my $owner = $details->{'owner'}.':'.$details->{'domain'}; - foreach my $item (@items) { - $batchhash{$item} = $details->{$item}; +sub retrieve_settings { + my ($dom,$cnum) = @_; + my ($result,%reqinfo) = &get_request_settings($dom,$cnum); + if ($result eq 'ok') { + if (($env{'user.name'} eq $reqinfo{'owner'}) && + ($env{'user.domain'} eq $reqinfo{'domain'})) { + $env{'form.chome'} = $reqinfo{'coursehome'}; + $env{'form.cdescr'} = $reqinfo{'cdescr'}; + $env{'form.crstype'} = $reqinfo{'crstype'}; + &generate_date_items($reqinfo{'accessstart'},'accessstart'); + &generate_date_items($reqinfo{'accessend'},'accessend'); + if ($reqinfo{'accessend'} == 0) { + $env{'form.no_end_date'} = 1; + } + if (($reqinfo{'crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) { + &generate_date_items($reqinfo{'enrollstart'},'enrollstart'); + &generate_date_items($reqinfo{'enrollend'},'enrollend'); + } + $env{'form.clonecrs'} = $reqinfo{'clonecrs'}; + $env{'form.clonedom'} = $reqinfo{'clonedom'}; + $env{'form.datemode'} = $reqinfo{'datemode'}; + $env{'form.dateshift'} = $reqinfo{'dateshift'}; + if (($reqinfo{'crstype'} eq 'official') && ($reqinfo{'instcode'} ne '')) { + $env{'form.sectotal'} = $reqinfo{'sectotal'}; + $env{'form.crosslisttotal'} = $reqinfo{'crosslisttotal'}; + $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 @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'};; + $env{'form.secnum_'.$i} = $sec; + if (!grep(/^\Q$sec\E$/,@currsec)) { + push(@currsec,$sec); + } + $env{'form.loncapasec_'.$i} = $reqinfo{'sections'}{$i}{'loncapa'}; + } + } + } + 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,$1,$xlistsec); + } + } + } + if (ref($reqinfo{'personnel'}) eq 'HASH') { + my $i = 0; + foreach my $user (sort(keys(%{$reqinfo{'personnel'}}))) { + my ($uname,$udom) = split(':',$user); + if (ref($reqinfo{'personnel'}{$user}) eq 'HASH') { + if (ref($reqinfo{'personnel'}{$user}{'roles'}) eq 'ARRAY') { + foreach my $role (sort(@{$reqinfo{'personnel'}{$user}{'roles'}})) { + $env{'form.person_'.$i.'_role'} = $role; + $env{'form.person_'.$i.'_firstname'} = $reqinfo{'personnel'}{$user}{'firstname'}; + $env{'form.person_'.$i.'_lastname'} = $reqinfo{'personnel'}{$user}{'lastname'}; ; + $env{'form.person_'.$i.'_emailaddr'} = $reqinfo{'personnel'}{$user}{'emailaddr'}; + $env{'form.person_'.$i.'_uname'} = $uname; + $env{'form.person_'.$i.'_dom'} = $udom; + if (ref($reqinfo{'personnel'}{$user}{$role}) eq 'HASH') { + if (ref($reqinfo{'personnel'}{$user}{$role}{'usec'}) eq 'ARRAY') { + my @usecs = @{$reqinfo{'personnel'}{$user}{$role}{'usec'}}; + my @newsecs; + if (@usecs > 0) { + foreach my $sec (@usecs) { + if (grep(/^\Q$sec\E/,@currsec)) { + $env{'form.person_'.$i.'_sec'} = $sec; + } else { + push (@newsecs,$sec); + } + } + } + if (@newsecs > 0) { + $env{'form.person_'.$i.'_newsec'} = join(',',@newsecs); + } + } + } + $i ++; + } + } + } + } + $env{'form.persontotal'} = $i; + } } - $batchhash{'title'} = $details->{'cdescr'}; - $batchhash{'coursecode'} = $details->{'instcode'}; - $batchhash{'emailenc'} = $emailenc; - $batchhash{'adds'} = $details->{'autoadds'}; - $batchhash{'drops'} = $details->{'autodrops'}; - $batchhash{'authtype'} = $domdefs->{'auth_def'}; - $batchhash{'authparam'} = $domdefs->{'auth_arg_def'}; - if ($details->{'crstype'} eq 'community') { - $batchhash{'crstype'} = 'Community'; + } + return $result; +} + +sub get_request_settings { + my ($dom,$cnum) = @_; + 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 $disposition = $history{'disposition'}; + if (($disposition eq 'approval') || ($disposition eq 'pending')) { + if (ref($history{'details'}) eq 'HASH') { + %reqinfo = %{$history{'details'}}; + $result = 'ok'; + } else { + $result = 'nothash'; + } } else { - $batchhash{'crstype'} = 'Course'; + $result = 'notqueued'; } - $batchhash{'users'}{$details->{$owner}} = { - firstname => $env{'environment.first'}, - lastname => $env{'environment.last'}, - emailenc => $emailenc, - email => $owneremail, - }; + } else { + $result = 'invalid'; } - return %batchhash; + return ($result,%reqinfo); } -sub retrieve_settings { - my ($dom,$request_id) = @_; - my %reqinfo = &get_request_settings($request_id,$dom); - my %stored; - $stored{'cdescr'} = &unescape($reqinfo{'description'}); - $stored{'accessstart'} = $reqinfo{'accessstart'}; - $stored{'accessend'} = $reqinfo{'accessend'}; - if ($stored{'accessend'} == 0) { - $stored{'no_end_date'} = 1; - } - $stored{'enrollstart'} = $reqinfo{'enrollstart'}; - $stored{'enrollend'} = $reqinfo{'enrollend'}; - $stored{'crosslist'} = $reqinfo{'crosslist'}; - $stored{'clonecrs'} = $reqinfo{'clonecrs'}; - $stored{'clonedom'} = $reqinfo{'clonedom'}; - $stored{'sections'} = $reqinfo{'sections'}; - $stored{'personnel'} = $reqinfo{'personnel'}; - - return %stored; +sub extract_instcode { + my ($cdom,$element,$crscodehashref,$counter,$xlistsec) = @_; + 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 (@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; + } + } + } + } + return; } -sub get_request_settings { - my ($request_id,$dom); +sub generate_date_items { + my ($currentval,$item) = @_; + if ($currentval =~ /\d+/) { + my ($tzname,$sec,$min,$hour,$mday,$month,$year) = + &Apache::lonhtmlcommon::get_timedates($currentval); + $env{'form.'.$item.'_day'} = $mday; + $env{'form.'.$item.'_month'} = $month+1; + $env{'form.'.$item.'_year'} = $year; + } + return; } 1;