loncom/interface/lonrequestcourse.pm - diff

Return to lonrequestcourse.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonrequestcourse.pm between versions 1.10 and 1.13

version 1.10, 2009/08/12 12:40:33	version 1.13, 2009/08/15 01:59:04
Line 44 described at http://www.lon-capa.org.	Line 44 described at http://www.lon-capa.org.

=item handler()	=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	=back

=cut	=cut
Line 181 sub handler {	Line 237 sub handler {
}	}
} elsif ($action eq 'view') {	} elsif ($action eq 'view') {
if ($state eq 'crstype') {	if ($state eq 'crstype') {
&print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);	&print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);
} elsif ($state eq 'pick_request') {	} else {
$r->print(&print_request_status($dom,$crumb));	&request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
	$loaditems,$crumb);
}	}
} elsif ($action eq 'log') {	} elsif ($action eq 'log') {
&print_request_logs($jscript,$loaditems,$crumb);	&print_request_logs($jscript,$loaditems,$crumb);
Line 219 sub form_elements {	Line 276 sub form_elements {
},	},
courseinfo => {	courseinfo => {
cdescr => 'text',	cdescr => 'text',
clonecourse => 'text',	clonecrs => 'text',
clonedomain => 'selectbox',	clonedom => 'selectbox',
datemode => 'radio',	datemode => 'radio',
dateshift => 'text',	dateshift => 'text',
},	},
enrollment => {	enrollment => {
startaccess_month => 'selectbox',	accessstart_month => 'selectbox',
startaccess_hour => 'selectbox',	accessstart_hour => 'selectbox',
endaccess_month => 'selectbox',	accessend_month => 'selectbox',
endaccess_hour => 'selectbox',	accessend_hour => 'selectbox',
startaccess_day => 'text',	accessstart_day => 'text',
startaccess_year => 'text',	accessstart_year => 'text',
startaccess_minute => 'text',	accessstart_minute => 'text',
startaccess_second => 'text',	accessstart_second => 'text',
endaccess_day => 'text',	accessend_day => 'text',
endaccess_year => 'text',	accessend_year => 'text',
endaccess_minute => 'text',	accessend_minute => 'text',
endaccess_second => 'text',	accessend_second => 'text',
no_end_date => 'checkbox',	no_end_date => 'checkbox',
},	},
personnel => {	personnel => {
persontotal => 'hidden',	persontotal => 'hidden',
addperson => 'checkbox',	addperson => 'checkbox',
},	},
	review => {
	cnum => 'hidden',
	},
},	},
view => {	view => {
crstype => {	crstype => {
Line 251 sub form_elements {	Line 311 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);	my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem);
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,	&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);	\%cat_order,\@code_order);
Line 267 sub form_elements {	Line 334 sub form_elements {
if (&Apache::lonnet::auto_run('',$dom)) {	if (&Apache::lonnet::auto_run('',$dom)) {
my %extras = (	my %extras = (
sectotal => 'hidden',	sectotal => 'hidden',
startenroll_month => 'selectbox',	enrollstart_month => 'selectbox',
startenroll_hour => 'selectbox',	enrollstart_hour => 'selectbox',
endenroll_month => 'selectbox',	enrollend_month => 'selectbox',
endenroll_hour => 'selectbox',	enrollend_hour => 'selectbox',
startenroll_day => 'text',	enrollstart_day => 'text',
startenroll_year => 'text',	enrollstart_year => 'text',
startenroll_minute => 'text',	enrollstart_minute => 'text',
startenroll_second => 'text',	enrollstart_second => 'text',
endenroll_day => 'text',	enrollend_day => 'text',
endenroll_year => 'text',	enrollend_year => 'text',
endenroll_minute => 'text',	enrollend_minute => 'text',
endenroll_second => 'text',	enrollend_second => 'text',
crosslisttotal => 'hidden',	crosslisttotal => 'hidden',
addcrosslist => 'checkbox',	addcrosslist => 'checkbox',
autoadds => 'radio',	autoadds => 'radio',
Line 319 sub form_elements {	Line 386 sub form_elements {
$persontotal = 1;	$persontotal = 1;
}	}
for (my $i=0; $i<$persontotal; $i++) {	for (my $i=0; $i<$persontotal; $i++) {
$people{'person_'.$i.'_uname'} = 'text',	$people{'person_'.$i.'_uname'} = 'text',
$people{'person_'.$i.'_dom'} = 'selectbox',	$people{'person_'.$i.'_dom'} = 'selectbox',
$people{'person_'.$i.'_hidedom'} = 'hidden',	$people{'person_'.$i.'_hidedom'} = 'hidden',
$people{'person_'.$i.'_first'} = 'text',	$people{'person_'.$i.'_firstname'} = 'text',
$people{'person_'.$i.'_last'} = 'text',	$people{'person_'.$i.'_lastname'} = 'text',
$people{'person_'.$i.'_email'} = 'text',	$people{'person_'.$i.'_emailaddr'} = 'text',
$people{'person_'.$i.'_role'} = 'selectbox',	$people{'person_'.$i.'_role'} = 'selectbox',
$people{'person_'.$i.'_sec'} = 'selectbox',	$people{'person_'.$i.'_sec'} = 'selectbox',
$people{'person_'.$i.'_newsec'} = 'text',	$people{'person_'.$i.'_newsec'} = 'text',
$people{'person_'.$i.'_sections'} = 'hidden',	$people{'person_'.$i.'_sections'} = 'hidden',
}	}
my %personnelhash = (%{$elements{'new'}{'personnel'}},%people);	my %personnelhash = (%{$elements{'new'}{'personnel'}},%people);
%{$elements{'new'}{'personnel'}} = %personnelhash;	%{$elements{'new'}{'personnel'}} = %personnelhash;
Line 545 END	Line 612 END
&print_request_form($r,$action,$state,$page,$states,$dom);	&print_request_form($r,$action,$state,$page,$states,$dom);
} elsif ($action eq 'view') {	} elsif ($action eq 'view') {
$r->print(&header('Manage course requests',$js.$jscript,$loaditems).$crumb);	$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') {	} 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());	$r->print(&Apache::loncommon::end_page());
return;	return;
Line 647 sub print_request_form {	Line 717 sub print_request_form {
\%cat_order,\@code_order);	\%cat_order,\@code_order);
}	}
my $result = &print_request_outcome($dom,\@codetitles,\@code_order);	my $result = &print_request_outcome($dom,\@codetitles,\@code_order);
	$r->print($result);
}	}
my @excluded = ('counter');	my @excluded = ('counter');
my %elements = &form_elements($dom);	my %elements = &form_elements($dom);
Line 815 sub print_personnel_menu {	Line 886 sub print_personnel_menu {
$persontotal ++;	$persontotal ++;
}	}
my $userlinktxt = &mt('Set User');	my $userlinktxt = &mt('Set User');
my @items = ('uname','dom','last','first','email','hidedom');	my @items = ('uname','dom','lastname','firstname','emailaddr','hidedom');

my $roleoptions;	my $roleoptions;
my @roles = &Apache::lonuserutils::roles_by_context('course');	my @roles = &Apache::lonuserutils::roles_by_context('course');
Line 903 sub print_personnel_menu {	Line 974 sub print_personnel_menu {
'</span>').	'</span>').
'<table><tr><td align="center" valign="top">'.&mt('Username').'<br />'.$uname_form.'</td>'."\n".	'<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" 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('First Name').'<br />'.$form_elems{'firstname'}.'</td>'."\n".
'<td align="center" valign="top">'.&mt('Last Name').'<br />'.$form_elems{'last'}.'</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{email}.'</td></tr>'."\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".	'<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".	'<td'.$seccolspan.' align="center" valign="top">'.&mt('Section(s)').'<br />'.$sectionselector.'</td>'."\n".
'</tr></table>'.&Apache::lonhtmlcommon::row_closure();	'</tr></table>'.&Apache::lonhtmlcommon::row_closure();
Line 920 sub print_personnel_menu {	Line 991 sub print_personnel_menu {
}	}

sub print_request_status {	sub print_request_status {
my ($dom,$crumb) = @_;	my ($dom) = @_;
my $js = <<END;

function backPage(formname,prevstate) {
formname.state.value = prevstate;
formname.submit();
}

END
my $output = &header('Course Requests',$js).$crumb;
my %requests = &Apache::lonnet::dumpstore('courserequests',$env{'user.domain'},	my %requests = &Apache::lonnet::dumpstore('courserequests',$env{'user.domain'},
$env{'user.name'});	$env{'user.name'});
my %queue_by_date;	my ($output,$formname,%queue_by_date);
foreach my $key (keys(%requests)) {	foreach my $key (keys(%requests)) {
if (ref($requests{$key}) eq 'HASH') {	if (ref($requests{$key}) eq 'HASH') {
my ($cdom,$cnum) = split('_',$key);	my ($cdom,$cnum) = split('_',$key);
Line 945 END	Line 1007 END
($env{'form.crstype'} eq $crstype));	($env{'form.crstype'} eq $crstype));
next unless (($status eq 'approval') \|\| ($status eq 'pending'));	next unless (($status eq 'approval') \|\| ($status eq 'pending'));
if (ref($requests{$key}{'details'}) eq 'HASH') {	if (ref($requests{$key}{'details'}) eq 'HASH') {
$entry = $key.':'.$crstype.':'.$requests{$key}{'details'}{'cdesc'};	$entry = $key.':'.$crstype.':'.$requests{$key}{'details'}{'cdescr'};
if ($crstype eq 'official') {	if ($crstype eq 'official') {
$entry .= ':'.$requests{$key}{'details'}{'instcode'};	$entry .= ':'.$requests{$key}{'details'}{'instcode'};
}	}
Line 961 END	Line 1023 END
}	}
}	}
}	}
my $formname = 'requestcrs';	$formname = 'requestcrs';
my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));	my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
$output .= '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />'."\n".	$output = '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />'."\n".
'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\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="state" value="'.$env{'form.state'}.'" />'."\n".
'<input type="hidden" name="crstype" value="'.$env{'form.crstype'}.'" />'."\n";	'<input type="hidden" name="crstype" value="'.$env{'form.crstype'}.'" />'."\n";
Line 1004 END	Line 1066 END
}	}
$output .= &Apache::loncommon::end_data_table();	$output .= &Apache::loncommon::end_data_table();
} else {	} else {
$output .= '<div class="LC_info">'.&mt('You have no course requests pending approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';	$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 .= '	$output .= '
<input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />	<input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />
</form>'.	</form>';
&Apache::loncommon::end_page();
return $output;	return $output;
}	}

