--- loncom/interface/lonrequestcourse.pm 2009/08/11 01:39:34 1.8
+++ loncom/interface/lonrequestcourse.pm 2009/08/15 01:59:04 1.13
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.8 2009/08/11 01:39:34 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.13 2009/08/15 01:59:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,6 +44,62 @@ described at http://www.lon-capa.org.
=item handler()
+=item header()
+
+=item form_elements()
+
+=item onload_action()
+
+=item check_can_request()
+
+=item course_types()
+
+=item print_main_menu()
+
+=item request_administration()
+
+=item print_request_form()
+
+=item print_enrollment_menu()
+
+=item inst_section_selector()
+
+=item date_setting_table()
+
+=item print_personnel_menu()
+
+=item print_request_status()
+
+=item print_request_logs()
+
+=item print_review()
+
+=item dates_from_form()
+
+=item courseinfo_form()
+
+=item clone_form()
+
+=item clone_text()
+
+=item coursecode_form()
+
+=item get_course_dom()
+
+=item display_navbuttons()
+
+=item print_request_outcome()
+
+=item get_processtype()
+
+=item check_autolimit()
+
+=item build_batchcreatehash()
+
+=item retrieve_settings()
+
+=item get_request_settings()
+
=back
=cut
@@ -114,13 +170,14 @@ sub handler {
}
my %trail = (
- crstype => 'Course Request Action',
- codepick => 'Category',
- courseinfo => 'Description',
- enrollment => 'Enrollment',
- personnel => 'Personnel',
- review => 'Review',
- process => 'Result',
+ crstype => 'Course Request Action',
+ codepick => 'Category',
+ courseinfo => 'Description',
+ enrollment => 'Enrollment',
+ personnel => 'Personnel',
+ review => 'Review',
+ process => 'Result',
+ pick_request => 'Display Summary',
);
my $page = 0;
@@ -179,7 +236,12 @@ sub handler {
'</div>'.&Apache::loncommon::end_page());
}
} elsif ($action eq 'view') {
- &print_request_status($jscript,$loaditems,$crumb);
+ if ($state eq 'crstype') {
+ &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);
+ } else {
+ &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
+ $loaditems,$crumb);
+ }
} elsif ($action eq 'log') {
&print_request_logs($jscript,$loaditems,$crumb);
} else {
@@ -214,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 => {
@@ -246,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);
@@ -262,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',
@@ -314,16 +386,16 @@ 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',
+ $people{'person_'.$i.'_sections'} = 'hidden',
}
my %personnelhash = (%{$elements{'new'}{'personnel'}},%people);
%{$elements{'new'}{'personnel'}} = %personnelhash;
@@ -540,8 +612,11 @@ END
&print_request_form($r,$action,$state,$page,$states,$dom);
} elsif ($action eq 'view') {
$r->print(&header('Manage course requests',$js.$jscript,$loaditems).$crumb);
+ if ($state eq 'pick_request') {
+ $r->print(&print_request_status($dom));
+ }
} elsif ($action eq 'log') {
- $r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb);
+ $r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb);
}
$r->print(&Apache::loncommon::end_page());
return;
@@ -554,7 +629,7 @@ sub print_request_form {
$prev = $states->{$action}[$page-1];
$next = $states->{$action}[$page+1];
my %navtxt = &Apache::lonlocal::texthash (
- prev => 'Previous',
+ prev => 'Back',
next => 'Next',
);
$crstype = $env{'form.crstype'};
@@ -636,8 +711,13 @@ sub print_request_form {
$r->print(&print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,
\@code_order));
$navtxt{'next'} = &mt('Submit course request');
- } elsif ($state eq '') {
- my $result = &print_request_outcome($dom);
+ } elsif ($state eq 'process') {
+ if ($crstype eq 'official') {
+ &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+ \%cat_order,\@code_order);
+ }
+ my $result = &print_request_outcome($dom,\@codetitles,\@code_order);
+ $r->print($result);
}
my @excluded = ('counter');
my %elements = &form_elements($dom);
@@ -806,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');
@@ -894,9 +974,9 @@ sub print_personnel_menu {
'</span>').
'<table><tr><td align="center" valign="top">'.&mt('Username').'<br />'.$uname_form.'</td>'."\n".
'<td align="center" valign="top" colspan="2">'.&mt('Domain').'<br />'.$udom_form.'</td></tr><tr>'."\n".
- '<td align="center" valign="top">'.&mt('First Name').'<br />'.$form_elems{'first'}.'</td>'."\n".
- '<td align="center" valign="top">'.&mt('Last Name').'<br />'.$form_elems{'last'}.'</td>'."\n".
- '<td align="center" valign="top">'.&mt('E-mail').'<br />'.$form_elems{email}.'</td></tr>'."\n".
+ '<td align="center" valign="top">'.&mt('First Name').'<br />'.$form_elems{'firstname'}.'</td>'."\n".
+ '<td align="center" valign="top">'.&mt('Last Name').'<br />'.$form_elems{'lastname'}.'</td>'."\n".
+ '<td align="center" valign="top">'.&mt('E-mail').'<br />'.$form_elems{'emailaddr'}.'</td></tr>'."\n".
'<tr><td align="center" valign="top">'.&mt('Role').'<br />'.$roleselector.'</td>'."\n".
'<td'.$seccolspan.' align="center" valign="top">'.&mt('Section(s)').'<br />'.$sectionselector.'</td>'."\n".
'</tr></table>'.&Apache::lonhtmlcommon::row_closure();
@@ -911,10 +991,91 @@ sub print_personnel_menu {
}
sub print_request_status {
- return;
+ 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);
+ }
+ } else {
+ @{$queue_by_date{$timestamp}} = ($entry);
+ }
+ }
+ }
+ }
+ $formname = 'requestcrs';
+ my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
+ $output = '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />'."\n".
+ '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+ '<input type="hidden" name="state" value="'.$env{'form.state'}.'" />'."\n".
+ '<input type="hidden" name="crstype" value="'.$env{'form.crstype'}.'" />'."\n";
+ if (@sortedtimes > 0) {
+ $output .= &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th>'.&mt('Action').'</th>'.
+ '<th>'.&mt('Description').'</th>';
+ if ($env{'form.crstype'} eq 'all') {
+ $output .= '<th>'.&mt('Type').'</th>';
+ }
+ if (($env{'form.crstype'} eq 'all') || ($env{'form.crstype'} eq 'official')) {
+ $output .= '<th>'.&mt('Institutional Code').'</th>';
+ }
+ $output .= '<th>'.&mt('Date requested').'</th>'.
+ &Apache::loncommon::end_data_table_header_row();
+ my $count = 0;
+ foreach my $item (@sortedtimes) {
+ my $showtime = &Apache::lonlocal::locallocaltime($item);
+ if (ref($queue_by_date{$item}) eq 'ARRAY') {
+ foreach my $request (sort(@{$queue_by_date{$item}})) {
+ my ($key,$type,$desc,$instcode) = split(':',$request);
+ my ($cdom,$cnum) = split('_',$key);
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<td><input type="button" value="'.&mt('Select').'" onclick="javascript:viewrequest('."'$cdom','$cnum'".')" /></td>'.
+ '<td>'.$desc.'</td>';
+ if ($env{'form.crstype'} eq 'all') {
+ $output .= '<td>'.&course_types($type).'</td>';
+ }
+ if (($env{'form.crstype'} eq 'all') ||
+ ($env{'form.crstype'} eq 'official')) {
+ $output .= '<td>'.$instcode.'</td>';
+ }
+ $output .= '<td>'.$showtime.'</td>'.
+ &Apache::loncommon::end_data_table_row();
+ }
+ }
+ }
+ $output .= &Apache::loncommon::end_data_table();
+ } else {
+ $output .= '<div>'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
+ }
+ $output .= '
+<input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />
+</form>';
+ return $output;
}
sub print_request_logs {
+ my ($jscript,$loaditems,$crumb) = @_;
return;
}
@@ -966,12 +1127,12 @@ sub print_review {
$section_headers = '<th>'.&mt('Sections').'</th>'.
'<th>'.&mt('Crosslistings').'</th>';
- my ($startenroll,$endenroll) = &dates_from_form('startenroll','endenroll');
+ my ($enrollstart,$enrollend) = &dates_from_form('enrollstart','enrollend');
my @autoroster = (&mt('No'),&mt('Yes'));
$enroll_values = '<td>'.$autoroster[$env{'form.autoadds'}].'</td>'.
'<td>'.$autoroster[$env{'form.autodrops'}].'</td>'.
- '<td>'.&Apache::lonlocal::locallocaltime($startenroll).'</td>'.
- '<td>'.&Apache::lonlocal::locallocaltime($endenroll).'</td>';
+ '<td>'.&Apache::lonlocal::locallocaltime($enrollstart).'</td>'.
+ '<td>'.&Apache::lonlocal::locallocaltime($enrollend).'</td>';
$section_values = '<td><table class="LC_innerpickbox"><tr><th>'.
&mt('Institutional section').'</th>'.
'<th>'.&mt('LON-CAPA section').'</th></tr>';
@@ -1027,12 +1188,12 @@ sub print_review {
my %ctxt = &clone_text();
$inst_headers .= '<th>'.&mt('Clone From').'</th>';
- if (($env{'form.clonecourse'} =~ /^$match_name$/) &&
- ($env{'form.clonedomain'} =~ /^$match_domain$/)) {
+ if (($env{'form.clonecrs'} =~ /^$match_name$/) &&
+ ($env{'form.clonedom'} =~ /^$match_domain$/)) {
my %coursehash =
- &Apache::lonnet::courseiddump($env{'form.clonedomain'},'.',1,'.','.',
- $env{'form.clonecourse'},undef,undef,'.');
- my $cloneid = $env{'form.clonedomain'}.'_'.$env{'form.clonecourse'};
+ &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 .= '<th>'.$ctxt{'dsh'}.'</th>';
my $clonedesc = $coursehash{$cloneid}{'description'};
@@ -1040,9 +1201,9 @@ sub print_review {
$inst_values .= '<td>'.$clonedesc.' ';
if ($cloneinst ne '') {
- $inst_values .= &mt('([_1] in [_2])',$cloneinst,$env{'form.clonedomain'});
+ $inst_values .= &mt('([_1] in [_2])',$cloneinst,$env{'form.clonedom'});
} else {
- $inst_values .= &mt('(from [_1])',$env{'form.clonedomain'});
+ $inst_values .= &mt('(from [_1])',$env{'form.clonedom'});
}
$inst_values .= '</td><td>';
if ($env{'form.datemode'} eq 'preserve') {
@@ -1061,12 +1222,12 @@ sub print_review {
}
$enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
'<th>'.&mt('Access Ends').'</th>';
- my ($startaccess,$endaccess) = &dates_from_form('startaccess','endaccess');
- $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($startaccess).'</td>';
- if ($endaccess == 0) {
+ my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+ $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart).'</td>';
+ if ($accessend == 0) {
$enroll_values .= '<td>'.&mt('No end date').'</td>';
} else {
- $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($endaccess).'</td>';
+ $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend).'</td>';
}
my $container = 'Course';
@@ -1083,8 +1244,8 @@ sub print_review {
for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
if ($env{'form.person_'.$i.'_uname'} ne '') {
$personnel_values .=
- '<tr><td>'.$env{'form.person_'.$i.'_first'}.' '.
- $env{'form.person_'.$i.'_last'}.'</td>'.
+ '<tr><td>'.$env{'form.person_'.$i.'_firstname'}.' '.
+ $env{'form.person_'.$i.'_lastname'}.'</td>'.
'<td>'.$env{'form.person_'.$i.'_uname'}.':'.
$env{'form.person_'.$i.'_dom'}.'</td>'.
'<td>'.&Apache::lonnet::plaintext($env{'form.person_'.$i.'_role'},
@@ -1132,7 +1293,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;
}
@@ -1144,10 +1305,19 @@ sub courseinfo_form {
my ($dom,$formname,$crstype) = @_;
my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title('Course Description').
- '<input type="text" size="40" name="cdescr" />'.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'</div>'.
- '<div>'.&clone_form($dom,$formname,$crstype).'</div>'."\n";
+ '<input type="text" size="40" name="cdescr" />';
+ 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().'</div>'.
+ '<div>'.&clone_form($dom,$formname,$crstype).'</div>'."\n";
return $output;
}
@@ -1157,14 +1327,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'}).'<label>'.
- '<input type="text" size="25" name="clonecourse" value="" onfocus="this.blur();'.
- 'opencrsbrowser('."'$formname','clonecourse','clonedomain','','','','$type'".');" />'.
+ '<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();'.
+ 'opencrsbrowser('."'$formname','clonecrs','clonedom','','','','$type'".');" />'.
'</label>'.&Apache::lonhtmlcommon::row_closure(1).'<label>'.
&Apache::lonhtmlcommon::row_title($lt{'dmn'}).'</label>'.
$cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure().
@@ -1318,52 +1488,127 @@ sub display_navbuttons {
}
sub print_request_outcome {
- my ($dom) = @_;
- my $output;
- my $cnum = $env{'form.cnum'};
+ my ($dom,$codetitles,$code_order) = @_;
+ my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
+ %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
+ $cnum = $env{'form.cnum'};
unless ($cnum =~ /^$match_courseid$/) {
$output = &mt('Invalid LON-CAPA course number for the new course')."\n";
return $output;
}
- my $req_notifylist = &Apache::lonnet::get_dom('configuration',['requestcourses'],
- $dom);
- my $now = time;
- my $crstype = $env{'form.crstype'};
- my ($startenroll,$endenroll,%sections,%crosslistings,%personnel);
+
+ %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
+ if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+ if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {
+ $req_notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'};
+ }
+ }
+ $now = time;
+ $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{$i}{'inst'} = $env{'form.secnum_'.$i};
+ $sections{$i}{'loncapa'} = $env{'form.loncapasec_'.$i};
+ }
+ }
+ }
+ for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+ if ($env{'form.crosslist_'.$i}) {
+ my $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'};
+ $crosslistings{$i}{'inst'} = $xlistinfo;
+ $crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'};
+ }
}
- %sections = ();
- %crosslistings = ();
}
- my ($startaccess,$endaccess) = &dates_from_form('startaccess','endacess');
+
+ 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 '') {
+ 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;
+ 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);
+ }
+ }
+ }
+ }
+ @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @currsec;
+ }
+ }
+ } else {
+ push(@missingdom,$uname.':'.$udom);
+ }
+ } else {
+ push(@baduname,$uname.':'.$udom);
+ }
+ }
+ my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
my $details = {
- owner => $env{'user.name'},
- domain => $env{'user.domain'},
- cdom => $dom,
- cnum => $cnum,
- cdesc => $env{'form.cdesc'},
- crstype => $env{'form.crstype'},
- instcode => $env{'form.instcode'},
- clonedomain => $env{'form.clonedomain'},
- clonecourse => $env{'form.clonecourse'},
- datemode => $env{'form.datemode'},
- dateshift => $env{'form.datshift'},
- sectotal => $env{'form.sectotal'},
- sections => \%sections,
- crosstotal => $env{'form.crosstotal'},
- crosslistings => \%crosslistings,
- autoadds => $env{'form.autoadds'},
- autodrops => $env{'form.autodrops'},
- startenroll => $startenroll,
- endenroll => $endenroll,
- startaccess => $startaccess,
- endaccess => $endaccess,
- personnel => \%personnel
+ owner => $env{'user.name'},
+ domain => $env{'user.domain'},
+ cdom => $dom,
+ cnum => $cnum,
+ coursehome => $env{'form.chome'},
+ cdescr => $env{'form.cdescr'},
+ crstype => $env{'form.crstype'},
+ instcode => $env{'form.instcode'},
+ clonedom => $env{'form.clonedom'},
+ clonecrs => $env{'form.clonecrs'},
+ datemode => $env{'form.datemode'},
+ dateshift => $env{'form.datshift'},
+ sectotal => $env{'form.sectotal'},
+ sections => \%sections,
+ crosslisttotal => $env{'form.crosslisttotal'},
+ crosslists => \%crosslistings,
+ autoadds => $env{'form.autoadds'},
+ autodrops => $env{'form.autodrops'},
+ enrollstart => $enrollstart,
+ enrollend => $enrollend,
+ accessstart => $accessstart,
+ accessend => $accessend,
+ personnel => \%personnel,
};
my @inststatuses;
- my $val = &get_processtype($dom,$crstype,\@inststatuses);
+ my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
if ($crstype eq 'official') {
$output = &mt('You are not permitted to request creation of official courses');
@@ -1377,13 +1622,17 @@ sub print_request_outcome {
} else {
my ($disposition,$message);
my %reqhash = (
- crstype => $crstype,
- details => $details,
+ timestamp => $now,
+ crstype => $crstype,
+ details => $details,
);
my $requestkey = $dom.'_'.$cnum;
- if ($val =~ /^autolimit=/) {
+ if ($val eq 'autolimit=') {
+ $disposition = 'process';
+ } elsif ($val =~ /^autolimit=(\d+)$/) {
+ my $limit = $1;
$disposition = &check_autolimit($env{'user.name'},$env{'user.domain'},
- $dom,$crstype,$val,\$message);
+ $dom,$crstype,$limit,\$message);
} elsif ($val eq 'validate') {
$disposition =
&Apache::lonnet::auto_courserequest_validation($dom,$details,
@@ -1402,15 +1651,22 @@ sub print_request_outcome {
if ($crstype eq 'community') {
$type = 'Community';
}
- my ($logmsg,$newusermsg,$addresult,$enrollcount,$output,$keysmsg,%longroles);
+ 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 %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);
+ 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 $cnum) {
+ if ($cid eq "/$dom/$cnum") {
$disposition = 'created';
$output = &mt('Your course request has been processed and the course has been created.').'<br />'.&mt('You will need to logout and log-in again to be able to select a role in the course.');
} else {
@@ -1424,7 +1680,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,
@@ -1466,18 +1722,24 @@ sub print_request_outcome {
}
}
- my $storeresult = &Apache::lonnet::store_coursereq($requestkey,\%reqhash);
+ my $storeresult;
+ if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+ $storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
+ 'courserequests');
+ } else {
+ $storeresult = 'error: invalid requestkey format';
+ }
if ($storeresult ne 'ok') {
- $output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the details of your request.').'</span><br />';
- &logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
+ $output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the details of your request: [_1].',$storeresult).'</span><br />';
+ &Apache::lonnet::logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
}
}
return $output;
}
sub get_processtype {
- my ($dom,$crstype,$inststatuses) = @_;
- return unless (ref($inststatuses) eq 'ARRAY');
+ my ($dom,$crstype,$inststatuses,$domconfig) = @_;
+ return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH'));
my (%userenv,%settings,$val);
my @options = ('autolimit','validate','approve');
if ($dom eq $env{'user.domain'}) {
@@ -1488,10 +1750,9 @@ sub get_processtype {
$val = $userenv{'requestcourses.'.$crstype};
@{$inststatuses} = ('_custom_');
} else {
- my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
my ($task,%alltasks);
- if (ref($domconfig{'requestcourses'}) eq 'HASH') {
- %settings = %{$domconfig{'requestcourses'}};
+ if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
+ %settings = %{$domconfig->{'requestcourses'}};
if (ref($settings{$crstype}) eq 'HASH') {
if (($env{'user.adv'}) && (exists($settings{$crstype}{'_LC_adv'}))) {
$val = $settings{$crstype}{'_LC_adv'};
@@ -1500,7 +1761,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})) {
@@ -1518,6 +1779,7 @@ sub get_processtype {
}
}
my $maxlimit = 0;
+
foreach my $key (sort(keys(%alltasks))) {
if ($key =~ /^autolimit=(\d*)$/) {
if ($1 eq '') {
@@ -1558,14 +1820,67 @@ sub get_processtype {
}
sub check_autolimit {
+ my ($uname,$udom,$dom,$crstype,$limit,$message) = @_;
+ my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},
+ 'userroles',['active','future'],['cc'],[$dom]);
+ my ($types,$typename) = &course_types();
+ my %requests = &Apache::lonnet::dumpstore('courserequests',$udom,$uname);
+ my %count;
+ if (ref($types) eq 'ARRAY') {
+ foreach my $type (@{$types}) {
+ $count{$type} = 0;
+ }
+ }
+ foreach my $key (keys(%requests)) {
+ my ($cdom,$cnum) = split('_',$key);
+ if (exists($crsroles{$cnum.':'.$cdom.':cc'})) {
+ if (ref($requests{$key}) eq 'HASH') {
+ my $type = $requests{$key}{'crstype'};
+ if ($type =~ /^official|unofficial|community$/) {
+ $count{$type} ++;
+ }
+ }
+ }
+ }
+ if ($count{$crstype} < $limit) {
+ return 'process';
+ } else {
+ if (ref($typename) eq 'HASH') {
+ $$message = &mt('Your request has not been processed because you have reached the limit for the number of courses of this type.').'<br />'.&mt("Your $typename->{$crstype} limit is [_1].",$limit);
+ }
+ return 'rejected';
+ }
return;
}
sub build_batchcreatehash {
- my ($details) = @_;
+ my ($dom,$details,$owneremail,$domdefs) = @_;
my %batchhash;
- if (ref($details) eq 'HASH') {
-
+ 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};
+ }
+ $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';
+ } else {
+ $batchhash{'crstype'} = 'Course';
+ }
+ $batchhash{'users'}{$details->{$owner}} = {
+ firstname => $env{'environment.first'},
+ lastname => $env{'environment.last'},
+ emailenc => $emailenc,
+ email => $owneremail,
+ };
}
return %batchhash;
}
@@ -1575,16 +1890,16 @@ sub retrieve_settings {
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'};