Line 1066 sub print_review {	Line 1127 sub print_review {
$section_headers = '<th>'.&mt('Sections').'</th>'.	$section_headers = '<th>'.&mt('Sections').'</th>'.
'<th>'.&mt('Crosslistings').'</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'));	my @autoroster = (&mt('No'),&mt('Yes'));
$enroll_values = '<td>'.$autoroster[$env{'form.autoadds'}].'</td>'.	$enroll_values = '<td>'.$autoroster[$env{'form.autoadds'}].'</td>'.
'<td>'.$autoroster[$env{'form.autodrops'}].'</td>'.	'<td>'.$autoroster[$env{'form.autodrops'}].'</td>'.
'<td>'.&Apache::lonlocal::locallocaltime($startenroll).'</td>'.	'<td>'.&Apache::lonlocal::locallocaltime($enrollstart).'</td>'.
'<td>'.&Apache::lonlocal::locallocaltime($endenroll).'</td>';	'<td>'.&Apache::lonlocal::locallocaltime($enrollend).'</td>';
$section_values = '<td><table class="LC_innerpickbox"><tr><th>'.	$section_values = '<td><table class="LC_innerpickbox"><tr><th>'.
&mt('Institutional section').'</th>'.	&mt('Institutional section').'</th>'.
'<th>'.&mt('LON-CAPA section').'</th></tr>';	'<th>'.&mt('LON-CAPA section').'</th></tr>';
Line 1127 sub print_review {	Line 1188 sub print_review {

my %ctxt = &clone_text();	my %ctxt = &clone_text();
$inst_headers .= '<th>'.&mt('Clone From').'</th>';	$inst_headers .= '<th>'.&mt('Clone From').'</th>';
if (($env{'form.clonecourse'} =~ /^$match_name$/) &&	if (($env{'form.clonecrs'} =~ /^$match_name$/) &&
($env{'form.clonedomain'} =~ /^$match_domain$/)) {	($env{'form.clonedom'} =~ /^$match_domain$/)) {
my %coursehash =	my %coursehash =
&Apache::lonnet::courseiddump($env{'form.clonedomain'},'.',1,'.','.',	&Apache::lonnet::courseiddump($env{'form.clonedom'},'.',1,'.','.',
$env{'form.clonecourse'},undef,undef,'.');	$env{'form.clonecrs'},undef,undef,'.');
my $cloneid = $env{'form.clonedomain'}.'_'.$env{'form.clonecourse'};	my $cloneid = $env{'form.clonedom'}.'_'.$env{'form.clonecrs'};
if (ref($coursehash{$cloneid}) eq 'HASH') {	if (ref($coursehash{$cloneid}) eq 'HASH') {
$inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';	$inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
my $clonedesc = $coursehash{$cloneid}{'description'};	my $clonedesc = $coursehash{$cloneid}{'description'};
Line 1140 sub print_review {	Line 1201 sub print_review {

$inst_values .= '<td>'.$clonedesc.' ';	$inst_values .= '<td>'.$clonedesc.' ';
if ($cloneinst ne '') {	if ($cloneinst ne '') {
$inst_values .= &mt('([_1] in [_2])',$cloneinst,$env{'form.clonedomain'});	$inst_values .= &mt('([_1] in [_2])',$cloneinst,$env{'form.clonedom'});
} else {	} else {
$inst_values .= &mt('(from [_1])',$env{'form.clonedomain'});	$inst_values .= &mt('(from [_1])',$env{'form.clonedom'});
}	}
$inst_values .= '</td><td>';	$inst_values .= '</td><td>';
if ($env{'form.datemode'} eq 'preserve') {	if ($env{'form.datemode'} eq 'preserve') {
Line 1161 sub print_review {	Line 1222 sub print_review {
}	}
$enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.	$enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
'<th>'.&mt('Access Ends').'</th>';	'<th>'.&mt('Access Ends').'</th>';
my ($startaccess,$endaccess) = &dates_from_form('startaccess','endaccess');	my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
$enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($startaccess).'</td>';	$enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart).'</td>';
if ($endaccess == 0) {	if ($accessend == 0) {
$enroll_values .= '<td>'.&mt('No end date').'</td>';	$enroll_values .= '<td>'.&mt('No end date').'</td>';
} else {	} else {
$enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($endaccess).'</td>';	$enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend).'</td>';
}	}

my $container = 'Course';	my $container = 'Course';
Line 1183 sub print_review {	Line 1244 sub print_review {
for (my $i=0; $i<$env{'form.persontotal'}; $i++) {	for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
if ($env{'form.person_'.$i.'_uname'} ne '') {	if ($env{'form.person_'.$i.'_uname'} ne '') {
$personnel_values .=	$personnel_values .=
'<tr><td>'.$env{'form.person_'.$i.'_first'}.' '.	'<tr><td>'.$env{'form.person_'.$i.'_firstname'}.' '.
$env{'form.person_'.$i.'_last'}.'</td>'.	$env{'form.person_'.$i.'_lastname'}.'</td>'.
'<td>'.$env{'form.person_'.$i.'_uname'}.':'.	'<td>'.$env{'form.person_'.$i.'_uname'}.':'.
$env{'form.person_'.$i.'_dom'}.'</td>'.	$env{'form.person_'.$i.'_dom'}.'</td>'.
'<td>'.&Apache::lonnet::plaintext($env{'form.person_'.$i.'_role'},	'<td>'.&Apache::lonnet::plaintext($env{'form.person_'.$i.'_role'},
Line 1232 sub dates_from_form {	Line 1293 sub dates_from_form {
my ($startname,$endname) = @_;	my ($startname,$endname) = @_;
my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname);	my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname);
my $enddate = &Apache::lonhtmlcommon::get_date_from_form($endname);	my $enddate = &Apache::lonhtmlcommon::get_date_from_form($endname);
if ($endname eq 'endaccess') {	if ($endname eq 'accessend') {
if (exists($env{'form.no_end_date'}) ) {	if (exists($env{'form.no_end_date'}) ) {
$enddate = 0;	$enddate = 0;
}	}
Line 1244 sub courseinfo_form {	Line 1305 sub courseinfo_form {
my ($dom,$formname,$crstype) = @_;	my ($dom,$formname,$crstype) = @_;
my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box().	my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title('Course Description').	&Apache::lonhtmlcommon::row_title('Course Description').
'<input type="text" size="40" name="cdescr" />'.	'<input type="text" size="40" name="cdescr" />';
&Apache::lonhtmlcommon::row_closure(1).	my ($home_server_pick,$numlib) =
&Apache::lonhtmlcommon::end_pick_box().'</div>'.	&Apache::loncommon::home_server_form_item($dom,'chome',
'<div>'.&clone_form($dom,$formname,$crstype).'</div>'."\n";	'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;	return $output;
}	}

Line 1257 sub clone_form {	Line 1327 sub clone_form {
if ($crstype eq 'community') {	if ($crstype eq 'community') {
$type = 'Community';	$type = 'Community';
}	}
my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedomain').	my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').
&Apache::loncommon::selectcourse_link($formname,'clonecourse','clonedomain','','','',$type);	&Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
my %lt = &clone_text();	my %lt = &clone_text();
my $output .=	my $output .=
&Apache::lonhtmlcommon::start_pick_box().	&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.	&Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
'<input type="text" size="25" name="clonecourse" value="" onfocus="this.blur();'.	'<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();'.
'opencrsbrowser('."'$formname','clonecourse','clonedomain','','','','$type'".');" />'.	'opencrsbrowser('."'$formname','clonecrs','clonedom','','','','$type'".');" />'.
'</label>'.&Apache::lonhtmlcommon::row_closure(1).'<label>'.	'</label>'.&Apache::lonhtmlcommon::row_closure(1).'<label>'.
&Apache::lonhtmlcommon::row_title($lt{'dmn'}).'</label>'.	&Apache::lonhtmlcommon::row_title($lt{'dmn'}).'</label>'.
$cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure().	$cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure().
Line 1419 sub display_navbuttons {	Line 1489 sub display_navbuttons {

sub print_request_outcome {	sub print_request_outcome {
my ($dom,$codetitles,$code_order) = @_;	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,);	%sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
$cnum = $env{'form.cnum'};	$cnum = $env{'form.cnum'};
unless ($cnum =~ /^$match_courseid$/) {	unless ($cnum =~ /^$match_courseid$/) {
$output = &mt('Invalid LON-CAPA course number for the new course')."\n";	$output = &mt('Invalid LON-CAPA course number for the new course')."\n";
return $output;	return $output;
}	}

%domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);	%domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
if (ref($domconfig{'requestcourses'}) eq 'HASH') {	if (ref($domconfig{'requestcourses'}) eq 'HASH') {
if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {	if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {
Line 1436 sub print_request_outcome {	Line 1507 sub print_request_outcome {
$crstype = $env{'form.crstype'};	$crstype = $env{'form.crstype'};
if ($crstype eq 'official') {	if ($crstype eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {	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++) {	for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
if ($env{'form.sec_'.$i}) {	if ($env{'form.sec_'.$i}) {
if ($env{'form.secnum_'.$i} ne '') {	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};
}	}
}	}
}	}
Line 1456 sub print_request_outcome {	Line 1528 sub print_request_outcome {
}	}
}	}
$xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'};	$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'};
}	}
}	}
}	}
Line 1466 sub print_request_outcome {	Line 1539 sub print_request_outcome {
my $udom = $env{'form.person_'.$i.'_uname'};	my $udom = $env{'form.person_'.$i.'_uname'};
if (($uname =~ /^$match_username$/) && ($udom =~ /^$match_domain$/)) {	if (($uname =~ /^$match_username$/) && ($udom =~ /^$match_domain$/)) {
if (&Apache::lonnet::domain($udom) ne '') {	if (&Apache::lonnet::domain($udom) ne '') {
$personnel{$uname.':'.$udom} = {	unless (ref($personnel{$uname.':'.$udom}) eq 'HASH') {
first => $env{'form.person_'.$i.'_first'},	$personnel{$uname.':'.$udom} = {
last => $env{'form.person_'.$i.'_last'},	firstname => $env{'form.person_'.$i.'_firstname'},
email => $env{'form.person_'.$i.'_email'},	lastname => $env{'form.person_'.$i.'_lastname'},
role => $env{'form.person_'.$i.'_role'},	emailaddr => $env{'form.person_'.$i.'_emailaddr'},
sections => $env{'form.person_'.$i.'_sections'},	};
};	}
	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 {	} else {
push(@missingdom,$uname.':'.$udom);	push(@missingdom,$uname.':'.$udom);
}	}
Line 1480 sub print_request_outcome {	Line 1581 sub print_request_outcome {
push(@baduname,$uname.':'.$udom);	push(@baduname,$uname.':'.$udom);
}	}
}	}
	my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
my ($startaccess,$endaccess) = &dates_from_form('startaccess','endacess');
my $details = {	my $details = {
owner => $env{'user.name'},	owner => $env{'user.name'},
domain => $env{'user.domain'},	domain => $env{'user.domain'},
cdom => $dom,	cdom => $dom,
cnum => $cnum,	cnum => $cnum,
cdesc => $env{'form.cdesc'},	coursehome => $env{'form.chome'},
	cdescr => $env{'form.cdescr'},
crstype => $env{'form.crstype'},	crstype => $env{'form.crstype'},
instcode => $env{'form.instcode'},	instcode => $env{'form.instcode'},
clonedomain => $env{'form.clonedomain'},	clonedom => $env{'form.clonedom'},
clonecourse => $env{'form.clonecourse'},	clonecrs => $env{'form.clonecrs'},
datemode => $env{'form.datemode'},	datemode => $env{'form.datemode'},
dateshift => $env{'form.datshift'},	dateshift => $env{'form.datshift'},
sectotal => $env{'form.sectotal'},	sectotal => $env{'form.sectotal'},
sections => \%sections,	sections => \%sections,
crosslisttotal => $env{'form.crosslisttotal'},	crosslisttotal => $env{'form.crosslisttotal'},
crosslistings => \%crosslistings,	crosslists => \%crosslistings,
autoadds => $env{'form.autoadds'},	autoadds => $env{'form.autoadds'},
autodrops => $env{'form.autodrops'},	autodrops => $env{'form.autodrops'},
startenroll => $startenroll,	enrollstart => $enrollstart,
endenroll => $endenroll,	enrollend => $enrollend,
startaccess => $startaccess,	accessstart => $accessstart,
endaccess => $endaccess,	accessend => $accessend,
personnel => \%personnel,	personnel => \%personnel,
};	};
my @inststatuses;	my @inststatuses;
Line 1550 sub print_request_outcome {	Line 1651 sub print_request_outcome {
if ($crstype eq 'community') {	if ($crstype eq 'community') {
$type = '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');	my @roles = &Apache::lonuserutils::roles_by_context('course');
foreach my $role (@roles) {	foreach my $role (@roles) {
$longroles{$role}=&Apache::lonnet::plaintext($role,$type);	$longroles{$role}=&Apache::lonnet::plaintext($role,$type);
}	}
my %reqdetails = &build_batchcreatehash($details);	my $owneremail;
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 %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';	$disposition = 'created';
if ($cid eq $cnum) {	if ($cid eq "/$dom/$cnum") {
$disposition = 'created';	$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.');	$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 {	} else {
Line 1572 sub print_request_outcome {	Line 1680 sub print_request_outcome {
crstype => $crstype,	crstype => $crstype,
ownername => $env{'user.name'},	ownername => $env{'user.name'},
ownerdom => $env{'user.domain'},	ownerdom => $env{'user.domain'},
description => $env{'form.cdesc'},	description => $env{'form.cdescr'},
},	},
};	};
my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,	my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
Line 1622 sub print_request_outcome {	Line 1730 sub print_request_outcome {
$storeresult = 'error: invalid requestkey format';	$storeresult = 'error: invalid requestkey format';
}	}
if ($storeresult ne 'ok') {	if ($storeresult ne 'ok') {
$output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the details of your request.').'</span><br />';	$output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the details of your request: [_1].',$storeresult).'</span><br />';
&logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");	&Apache::lonnet::logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
}	}
}	}
return $output;	return $output;
Line 1653 sub get_processtype {	Line 1761 sub get_processtype {
if ($userenv{'inststatus'} ne '') {	if ($userenv{'inststatus'} ne '') {
@{$inststatuses} = split(',',$userenv{'inststatus'});	@{$inststatuses} = split(',',$userenv{'inststatus'});
} else {	} else {
@{$inststatuses} = ('other');	@{$inststatuses} = ('default');
}	}
foreach my $status (@{$inststatuses}) {	foreach my $status (@{$inststatuses}) {
if (exists($settings{$crstype}{$status})) {	if (exists($settings{$crstype}{$status})) {
Line 1671 sub get_processtype {	Line 1779 sub get_processtype {
}	}
}	}
my $maxlimit = 0;	my $maxlimit = 0;

foreach my $key (sort(keys(%alltasks))) {	foreach my $key (sort(keys(%alltasks))) {
if ($key =~ /^autolimit=(\d*)$/) {	if ($key =~ /^autolimit=(\d*)$/) {
if ($1 eq '') {	if ($1 eq '') {
Line 1745 sub check_autolimit {	Line 1854 sub check_autolimit {
}	}

sub build_batchcreatehash {	sub build_batchcreatehash {
my ($details) = @_;	my ($dom,$details,$owneremail,$domdefs) = @_;
my %batchhash;	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;	return %batchhash;
}	}
Line 1758 sub retrieve_settings {	Line 1890 sub retrieve_settings {
my %reqinfo = &get_request_settings($request_id,$dom);	my %reqinfo = &get_request_settings($request_id,$dom);
my %stored;	my %stored;
$stored{'cdescr'} = &unescape($reqinfo{'description'});	$stored{'cdescr'} = &unescape($reqinfo{'description'});
$stored{'startaccess'} = $reqinfo{'startaccess'};	$stored{'accessstart'} = $reqinfo{'accessstart'};
$stored{'endaccess'} = $reqinfo{'endaccess'};	$stored{'accessend'} = $reqinfo{'accessend'};
if ($stored{'endaccess'} == 0) {	if ($stored{'accessend'} == 0) {
$stored{'no_end_date'} = 1;	$stored{'no_end_date'} = 1;
}	}
$stored{'startenroll'} = $reqinfo{'startenroll'};	$stored{'enrollstart'} = $reqinfo{'enrollstart'};
$stored{'endenroll'} = $reqinfo{'endenroll'};	$stored{'enrollend'} = $reqinfo{'enrollend'};
$stored{'crosslist'} = $reqinfo{'crosslist'};	$stored{'crosslist'} = $reqinfo{'crosslist'};
$stored{'clonecourse'} = $reqinfo{'clonecourse'};	$stored{'clonecrs'} = $reqinfo{'clonecrs'};
$stored{'clonedomain'} = $reqinfo{'clonedomain'};	$stored{'clonedom'} = $reqinfo{'clonedom'};
$stored{'sections'} = $reqinfo{'sections'};	$stored{'sections'} = $reqinfo{'sections'};
$stored{'personnel'} = $reqinfo{'personnel'};	$stored{'personnel'} = $reqinfo{'personnel'};

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.10
changed lines
	Added in v.1.13