--- loncom/interface/lonrequestcourse.pm 2009/08/25 14:59:53 1.25
+++ loncom/interface/lonrequestcourse.pm 2009/09/08 13:05:00 1.31
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.25 2009/08/25 14:59:53 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.31 2009/09/08 13:05:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,6 +44,8 @@ described at http://www.lon-capa.org.
=item handler()
+=item get_breadcrumbs()
+
=item header()
=item form_elements()
@@ -58,10 +60,16 @@ described at http://www.lon-capa.org.
=item request_administration()
+=item close_popup_form()
+
+=item get_instcode()
+
=item print_request_form()
=item print_enrollment_menu()
+=item show_invalid_crosslists()
+
=item inst_section_selector()
=item date_setting_table()
@@ -94,12 +102,14 @@ described at http://www.lon-capa.org.
=item check_autolimit()
-=item build_batchcreatehash()
-
=item retrieve_settings()
=item get_request_settings()
+=item extract_instcode()
+
+=item generate_date_items()
+
=back
=cut
@@ -112,6 +122,7 @@ use Apache::lonnet;
use Apache::loncommon;
use Apache::lonlocal;
use Apache::loncoursequeueadmin;
+use Apache::lonuserutils;
use LONCAPA qw(:DEFAULT :match);
sub handler {
@@ -122,38 +133,16 @@ sub handler {
return OK;
}
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['action','showdom','cnum','state']);
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $dom = &get_course_dom();
my $action = $env{'form.action'};
my $state = $env{'form.state'};
- my %stored;
- my $jscript;
- if ((defined($state)) && (defined($action))) {
- if (($action eq 'view') && ($state eq 'details')) {
- if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) {
- my $result = &retrieve_settings($env{'form.showdom'},$env{'form.cnum'});
- }
- }
- my %elements = &form_elements($dom);
- my $elementsref = {};
- if (ref($elements{$action}) eq 'HASH') {
- if (ref($elements{$action}{$state}) eq 'HASH') {
- $elementsref = $elements{$action}{$state};
- }
- }
- if (($state eq 'courseinfo') && ($env{'form.clonedom'} eq '')) {
- $env{'form.clonedom'} = $dom;
- }
- $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
- }
-
- if ($state eq 'personnel') {
- $jscript .= "\n".&Apache::loncommon::userbrowser_javascript();
- }
+ my (%states,%stored);
+ my ($jscript,$uname,$udom,$result,$warning);
- my $loaditems = &onload_action($action,$state);
-
- my %states;
+ $states{'display'} = ['details'];
$states{'view'} = ['pick_request','details','cancel','removal'];
$states{'log'} = ['filter','display'];
$states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
@@ -170,6 +159,7 @@ sub handler {
}
}
+ my @invalidcrosslist;
my %trail = (
crstype => 'Course Request Action',
codepick => 'Category',
@@ -186,46 +176,106 @@ sub handler {
if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
$trail{'enrollment'} = 'Enrollment';
- }
+ }
- my $page = 0;
- my $crumb;
- if (defined($action)) {
- my $done = 0;
- my $i=0;
- if (ref($states{$action}) eq 'ARRAY') {
- while ($i<@{$states{$action}} && !$done) {
- if ($states{$action}[$i] eq $state) {
- $page = $i;
- $done = 1;
- }
- $i++;
- }
- }
- for (my $i=0; $i<@{$states{$action}}; $i++) {
- if ($state eq $states{$action}[$i]) {
- &Apache::lonhtmlcommon::add_breadcrumb(
- {text=>"$trail{$state}"});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
- last;
- } else {
- if (($state eq 'process') && ($i > 0)) {
- &Apache::lonhtmlcommon::add_breadcrumb(
- {href=>"javascript:backPage(document.requestcrs,'$states{$action}[0]')",
- text=>"$trail{$states{$action}[$i]}"});
+ my ($page,$crumb,$newinstcode,$codechk,$checkedcode) =
+ &get_breadcrumbs($dom,$action,\$state,\%states,\%trail);
+ if ($action eq 'display') {
+ if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
+ my $namespace = 'courserequestqueue';
+ if ($env{'form.cnum'} ne '') {
+ my $cnum = $env{'form.cnum'};
+ my $reqkey = $cnum.'_approval';
+ my $namespace = 'courserequestqueue';
+ my $domconfig = &Apache::lonnet::get_domainconfiguser($dom);
+ my %queued =
+ &Apache::lonnet::get($namespace,[$reqkey],$dom,$domconfig);
+ if (ref($queued{$reqkey}) eq 'HASH') {
+ $uname = $queued{$reqkey}{'ownername'};
+ $udom = $queued{$reqkey}{'ownerdom'};
+ if (($udom =~ /^$match_domain$/) && ($uname =~ /^$match_username$/)) {
+ $result = &retrieve_settings($dom,$cnum,$udom,$uname);
+ } else {
+ $warning = &mt('Invalid username or domain for course requestor');
+ }
} else {
- &Apache::lonhtmlcommon::add_breadcrumb(
- {href=>"javascript:backPage(document.requestcrs,'$states{$action}[$i]')",
- text=>"$trail{$states{$action}[$i]}"});
+ $warning = &mt('No information was found for this course request.');
}
+ } else {
+ $warning = &mt('No course request ID provided.');
}
+ } else {
+ $warning = &mt('You do not have rights to view course request information.');
+ }
+ } elsif ((defined($state)) && (defined($action))) {
+ if (($action eq 'view') && ($state eq 'details')) {
+ if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) {
+ my $result = &retrieve_settings($env{'form.showdom'},$env{'form.cnum'});
+ }
+ } elsif ($env{'form.crstype'} eq 'official') {
+ if (&Apache::lonnet::auto_run('',$dom)) {
+ if (($action eq 'new') && (($state eq 'enrollment') ||
+ ($state eq 'personnel'))) {
+ my $checkcrosslist = 0;
+ for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+ if ($env{'form.crosslist_'.$i}) {
+ $checkcrosslist ++;
+ }
+ }
+ if ($checkcrosslist) {
+ my %codechk;
+ my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem);
+ &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,
+ \%cat_titles,
+ \%cat_order,
+ \@code_order);
+ my $numtitles = scalar(@codetitles);
+ if ($numtitles) {
+ for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+ if ($env{'form.crosslist_'.$i}) {
+ my $codecheck;
+ my $crosslistcode = '';
+ foreach my $item (@code_order) {
+ $crosslistcode .= $env{'form.crosslist_'.$i.'_'.$item};
+ }
+ if ($crosslistcode ne '') {
+ $codechk{$i} =
+ &Apache::lonnet::auto_validate_instcode('',$dom,$crosslistcode);
+ }
+ unless ($codechk{$i} eq 'valid') {
+ $env{'form.crosslist_'.$i} = '';
+ push(@invalidcrosslist,$crosslistcode);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ my %elements = &form_elements($dom);
+ my $elementsref = {};
+ if (ref($elements{$action}) eq 'HASH') {
+ if (ref($elements{$action}{$state}) eq 'HASH') {
+ $elementsref = $elements{$action}{$state};
+ }
+ }
+ if (($state eq 'courseinfo') && ($env{'form.clonedom'} eq '')) {
+ $env{'form.clonedom'} = $dom;
+ }
+ if ($state eq 'crstype') {
+ $jscript = &mainmenu_javascript();
+ } else {
+ $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
}
- } else {
- &Apache::lonhtmlcommon::add_breadcrumb(
- {text=>'Pick Action'});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
}
+ if ($state eq 'personnel') {
+ $jscript .= "\n".&Apache::loncommon::userbrowser_javascript();
+ }
+
+ my $loaditems = &onload_action($action,$state);
+
my %can_request;
my $canreq = &check_can_request($dom,\%can_request);
if ($action eq 'new') {
@@ -234,8 +284,9 @@ sub handler {
&print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,
$crumb);
} else {
- &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
- $loaditems,$crumb);
+ &request_administration($r,$action,$state,$page,\%states,$dom,
+ $jscript,$loaditems,$crumb,$newinstcode,
+ $codechk,$checkedcode,\@invalidcrosslist);
}
} else {
$r->print(&header('Course Requests').$crumb.
@@ -245,10 +296,21 @@ sub handler {
}
} elsif ($action eq 'view') {
if ($state eq 'crstype') {
- &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);
+ &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,$crumb);
} else {
- &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
- $loaditems,$crumb);
+ &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
+ $loaditems,$crumb);
+ }
+ } elsif ($action eq 'display') {
+ if ($warning ne '') {
+ my $args = { only_body => 1 };
+ $r->print(&header('Course Requests','','',$args).$crumb.
+ '<h3>'.&mt('Course Request Details').'</h3>'.
+ '<div class="LC_warning">'.$warning.'</div>'.
+ &close_popup_form());
+ } else {
+ &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
+ $loaditems,$crumb,'','','','',$uname,$udom);
}
} elsif ($action eq 'log') {
&print_request_logs($jscript,$loaditems,$crumb);
@@ -258,19 +320,124 @@ sub handler {
return OK;
}
+sub mainmenu_javascript {
+ return <<"END";
+function setType(courseForm) {
+ for (var i=0; i<courseForm.crstype.length; i++) {
+ if (courseForm.crstype.options[i].value == "$env{'form.crstype'}") {
+ courseForm.crstype.options[i].selected = true;
+ } else {
+ courseForm.crstype.options[i].selected = false;
+ }
+ }
+}
+
+function setAction(courseForm) {
+ for (var i=0; i<courseForm.action.length; i++) {
+ if (courseForm.action.options[i].value == "$env{'form.action'}") {
+ courseForm.action.options[i].selected = true;
+ } else {
+ courseForm.action.options[i].selected = false;
+ }
+ }
+}
+END
+}
+
+sub get_breadcrumbs {
+ my ($dom,$action,$state,$states,$trail) = @_;
+ my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles);
+ my $page = 0;
+ if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
+ if (defined($action)) {
+ my $done = 0;
+ my $i=0;
+ if (ref($states->{$action}) eq 'ARRAY') {
+ while ($i<@{$states->{$action}} && !$done) {
+ if ($states->{$action}[$i] eq $$state) {
+ $page = $i;
+ $done = 1;
+ }
+ $i++;
+ }
+ }
+ if ($env{'form.crstype'} eq 'official') {
+ if ($page > 1) {
+ if ($states->{$action}[$page-1] eq 'codepick') {
+ if ($env{'form.instcode'} eq '') {
+ ($newinstcode,$numtitles) = &get_instcode($dom);
+ if ($numtitles) {
+ if ($newinstcode eq '') {
+ $$state = 'codepick';
+ $page --;
+ } else {
+ $codechk =
+ &Apache::lonnet::auto_validate_instcode('',
+ $dom,$newinstcode);
+ if ($codechk ne 'valid') {
+ $$state = 'codepick';
+ $page --;
+ }
+ $checkedcode = 1;
+ }
+ }
+ }
+ }
+ }
+ }
+ for (my $i=0; $i<@{$states->{$action}}; $i++) {
+ if ($$state eq $states->{$action}[$i]) {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ {text=>"$trail->{$$state}"});
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+ last;
+ } else {
+ if (($$state eq 'process') || ($$state eq 'removal')) {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ { href => '/adm/requestcourse',
+ text => "$trail->{$states->{$action}[$i]}",
+ }
+ );
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ { href => "javascript:backPage(document.requestcrs,'$states->{$action}[$i]')",
+ text => "$trail->{$states->{$action}[$i]}", }
+ );
+ }
+ }
+ }
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ {text=>'Pick Action'});
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+ }
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ {text=>'Pick Action'});
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+ }
+ return ($page,$crumb,$newinstcode,$codechk,$checkedcode);
+}
+
sub header {
- my ($bodytitle,$jscript,$loaditems,$jsextra) = @_;
+ my ($bodytitle,$jscript,$loaditems,$jsextra,$args) = @_;
if ($jscript) {
$jscript = '<script type="text/javascript">'."\n".
'// <![CDATA['."\n".
$jscript."\n".'// ]]>'."\n".'</script>'."\n";
}
if ($loaditems) {
- $loaditems = {'add_entries' => $loaditems,};
- return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$loaditems);
- } else {
- return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra);
+ if (ref($args) eq 'HASH') {
+ my %loadhash = (
+ 'add_entries' => $loaditems,
+ );
+ my %arghash = (%loadhash,%{$args});
+ $args = \%arghash;
+ } else {
+ $args = {'add_entries' => $loaditems,};
+ }
}
+ return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$args);
}
sub form_elements {
@@ -354,16 +521,15 @@ sub form_elements {
enrollend_year => 'text',
enrollend_minute => 'text',
enrollend_second => 'text',
- crosslisttotal => 'hidden',
addcrosslist => 'checkbox',
autoadds => 'radio',
autodrops => 'radio',
);
if ($env{'form.sectotal'} > 0) {
for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
- $extras{'sec_'.$i} = 'checkbox',
- $extras{'secnum_'.$i} = 'text',
- $extras{'loncapasec_'.$i} = 'text',
+ $extras{'sec_'.$i} = 'radio';
+ $extras{'secnum_'.$i} = 'text';
+ $extras{'loncapasec_'.$i} = 'text';
}
}
my $crosslisttotal = $env{'form.crosslisttotal'};
@@ -373,6 +539,7 @@ sub form_elements {
if (!$crosslisttotal) {
$crosslisttotal = 1;
}
+
for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
if ($numtitles) {
$extras{'crosslist_'.$i.'_'.$lastitem} = 'text';
@@ -417,7 +584,11 @@ sub onload_action {
my ($action,$state) = @_;
my %loaditems;
if (($action eq 'new') || ($action eq 'view')) {
- $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)';
+ if ($state eq 'crstype') {
+ $loaditems{'onload'} = 'javascript:setAction(document.mainmenu_action);javascript:setType(document.mainmenu_coursetype)';
+ } else {
+ $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)';
+ }
}
return \%loaditems;
}
@@ -489,14 +660,16 @@ sub print_main_menu {
my $js = <<"END";
function nextPage(formname) {
- var crschoice = document.requestcrs.crstype.value;
- var actionchoice = document.requestcrs.action.value;
+ var crschoice = document.mainmenu_coursetype.crstype.value;
+ var actionchoice = document.mainmenu_action.action.value;
if (check_can_request(crschoice,actionchoice) == true) {
if ((actionchoice == 'new') && (crschoice == 'official')) {
nextstate = 'codepick';
} else {
$nextstate_setter
- }
+ }
+ formname.crstype.value = crschoice;
+ formname.action.value = actionchoice;
formname.state.value= nextstate;
formname.submit();
}
@@ -551,33 +724,29 @@ END
END
- $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.
- '<div>'.
- '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
+ $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.'<div>'.
&Apache::lonhtmlcommon::start_pick_box().
- &Apache::lonhtmlcommon::row_title('Course Domain').
+ &Apache::lonhtmlcommon::row_title(&mt('Course Domain')).
+ '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
&Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange));
if (!$onchange) {
$r->print(' <input type="submit" name="godom" value="'.
&mt('Change').'" />');
}
- $r->print(&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'</form></div>');
+ $r->print('</form>'.&Apache::lonhtmlcommon::row_closure());
my $formname = 'requestcrs';
my $nexttext = &mt('Next');
- $r->print(
- '<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'.
- &Apache::lonhtmlcommon::start_pick_box().
- &Apache::lonhtmlcommon::row_title('Action').'
-<input type="hidden" name="showdom" value="'.$dom.'" />
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
+<form name="mainmenu_action" method="post" action="">
<select size="1" name="action" >
<option value="new">'.&mt('New request').'</option>
<option value="view">'.&mt('View/Modify/Cancel pending requests').'</option>
<option value="log">'.&mt('View request history').'</option>
-</select>'.
- &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title('Course Type').'
+</select></form>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_title(&mt('Course Type')).'
+<form name="mainmenu_coursetype" method="post" action="">
<select size="1" name="crstype">
<option value="any">'.&mt('All types').'</option>');
if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
@@ -590,18 +759,24 @@ END
'</option>'."\n");
}
}
- $r->print('</select>
-<input type="hidden" name="state" value="crstype" />'.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'<br />
-<input type="button" name="next" value="'.$nexttext.'" onclick="javascript:nextPage(document.'.$formname.')" />
-</form></div>');
+ $r->print('</select></form>'."\n".
+ &Apache::lonhtmlcommon::row_closure(1)."\n".
+ &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
+ '<div><form name="'.$formname.'" method="post" action="">'."\n".
+ '<input type="hidden" name="state" value="crstype" />'."\n".
+ '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
+ '<input type="hidden" name="crstype" value="" />'."\n".
+ '<input type="hidden" name="action" value="" />'."\n".
+ '<input type="button" name="next" value="'.$nexttext.
+ '" onclick="javascript:nextPage(document.'.$formname.')" />'."\n".
+ '</form></div>');
$r->print(&Apache::loncommon::end_page());
return;
}
sub request_administration {
- my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb) = @_;
+ my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb,
+ $newinstcode,$codechk,$checkedcode,$invalidcrosslist,$uname,$udom) = @_;
my $js;
if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) {
$js = <<END;
@@ -625,11 +800,19 @@ END
}
if ($action eq 'new') {
my $jsextra;
- unless (($state eq 'review') || ($state eq 'process')) {
+ if ($state eq 'courseinfo') {
$jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom);
+ } elsif ($state eq 'enrollment') {
+ if (($env{'form.crstype'} eq 'official') &&
+ (&Apache::lonnet::auto_run('',$dom))) {
+ $js .= "\n".§ion_check_javascript()."\n".&enrollment_lcsec_js();
+ }
+ } elsif ($state eq 'personnel') {
+ $js .= "\n".§ion_check_javascript()."\n".&personnel_lcsec_js();
}
$r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
- &print_request_form($r,$action,$state,$page,$states,$dom);
+ &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
+ $codechk,$checkedcode,$invalidcrosslist);
} elsif ($action eq 'view') {
my $jsextra;
my $formname = 'requestcrs';
@@ -649,7 +832,7 @@ END
my $form = '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />';
if ($state eq 'pick_request') {
$r->print('<h3>'.&mt('Pending course requests').'</h3><div>'."\n".$form."\n".
- &print_request_status($dom).'</form>');
+ &print_request_status($dom).'</form></div>');
} elsif ($state eq 'details') {
my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
my $origcnum = $env{'form.cnum'};
@@ -661,7 +844,7 @@ END
\%cat_order,\@code_order);
}
$r->print('<h3>'.&mt('Course Request Details').'</h3><div>'."\n".$form."\n".
- &print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,
+ &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
\@code_order)."\n".
'<input name="origcnum" value="'.$origcnum.'" type="hidden" />'."\n");
my @excluded = &get_excluded_elements($dom,$states,'new','review');
@@ -673,8 +856,8 @@ END
other => 'Modify Request',
next => 'Cancel Request',
);
- &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},
- $state,$other,$navtxt{'other'});
+ &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+ $navtxt{'next'},$state,$other,$navtxt{'other'});
$r->print('</form>');
} elsif ($state eq 'cancel') {
my ($result,$output) = &print_cancel_request($dom,$env{'form.origcnum'});
@@ -687,10 +870,11 @@ END
next => 'Confirm Cancellation',
);
if ($result eq 'ok') {
- &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,
+ &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
$navtxt{'next'},$state);
} else {
- &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},undef,'',$state);
+ &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},undef,
+ '',$state);
}
$r->print('</form>');
} elsif ($state eq 'removal') {
@@ -734,6 +918,18 @@ END
}
$r->print('</form>');
}
+ } elsif ($action eq 'display') {
+ my $formname = 'requestcrs';
+ my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
+ if ($env{'form.crstype'} eq 'official') {
+ &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+ \%cat_order,\@code_order);
+ }
+ $r->print(&header('Course Request','','','',{ 'only_body' => 1}).
+ $crumb."\n".'<h3>'.&mt('Course Request Details').'</h3>'.
+ &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
+ \@code_order,$uname,$udom)."\n".'</div>'.
+ &close_popup_form());
} elsif ($action eq 'log') {
$r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb);
}
@@ -741,8 +937,194 @@ END
return;
}
+sub enrollment_lcsec_js {
+ my %alerts = §ion_check_alerts();
+ my $secname = $alerts{'badsec'};
+ my $secnone = $alerts{'reserved'};
+ my $output = '
+function validateEnrollSections(formname,nextstate) {
+ var badsectotal = 0;
+ var reservedtotal = 0;
+ var secTest = "";
+';
+ for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
+ $output .= "
+ var selSec = 0;
+ for (var j=0; j<document.requestcrs.sec_".$i.".length; j++) {
+ if (document.requestcrs.sec_".$i."[j].checked) {
+ selSec = document.requestcrs.sec_".$i."[j].value;
+ }
+ if (selSec == 1) {
+ secTest = validsection(document.requestcrs.loncapasec_".$i.");
+ if (secTest == 'badsec') {
+ badsectotal++;
+ }
+ if (secTest == 'reserved') {
+ reservedtotal++;
+ }
+ }
+ }
+";
+ }
+ for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+ $output .= "
+ if (document.requestcrs.crosslist_".$i.".checked) {
+ secTest = validsection(document.requestcrs.crosslist_".$i."_lcsec);
+ if (secTest == 'badsec') {
+ badsectotal++;
+ }
+ if (secTest == 'reserved') {
+ reservedtotal++;
+ }
+ }
+";
+ }
+ $output .= "
+ if (badsectotal>0) {
+ alert('$secname');
+ return false;
+ }
+ if (reservedtotal>0) {
+ alert('$secnone');
+ return false;
+ }
+ formname.state.value= nextstate;
+ formname.submit();
+ return;
+}
+";
+ return $output;
+}
+
+sub personnel_lcsec_js {
+ my %alerts = §ion_check_alerts();
+ my $secname = $alerts{'badsec'}.'\\n'.$alerts{'separate'};
+ my $secnone = $alerts{'reserved'};
+ my $output = '
+function validatePersonnelSections(formname,nextstate) {
+ var badsectotal = 0;
+ var reservedtotal = 0;
+ var secTest = "";
+';
+ for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+ $output .= "
+ if (document.requestcrs.person_".$i."_uname.value != '') {
+ secTest = validsection(document.requestcrs.person_".$i."_newsec,'1');
+ if (secTest == 'badsec') {
+ badsectotal++;
+ }
+ if (secTest == 'reserved') {
+ reservedtotal++;
+ }
+ }
+";
+ }
+ $output .= "
+ if (badsectotal > 0) {
+ alert('$secname');
+ return false;
+ } else {
+ if (reservedtotal > 0) {
+ alert('$secnone');
+ return false;
+ }
+ }
+ formname.state.value = nextstate;
+ formname.submit();
+ return;
+}
+";
+ return $output;
+}
+
+sub section_check_alerts {
+ my %lt =
+ &Apache::lonlocal::texthash(
+ reserved => "You need to change one or more LON-CAPA section names - none is a reserved word in the system, and may not be used.",
+ badsec => 'You need to change one or more LON-CAPA section names - names may only contain letters or numbers.',
+ separate => 'Separate multiple sections with a comma.'
+ );
+ return %lt;
+}
+
+sub section_check_javascript {
+ return <<"END";
+function validsection(field,mult) {
+ var str = field.value;
+ var badsec=0;
+ var reserved=0;
+ if (window.RegExp) {
+ var badsecnum=0;
+ var reservednum=0;
+ var pattern=/[^a-zA-Z0-9]/;
+ str = str.replace(/(^\\s*)|(\\s*\$)/gi,"");
+ str = str.replace(/[ ]{2,}/gi," ");
+ if (mult == '1') {
+ var sections = new Array();
+ sections = str.split(/\\s*[\\s,;:]\\s*/);
+ var i;
+ for (i=0; i<sections.length; i++) {
+ if ((sections[i] != '') && (sections[i] != undefined) && (sections[i] != null)) {
+ if (pattern.test(sections[i])) {
+ badsecnum++;
+ } else {
+ if (sections[i] == 'none') {
+ reservednum++;
+ }
+ }
+ }
+ }
+ } else {
+ if ((str != '') && (str != undefined) && (str != null)) {
+ if (pattern.test(str)) {
+ badsecnum++;
+ } else {
+ if (str == 'none') {
+ reservednum++;
+ }
+ }
+ }
+ }
+ if (badsecnum > 0) {
+ return 'badsec';
+ }
+ if (reservednum > 0) {
+ return 'reserved';
+ }
+ }
+ return;
+}
+END
+}
+
+sub close_popup_form {
+ my $close= &mt('Close Window');
+ return << "END";
+<p><form name="displayreq" action="" method="post">
+<input type="button" name="closeme" value="$close" onclick="javascript:self.close();" />
+</form></p>
+END
+}
+
+sub get_instcode {
+ my ($dom) = @_;
+ my ($instcode,$numtitles);
+ my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
+ &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+ \%cat_order,\@code_order);
+ $numtitles = scalar(@codetitles);
+ if (@code_order > 0) {
+ my $message;
+ foreach my $item (@code_order) {
+ $instcode .= $env{'form.instcode_'.$item};
+ }
+ }
+ return ($instcode,$numtitles);
+}
+
sub print_request_form {
- my ($r,$action,$state,$page,$states,$dom) = @_;
+ my ($r,$action,$state,$page,$states,$dom,$newinstcode,$codechk,$checkedcode,
+ $invalidcrosslist) = @_;
my $formname = 'requestcrs';
my ($next,$prev,$message,$output,$codepicker,$crstype);
$prev = $states->{$action}[$page-1];
@@ -753,44 +1135,28 @@ sub print_request_form {
);
$crstype = $env{'form.crstype'};
$r->print('<form name="'.$formname.'" method="post" action="/adm/requestcourse">');
- my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
+ my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk,
+ @disallowed);
if ($crstype eq 'official') {
if ($env{'form.instcode'} ne '') {
$instcode = $env{'form.instcode'};
+ } elsif ($newinstcode ne '') {
+ $instcode = $newinstcode;
}
- }
- if ($prev eq 'codepick') {
- if ($crstype eq 'official') {
- &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
- \%cat_order,\@code_order);
- }
- if (@code_order > 0) {
- my $message;
- if ($instcode eq '') {
- foreach my $item (@code_order) {
- $instcode .= $env{'form.instcode_'.$item};
- }
- $r->print('<input type="hidden" name="instcode" value="'.$instcode.'" />'."\n");
- }
- if ($instcode ne '') {
- $code_chk = &Apache::lonnet::auto_validate_instcode('',$dom,$instcode);
- if ($code_chk eq 'valid') {
- $message = '<div class="LC_info">'.
- &mt('The chosen course category [_1] is valid.','<b>'.
- $instcode.'</b>').'</div>';
- } else {
- $message = '<div class="LC_warning">'.
- &mt('No course was found matching your choice of institutional course category.');
- if ($code_chk ne '') {
- $message .= '<br />'.$code_chk;
- }
- $message .= '</div>';
- }
+ if ($checkedcode) {
+ if ($codechk eq 'valid') {
+ $message = '<div class="LC_info">'.
+ &mt('The chosen course category [_1] is valid.','<b>'.
+ $instcode.'</b>').
+ '<input type="hidden" name="instcode" value="'.
+ $instcode.'" /></div>';
} else {
$message = '<div class="LC_warning">'.
- &mt('No course was found matching your choice of institutional course category.');
- }
- unless ($code_chk eq 'valid') {
+ &mt('No course was found matching your choice of institutional course category.');
+ if ($codechk ne '') {
+ $message .= '<br />'.$codechk;
+ }
+ $message .= '</div>';
$prev = 'crstype';
}
$r->print($message);
@@ -818,7 +1184,7 @@ sub print_request_form {
$r->print(&courseinfo_form($dom,$formname,$crstype,$next));
}
} elsif ($prev eq 'codepick') {
- if ($env{'form.instcode'} eq '') {
+ if ($instcode eq '') {
$prev = $states->{$action}[$page-2];
}
$r->print(&courseinfo_form($dom,$formname,$crstype,$next));
@@ -828,10 +1194,84 @@ sub print_request_form {
\%cat_order,\@code_order);
}
$r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,
- \%cat_titles,\%cat_order,\@code_order));
+ \%cat_titles,\%cat_order,\@code_order,
+ $invalidcrosslist));
} elsif ($state eq 'personnel') {
- $r->print(&print_personnel_menu($dom,$formname,$crstype));
+ $r->print(&print_personnel_menu($dom,$formname,$crstype,$invalidcrosslist));
} elsif ($state eq 'review') {
+ my (%alerts,%rulematch,%inst_results,%curr_rules,%got_rules,%disallowmsg);
+ my $now = time;
+ for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+ my $personname = $env{'form.person_'.$i.'_uname'};
+ my $persondom = $env{'form.person_'.$i.'_dom'};
+ if (($personname =~ /^$match_username$/) &&
+ ($persondom =~ /^$match_domain$/)) {
+ if (&Apache::lonnet::domain($persondom)) {
+ my $personhome =
+ &Apache::lonnet::homeserver($personname,$persondom);
+ if ($personhome eq 'no_host') {
+ if ($persondom ne $dom) {
+ my $skipuser = 1;
+ if ($env{'user.role.dc./'.$persondom.'/'}) {
+ my ($start,$end) = split('.',$env{'user.role.dc./'.$persondom.'/'});
+ if (((!$start) || ($start < $now)) &&
+ ((!$end) || ($end > $now))) {
+ $skipuser = 0;
+ }
+ }
+ if ($skipuser) {
+ push(@disallowed,$i);
+ $disallowmsg{$i} = &mt('[_1] was excluded because new users need be from the course domain','<tt>'.$personname.':'.$persondom.'</tt>');
+ next;
+ }
+ }
+ if (&get_cancreate_status($persondom,$personname,$dom)) {
+ my ($allowed,$msg) =
+ &check_newuser_rules($persondom,$personname,
+ \%alerts,\%rulematch,\%inst_results,
+ \%curr_rules,\%got_rules);
+ if ($allowed) {
+ if (ref($inst_results{$personname.':'.$persondom}) eq 'HASH') {
+ if ($inst_results{$personname.':'.$persondom}{'lastname'} ne '') {
+ $env{'form.person_'.$i.'_lastname'} = $inst_results{$personname.':'.$persondom}{'lastname'};
+ }
+ if ($inst_results{$personname.':'.$persondom}{'firstname'} ne '') {
+ $env{'form.person_'.$i.'_firstname'} = $inst_results{$personname.':'.$persondom}{'firstname'};
+ }
+ if ($inst_results{$personname.':'.$persondom}{'permanentemail'} ne '') {
+ $env{'form.person_'.$i.'_emailaddr'} = $inst_results{$personname.':'.$persondom}{'permanentemail'};
+ }
+ }
+ } else {
+ push(@disallowed,$i);
+ $disallowmsg{$i} = &mt('[_1] was excluded because the username violated format rules for the domain','<tt>'.$personname.':'.$persondom.'</tt>');
+ }
+ } else {
+ push(@disallowed,$i);
+ $disallowmsg{$i} = &mt('[_1] was excluded because you may not request new users in the domain','<tt>'.$personname.':'.$persondom.'</tt>');
+ }
+ } else {
+ my %userenv =
+ &Apache::lonnet::userenvironment($persondom,$personname,'lastname','firstname','permanentemail');
+ if ($env{'form.person_'.$i.'_lastname'} eq '') {
+ $env{'form.person_'.$i.'_lastname'} = $userenv{'lastname'};
+ }
+ if ($env{'form.person_'.$i.'_firstname'} eq '') {
+ $env{'form.person_'.$i.'_firstname'} = $userenv{'firstname'};
+ }
+ if ($env{'form.person_'.$i.'_emailaddr'} eq '') {
+ $env{'form.person_'.$i.'_emailaddr'} = $userenv{'permanentemail'};
+ }
+ }
+ } elsif ($personname ne '') {
+ push(@disallowed,$i);
+ $disallowmsg{$i} = &mt('[_1] was excluded because the domain is invalid','<tt>'.$personname.':'.$persondom.'</tt>');
+ }
+ } elsif ($personname ne '') {
+ push(@disallowed,$i);
+ $disallowmsg{$i} = &mt('[_1] was excluded because the username or domain is invalid.','<tt>'.$personname.':'.$persondom.'</tt>');
+ }
+ }
my $cnum;
if ($env{'form.origcnum'} =~ /^($match_courseid)$/) {
$cnum = $env{'form.origcnum'};
@@ -840,9 +1280,8 @@ sub print_request_form {
}
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
- $r->print('<p>'.&mt('Review the details of the course request before submission.').'</p>'.
- &print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,
- \@code_order).
+ $r->print('<h3>'.&mt('Review course request details before submission').'</h3>'.
+ &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg).
'<input type="hidden" name="cnum" value="'.$cnum.'" />');
$navtxt{'next'} = &mt('Submit course request');
} elsif ($state eq 'process') {
@@ -850,18 +1289,97 @@ sub print_request_form {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
}
- my $result = &print_request_outcome($dom,\@codetitles,\@code_order);
+ my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
+ \@code_order);
$r->print($result);
+ if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
+ $r->print('<p>');
+ if ($storeresult eq 'ok') {
+ $r->print('<a href="/adm/requestcourse?action=view&state=details&showdom='.$dom.'&cnum='. $env{'form.cnum'}.'">'.
+ &mt('Modify this request').'</a>'.(' 'x4));
+ }
+ $r->print('<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
+ return;
+ }
}
my @excluded = &get_excluded_elements($dom,$states,$action,$state);
if ($state eq 'personnel') {
push(@excluded,'persontotal');
}
+ if ($state eq 'review') {
+ if (@disallowed > 0) {
+ my @items = qw(uname dom lastname firstname emailaddr hidedom role newsec);
+ my @currsecs = ¤t_lc_sections();
+ if (@currsecs) {
+ push(@items,'sec');
+ }
+ my $count = 0;
+ for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+ unless ($env{'form.person_'.$i.'_uname'} eq '') {
+ if (grep(/^$i$/,@disallowed)) {
+ foreach my $item (@items) {
+ $env{'form.person_'.$i.'_'.$item} = '';
+ }
+ } else {
+ foreach my $item (@items) {
+ $env{'form.person_'.$count.'_'.$item} = $env{'form.person_'.$i.'_'.$item};
+ }
+ }
+ }
+ $count ++;
+ }
+ $env{'form.persontotal'} = $count;
+
+ }
+ }
+ if ($state eq 'enrollment') {
+ push(@excluded,'crosslisttotal');
+ }
$r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
- &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state);
+ &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+ $navtxt{'next'},$state);
return;
}
+sub get_cancreate_status {
+ my ($persondom,$personname,$dom) = @_;
+ my ($rules,$ruleorder) =
+ &Apache::lonnet::inst_userrules($persondom,'username');
+ my $usertype = &Apache::lonuserutils::check_usertype($persondom,$personname,
+ $rules);
+ return &Apache::lonuserutils::can_create_user($dom,'requestcrs',$usertype);
+}
+
+sub check_newuser_rules {
+ my ($persondom,$personname,$alerts,$rulematch,$inst_results,$curr_rules,
+ $got_rules) = @_;
+ my $allowed = 1;
+ my $newuser = 1;
+ my ($checkhash,$userchkmsg);
+ my $checks = { 'username' => 1 };
+ $checkhash->{$personname.':'.$persondom} = { 'newuser' => $newuser };
+ &Apache::loncommon::user_rule_check($checkhash,$checks,$alerts,$rulematch,
+ $inst_results,$curr_rules,$got_rules);
+ if (ref($alerts->{'username'}) eq 'HASH') {
+ if (ref($alerts->{'username'}{$persondom}) eq 'HASH') {
+ my $domdesc =
+ &Apache::lonnet::domain($persondom,'description');
+ if ($alerts->{'username'}{$persondom}{$personname}) {
+ if (ref($curr_rules->{$persondom}) eq 'HASH') {
+ $userchkmsg =
+ &Apache::loncommon::instrule_disallow_msg('username',
+ $domdesc,1).
+ &Apache::loncommon::user_rule_formats($persondom,
+ $domdesc,$curr_rules->{$persondom}{'username'},
+ 'username');
+ }
+ $allowed = 0;
+ }
+ }
+ }
+ return ($allowed,$userchkmsg);
+}
+
sub get_excluded_elements {
my ($dom,$states,$action,$state) = @_;
my @excluded = ('counter');
@@ -891,8 +1409,9 @@ sub get_excluded_elements {
}
sub print_enrollment_menu {
- my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order) =@_;
- my ($sections,$autoenroll,$access_dates);
+ my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
+ $invalidcrosslist) =@_;
+ my ($sections,$autoenroll,$access_dates,$output);
my $starttime = time;
my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
@@ -906,8 +1425,15 @@ sub print_enrollment_menu {
);
if ($env{'form.crstype'} eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {
- my ($section_form,$crosslist_form,$autoenroll_form);
+ $output = &show_invalid_crosslists($invalidcrosslist);
+ my ($section_form,$crosslist_form);
$section_form = &inst_section_selector($dom,$instcode);
+ if ($section_form) {
+ $sections = &Apache::lonhtmlcommon::row_headline().
+ '<h3>'.&mt('Sections for auto-enrollment').'</h3>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $section_form;
+ }
my $crosslisttotal = $env{'form.crosslisttotal'};
if (!$crosslisttotal) {
$crosslisttotal = 1;
@@ -925,53 +1451,80 @@ sub print_enrollment_menu {
'<input name="crosslisttotal" type="hidden" value="'.$crosslisttotal.'" />'.
'<input name="addcrosslist" type="checkbox" value="'.$crosslisttotal.'"'.
' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
- "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1);
- }
- if ($section_form || $crosslist_form) {
- $sections = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
- $section_form.$crosslist_form.
- &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+ "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
+ $sections .= &Apache::lonhtmlcommon::row_headline.
+ '<h3>'.&mt('Crosslisted courses for auto-enrollment').'</h3>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $crosslist_form;
}
- $autoenroll_form =
+ $autoenroll =
&Apache::lonhtmlcommon::row_title(&mt('Add registered students automatically')).
'<span class="LC_nobreak"><label>'.
'<input type="radio" name="autoadds" value="1">'.
&mt('Yes').'</label>'.(' 'x3).'<label>'.
'<input type="radio" name="autoadds" value="0" checked="checked">'.
&mt('No').'</label></span>'.
- &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title(&mt('Drop unregistered students automatically')).
'<span class="LC_nobreak"><label>'.
'<input type="radio" name="autodrops" value="1">'.
&mt('Yes').'</label>'.(' 'x3).'<label>'.
'<input type="radio" name="autodrops" value="0" checked="checked">'.
&mt('No').'</label></span>'.
- &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_closure(1).
&date_setting_table($starttime,$endtime,$formname,'enroll',%enrolltitles);
- if ($autoenroll_form) {
- $autoenroll = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
- $autoenroll_form.
- &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
- }
}
}
- my $access_dates_form =
+ my $access_dates =
&date_setting_table($starttime,$endtime,$formname,'access',%accesstitles);
- if ($access_dates_form) {
- $access_dates = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
- $access_dates_form.
- &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+ $output .= &Apache::lonhtmlcommon::start_pick_box();
+ if ($sections) {
+ $output .= $sections;
+ }
+ if ($autoenroll) {
+ $output .= &Apache::lonhtmlcommon::row_headline('Auto-enroll').
+ '<h3>'.&mt('Auto-enrollment settings').'</h3>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $autoenroll;
+ }
+ if ($access_dates) {
+ my $header = &mt('Access dates for students');
+ if ($env{'form.crstype'} eq 'community') {
+ $header = &mt('Access dates for community members');
+ }
+ $output .= &Apache::lonhtmlcommon::row_headline('Access').
+ '<h3>'.$header.'</h3>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $access_dates
+ }
+ return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
+ &Apache::lonhtmlcommon::end_pick_box().'</div>';
+}
+
+sub show_invalid_crosslists {
+ my ($invalidcrosslist) = @_;
+ my $output;
+ if (ref($invalidcrosslist) eq 'ARRAY') {
+ if (@{$invalidcrosslist} > 0) {
+ $output = '<div class="LC_warning">'.
+ &mt('The following crosslisted courses were invalid:').'<ul>';
+ foreach my $item (@{$invalidcrosslist}) {
+ $output .= '<li>'.$item.'</li>';
+ }
+ $output .= '</ul></div><br />';
+ }
}
- return $sections.$autoenroll.$access_dates;
+ return $output;
}
+
sub inst_section_selector {
my ($dom,$instcode) = @_;
my @sections = &Apache::lonnet::auto_get_sections(undef,$dom,$instcode);
my $sectotal = scalar(@sections);
my $output;
if ($sectotal) {
- $output .= &Apache::lonhtmlcommon::row_title('Sections').
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Sections of [_1]',$instcode)).
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().
'<th>'.&mt('Include?').'<input type="hidden" name="sectotal" '.
@@ -981,14 +1534,18 @@ sub inst_section_selector {
&Apache::loncommon::end_data_table_row();
for (my $i=0; $i<@sections; $i++) {
my $colflag = $i%2;
- my $checked = ' checked="checked"';
+ my $secon = ' checked="checked"';
+ my $secoff = '';
if ($env{'form.origcnum'}) {
- $checked='';
+ $secoff = $secon;
+ $secon='';
}
$output .= &Apache::loncommon::start_data_table_row().
- '<td><input type="checkbox" name="sec_'.$i.
- '"'.$checked.' value="1" /></td>'.
- '<td>'.$sections[$i].
+ '<td><label><input type="radio" name="sec_'.$i.
+ '"'.$secon.' value="1" />'.&mt('Yes').'</label>'.
+ (' 'x2).'<label><input type="radio" name="sec_'.$i.
+ '"'.$secoff.' value="0" />'.&mt('No').'</label></td>'.
+ '<td align="center">'.$sections[$i].
'<input type="hidden" name="secnum_'.$i.'" value="'.
$sections[$i].'" /></td>'.
'<td><input type="text" size="10" name="loncapasec_'.$i.
@@ -1008,23 +1565,31 @@ sub date_setting_table {
$starttime,'','','',1,'','','',1);
my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
$endtime,'','','',1,'','','',1);
+ my $closure = '';
if ($prefix eq 'access') {
$perpetual = ' <span class="LC_nobreak"><label>'.
'<input type="checkbox" name="no_end_date" />'.
&mt('No end date').'</label></span>';
+ $closure = '1';
}
$table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}).
$startform.
- &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($datetitles{'end'}).
$endform.$perpetual.
- &Apache::lonhtmlcommon::row_closure(1);
+ &Apache::lonhtmlcommon::row_closure($closure);
return $table;
}
sub print_personnel_menu {
- my ($dom,$formname,$crstype) = @_;
- my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box();
+ my ($dom,$formname,$crstype,$invalidcrosslist) = @_;
+ my $output;
+ if ($crstype eq 'official') {
+ if (&Apache::lonnet::auto_run('',$dom)) {
+ $output .= &show_invalid_crosslists($invalidcrosslist);
+ }
+ }
+ $output .= '<div>'.&Apache::lonhtmlcommon::start_pick_box();
my $persontotal = $env{'form.persontotal'};
if ((!defined($persontotal)) || (!$persontotal)) {
$persontotal = 1;
@@ -1032,7 +1597,6 @@ sub print_personnel_menu {
if ($env{'form.addperson'}) {
$persontotal ++;
}
- my $userlinktxt = &mt('Set User');
my @items = ('uname','dom','lastname','firstname','emailaddr','hidedom');
my $roleoptions;
@@ -1042,29 +1606,18 @@ sub print_personnel_menu {
$type = 'Community';
}
foreach my $role (@roles) {
- my $plrole=&Apache::lonnet::plaintext($role,$type);
+ my $plrole = &Apache::lonnet::plaintext($role,$type);
$roleoptions .= ' <option value="'.$role.'">'.$plrole.'</option>'."\n";
}
my %customroles=&Apache::lonuserutils::my_custom_roles();
if (keys(%customroles) > 0) {
foreach my $cust (sort(keys(%customroles))) {
- my $custrole='cr_cr_'.$env{'user.domain'}.
- '_'.$env{'user.name'}.'_'.$cust;
+ my $custrole="cr/$env{'user.domain'}/$env{'user.name'}/$cust";
$roleoptions .= ' <option value="'.$custrole.'">'.$cust.'</option>'."\n";
}
}
- my @currsecs;
- if ($env{'form.sectotal'}) {
- for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
- if (defined($env{'form.loncapasec_'.$i})) {
- my $lcsec = $env{'form.loncapasec_'.$i};
- unless (grep(/^\Q$lcsec\E$/,@currsecs)) {
- push(@currsecs,$lcsec);
- }
- }
- }
- }
+ my @currsecs = ¤t_lc_sections();
my ($existtitle,$existops,$existmult,$newtitle,$seccolspan);
if (@currsecs) {
@@ -1085,19 +1638,19 @@ sub print_personnel_menu {
$newtitle = &mt('Other').': ';
}
+ if ($persontotal) {
+ $output .= &Apache::lonhtmlcommon::row_headline().
+ '<h3>'.&mt('Requestor is automatically assigned Course Coordinator role.').' '.&mt('Include other personnel?').'</h3>';
+ }
for (my $i=0; $i<$persontotal; $i++) {
my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
my $linkargstr = join("','",@linkargs);
- my $userlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,$userlinktxt);
- my $uname_form = '<input type="text" name="person_'.$i.'_uname" value=""'.
- ' onFocus="this.blur();'.
- 'openuserbrowser('."'$formname','$linkargstr','$dom'".');" />';
+ my $uname_form = '<input type="text" name="person_'.$i.'_uname" value="" size="20" />';
my $onchange = 'javascript:fix_domain('."'$formname','person_".$i."_dom',".
- "'person_".$i."_hidedom'".');'.
- 'openuserbrowser('."'$formname','$linkargstr','$dom'".');';
+ "'person_".$i."_hidedom','person_".$i."_uname'".');';
my $udom_form = &Apache::loncommon::select_dom_form($dom,'person_'.$i.'_dom','',
1,$onchange).
- '<input type="hidden" name="person_'.$i.'_hidedom" value="'.$dom.'" />';
+ '<input type="hidden" name="person_'.$i.'_hidedom" value="" />';
my %form_elems;
foreach my $item (@items) {
next if (($item eq 'dom') || ($item eq 'uname') || ($item eq 'hidedom'));
@@ -1113,12 +1666,19 @@ sub print_personnel_menu {
}
$sectionselector .= $newtitle.
'<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'."\n";
+ my $usersrchlinktxt = &mt('Search for user');
+ my $usersrchlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
+ $usersrchlinktxt);
+ my $userchklinktxt = &mt('Check username');
+ my $userchklink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
+ $userchklinktxt,'checkusername');
$output .=
- &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel').'<br />'.
- '<span class="LC_nobreak">'.$userlink.
- '</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".
+ &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel')).
+ '<table><tr><td align="center" valign="middle"><b>'.$usersrchlink.'</b></td>'."\n".
+ '<td align="left" valign="top" colspan="2"><span class="LC_nobreak">'.
+ &mt('Username').': '.$uname_form.' '.$userchklink.'</span><br />'."\n".
+ '<span class="LC_nobreak">'.&mt('Domain').': '.$udom_form.'</span></td>'.
+ '</tr>'."\n".'<tr>'.
'<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".
@@ -1135,6 +1695,23 @@ sub print_personnel_menu {
return $output;
}
+sub current_lc_sections {
+ my @currsecs;
+ if ($env{'form.sectotal'}) {
+ for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
+ if ($env{'form.sec_'.$i}) {
+ if (defined($env{'form.loncapasec_'.$i})) {
+ my $lcsec = $env{'form.loncapasec_'.$i};
+ unless (grep(/^\Q$lcsec\E$/,@currsecs)) {
+ push(@currsecs,$lcsec);
+ }
+ }
+ }
+ }
+ }
+ return @currsecs;
+}
+
sub print_request_status {
my ($dom) = @_;
my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
@@ -1243,8 +1820,7 @@ sub print_request_status {
$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 .= '
-<br /><input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />
-</form></div>';
+<br /><input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />';
return $output;
}
@@ -1350,13 +1926,17 @@ sub print_request_logs {
}
sub print_review {
- my ($formname,$dom,$codetitles,$cat_titles,$cat_order,$code_order) = @_;
+ my ($dom,$codetitles,$cat_titles,$cat_order,$code_order,$uname,$udom,
+ $disallowed,$disallowmsg) = @_;
my ($types,$typename) = &course_types();
my ($owner,$ownername,$owneremail);
- $owner = $env{'user.name'}.':'.$env{'user.domain'};
- $ownername = &Apache::loncommon::plainname($env{'user.name'},
- $env{'user.domain'},'first');
- my %emails = &Apache::loncommon::getemails();
+ if ($uname eq '' || $udom eq '') {
+ $uname = $env{'user.name'};
+ $udom = $env{'user.domain'};
+ }
+ $owner = $uname.':'.$udom;
+ $ownername = &Apache::loncommon::plainname($uname,$udom,'first');
+ my %emails = &Apache::loncommon::getemails($uname,$udom);
foreach my $email ('permanentemail','critnotification','notification') {
$owneremail = $emails{$email};
last if ($owneremail ne '');
@@ -1525,14 +2105,25 @@ sub print_review {
'<td>'.&mt('None').'</td></tr>';
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');
+ if (ref($disallowed) eq 'ARRAY') {
+ next if (grep(/^$i$/,@{$disallowed}));
+ }
+ my @officialsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+ my @allsecs;
+ foreach my $sec (@officialsecs) {
+ next unless ($sec =~ /\w/);
+ next if ($sec =~ /\W/);
+ next if ($sec eq 'none');
+ push(@allsecs,$sec);
+ }
my $newsec = $env{'form.person_'.$i.'_newsec'};
$newsec =~ s/^\s+//;
$newsec =~s/\s+$//;
- my @newsecs = split(/[\s,;]+/,$newsec);
+ my @newsecs = split(/\s*[\s,;:]\s*/,$newsec);
foreach my $sec (@newsecs) {
+ next unless ($sec =~ /\w/);
next if ($sec =~ /\W/);
- next if ($newsec eq 'none');
+ next if ($sec eq 'none');
if ($sec ne '') {
unless (grep(/^\Q$sec\E$/,@allsecs)) {
push(@allsecs,$sec);
@@ -1549,18 +2140,30 @@ sub print_review {
if ($env{'form.person_'.$i.'_role'} eq 'cc') {
$showsec = &mt('None');
}
+ my $role = $env{'form.person_'.$i.'_role'};
$personnel_values .=
'<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'},
- $container).'</td>'.
+ '<td>'.&Apache::lonnet::plaintext($role,$container).'</td>'.
'<td>'.$showsec.'</td></tr>';
}
}
- my $output =
- '<div>'.&Apache::lonhtmlcommon::start_pick_box().
+ my $output;
+ if (ref($disallowed) eq 'ARRAY') {
+ if (@{$disallowed} > 0) {
+ if (ref($disallowmsg) eq 'HASH') {
+ $output = '<p class="LC_warning">'.
+ &mt('Not all requested personnel could be included.').'<ul>';
+ foreach my $item (@{$disallowed}) {
+ $output .= '<li>'.$disallowmsg->{$item}.'</li>';
+ }
+ $output .= '</ul></p>';
+ }
+ }
+ }
+ $output .= '<div>'.&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title(&mt('Owner')).
'<table class="LC_innerpickbox"><tr>'.
'<th>'.&mt('Name').'</th>'.
@@ -1589,7 +2192,7 @@ sub print_review {
'<table class="LC_innerpickbox"><tr>'.$personnel_headers.'</tr>'."\n".
$personnel_values.'</table>'."\n".
&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box();
+ &Apache::lonhtmlcommon::end_pick_box().'</div>';
return $output;
}
@@ -1623,9 +2226,15 @@ function validateForm() {
</script>
ENDJS
-
+ my $title = &mt('Brief Course Description');
+ if ($crstype eq 'community') {
+ $title = &mt('Brief Community Description');
+ }
my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
- &Apache::lonhtmlcommon::row_title('Course Description').
+ &Apache::lonhtmlcommon::row_headline().
+ '<h3>'.$title.'</h3>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_title(&mt('Description')).
'<input type="text" size="40" name="cdescr" />';
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($dom,'chome',
@@ -1635,9 +2244,12 @@ ENDJS
&Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
}
$output .= $home_server_pick.
+ &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_headline().
+ '<h3>'.&mt('Clone content and settings from an existing course?').'</h3>'.
&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'</div>'.
- '<div>'.&clone_form($dom,$formname,$crstype).'</div>'."\n";
+ &clone_form($dom,$formname,$crstype).
+ &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
return $output;
}
@@ -1651,13 +2263,11 @@ sub clone_form {
&Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
my %lt = &clone_text();
my $output .=
- &Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
- '<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();'.
- 'opencrsbrowser('."'$formname','clonecrs','clonedom','','','','$type'".');" />'.
+ '<input type="text" size="25" name="clonecrs" value="" />'.
'</label>'.&Apache::lonhtmlcommon::row_closure(1).'<label>'.
&Apache::lonhtmlcommon::row_title($lt{'dmn'}).'</label>'.
- $cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure().
+ $cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.
'<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
'</label><br /><label>'.
@@ -1666,8 +2276,7 @@ sub clone_form {
'<input type="radio" name="datemode" value="shift" checked="checked" /> '.
$lt{'shd'}.'</label>'.
'<input type="text" size="5" name="dateshift" value="365" />'.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box();
+ &Apache::lonhtmlcommon::row_closure(1);
return $output;
}
@@ -1816,11 +2425,11 @@ sub get_course_dom {
}
sub display_navbuttons {
- my ($r,$formname,$prev,$prevtext,$next,$nexttext,$state,$other,$othertext) = @_;
+ my ($r,$dom,$formname,$prev,$prevtext,$next,$nexttext,$state,$other,$othertext) = @_;
$r->print('<div class="LC_navbuttons">');
if ($prev) {
$r->print('<input type="button" name="previous" value = "'.$prevtext.'" '.
- 'onclick="javascript:backPage(document.'.$formname.','."'".$prev."'".')"/>'.
+ 'onclick="javascript:backPage('."document.$formname,'$prev'".')"/>'.
(' 'x3));
} elsif ($prevtext) {
$r->print('<input type="button" name="previous" value = "'.$prevtext.'" '.
@@ -1828,16 +2437,34 @@ sub display_navbuttons {
}
if ($state eq 'details') {
$r->print(' <input type="button" name="other" value="'.$othertext.'" '.
- 'onclick="javascript:nextPage(document.'.$formname.','."'".$other."'".
+ 'onclick="javascript:nextPage('."document.$formname,'$other'".
')" />');
}
+ my $gotnext;
if ($state eq 'courseinfo') {
$r->print('<input type="button" name="next" value="'.$nexttext.'" '.
'onclick="javascript:validateForm();" />');
- } elsif ($next) {
- $r->print('
- <input type="button" name="next" value="'.$nexttext.'" '.
- 'onclick="javascript:nextPage(document.'.$formname.','."'".$next."'".')" />');
+ $gotnext = 1;
+ } elsif ($state eq 'enrollment') {
+ if (($env{'form.crstype'} eq 'official') &&
+ (&Apache::lonnet::auto_run('',$dom))) {
+ $r->print('<input type="button" name="next" value="'.$nexttext.'" '.
+ 'onclick="javascript:validateEnrollSections('."document.$formname,'$next'".');" />');
+ $gotnext = 1;
+ }
+ } elsif ($state eq 'personnel') {
+ if ($env{'form.persontotal'} > 0) {
+ $r->print('<input type="button" name="next" value="'.$nexttext.'" '.
+ 'onclick="javascript:validatePersonnelSections('."document.$formname,'$next'".');" />');
+ $gotnext = 1;
+ }
+ }
+ unless ($gotnext) {
+ if ($next) {
+ $r->print('
+ <input type="button" name="next" value="'.$nexttext.'" '.
+ 'onclick="javascript:nextPage('."document.$formname,'$next'".')" />');
+ }
}
$r->print('</div>');
}
@@ -1927,20 +2554,27 @@ sub print_request_outcome {
@{$personnel{$uname.':'.$udom}{$role}{'usec'}} = ();
} else {
my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+ my @allsecs;
+ foreach my $sec (@currsec) {
+ next unless ($sec =~ /\w/);
+ next if ($sec =~ /\W/);
+ next if ($sec eq 'none');
+ push(@allsecs,$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');
+ next if ($sec eq 'none');
if ($sec ne '') {
- unless (grep(/^\Q$sec\E$/,@currsec)) {
- push(@currsec,$sec);
+ unless (grep(/^\Q$sec\E$/,@allsecs)) {
+ push(@allsecs,$sec);
}
}
}
- @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @currsec;
+ @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @allsecs;
}
}
} else {
@@ -2007,7 +2641,7 @@ sub print_request_outcome {
accessend => $accessend,
personnel => \%personnel,
};
- my @inststatuses;
+ my (@inststatuses,$storeresult,$creationresult);
my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
if ($crstype eq 'official') {
@@ -2019,6 +2653,7 @@ sub print_request_outcome {
} else {
$output = &mt('Unrecognized course type: [_1]',$crstype);
}
+ $storeresult = 'notpermitted';
} else {
my ($disposition,$message,$reqstatus);
my %reqhash = (
@@ -2069,6 +2704,7 @@ sub print_request_outcome {
if ($message) {
$output .= '<div class="LC_warning">'.$message.'</div>';
}
+ $storeresult = 'rejected';
} elsif ($disposition eq 'process') {
my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
@@ -2086,15 +2722,18 @@ sub print_request_outcome {
if ($result eq 'created') {
$disposition = 'created';
$reqstatus = 'created';
- $output = &mt('Your course request has been processed and the course has been created.').
- '<br />'.
- &mt('You will need to logout and log-in again to be able to select a role in the course.');
+ my $role_result = &update_requestors_roles($dom,$cnum,$crstype,$details,
+ \%longroles);
+ $output = '<p>'.&mt('Your course request has been processed and the course has been created.').
+ '<br />'.$role_result.'</p>';
+ $creationresult = 'created';
} else {
$output = '<span class="LC_error">'.
&mt('An error occurred when processing your course request.').
'<br />'.
&mt('You may want to review the request details and submit the request again.').
'</span>';
+ $creationresult = 'error';
}
} else {
my $requestid = $cnum.'_'.$disposition;
@@ -2136,7 +2775,7 @@ sub print_request_outcome {
}
}
}
- my ($storeresult,$statusresult);
+ my ($statusresult);
if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
$storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
'courserequests');
@@ -2144,7 +2783,7 @@ sub print_request_outcome {
my %status = (
'status:'.$dom.':'.$cnum => $reqstatus,
);
- $statusresult = &Apache::lonnet::put('courserequests',\%status);
+ $statusresult = &Apache::lonnet::put('courserequests',\%status);
}
} else {
$storeresult = 'error: invalid requestkey format';
@@ -2153,7 +2792,7 @@ sub print_request_outcome {
$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");
} elsif ($statusresult ne 'ok') {
- $output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).'</span><br />';
+ $output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).'</span><br />';
&Apache::lonnet::logthis("Error saving course request status for $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
}
if ($modified && $queued && $storeresult eq 'ok') {
@@ -2164,6 +2803,117 @@ sub print_request_outcome {
$output .= '<span class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
}
}
+ if ($creationresult ne '') {
+ return ($creationresult,$output);
+ } else {
+ return ($storeresult,$output);
+ }
+}
+
+sub update_requestors_roles {
+ my ($dom,$cnum,$crstype,$details,$longroles) = @_;
+ my $now = time;
+ my ($active,$future,$numactive,$numfuture,$output);
+ my $owner = $env{'user.name'}.':'.$env{'user.domain'};
+ if (ref($details) eq 'HASH') {
+ if (ref($details->{'personnel'}) eq 'HASH') {
+ if (ref($details->{'personnel'}{$owner}) eq 'HASH') {
+ my @roles;
+ if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
+ @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
+ unless (grep(/^cc$/,@roles)) {
+ push(@roles,'cc');
+ }
+ } else {
+ @roles = ('cc');
+ }
+ foreach my $role (@roles) {
+ my $start = $now;
+ my $end = '0';
+ if ($role eq 'st') {
+ if ($details->{'accessstart'} ne '') {
+ $start = $details->{'accessstart'};
+ }
+ if ($details->{'accessend'} ne '') {
+ $end = $details->{'accessend'};
+ }
+ }
+ my @usecs;
+ if ($role ne 'cc') {
+ if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
+ @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
+ }
+ }
+ if ($role eq 'st') {
+ if (@usecs > 1) {
+ my $firstsec = $usecs[0];
+ @usecs = ($firstsec);
+ }
+ }
+ if (@usecs == 0) {
+ push(@usecs,'');
+ }
+ foreach my $usec (@usecs) {
+ my (%userroles,%newrole,%newgroups,$spec,$area);
+ my $area = '/'.$dom.'/'.$cnum;
+ my $spec = $role.'.'.$area;
+ if ($usec ne '') {
+ $spec .= '/'.$usec;
+ $area .= '/'.$usec;
+ }
+ if ($role =~ /^cr\//) {
+ &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom,
+ $cnum,$spec,$area);
+ } else {
+ &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom,
+ $spec,$cnum,$area);
+ }
+ &Apache::lonnet::set_userprivs(\%userroles,\%newrole,
+ \%newgroups);
+ $userroles{'user.role.'.$spec} = $start.'.'.$end;
+ &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
+ if (($end == 0) || ($end > $now)) {
+ my $showrole = $role;
+ if ($role =~ /^cr\//) {
+ $showrole = &Apache::lonnet::plaintext($role,$crstype);
+ } elsif (ref($longroles) eq 'HASH') {
+ if ($longroles->{$role} ne '') {
+ $showrole = $longroles->{$role};
+ }
+ }
+ if ($start <= $now) {
+ $active .= '<li><a href="/adm/roles?selectrole=1&'. $spec.'=1">'.$showrole;
+ if ($usec ne '') {
+ $active .= ' - '.&mt('section:').' '.$usec;
+ }
+ $active .= '</a></li>';
+ $numactive ++;
+ } else {
+ $future .= '<li>'.$showrole;
+ if ($usec ne '') {
+ $future .= ' - '.&mt('section:').' '.$usec;
+ }
+ $future .= '</li>';
+ $numfuture ++;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ if ($active) {
+ if ($numactive == 1) {
+ $output = &mt('Use the following link to enter the course:');
+ } else {
+ $output = &mt('Use the following links to your new roles to enter the course:');
+ }
+ $output .= ' <ul>'.$active.'</ul><br />';
+ }
+ if ($future) {
+ $output .= &mt('The following course [quant,_1,role] will become available for selection from your [_2]roles page[_3], once the default student access start date - [_4] - has been reached:',$numfuture,'<a href="/adm/roles">','</a>',&Apache::lonlocal::locallocaltime($details->{'accessstart'})).
+ ' <ul>'.$future.'</ul>';
+ }
return $output;
}
@@ -2327,11 +3077,14 @@ sub check_autolimit {
}
sub retrieve_settings {
- my ($dom,$cnum) = @_;
- my ($result,%reqinfo) = &get_request_settings($dom,$cnum);
+ my ($dom,$cnum,$udom,$uname) = @_;
+ if ($udom eq '' || $uname eq '') {
+ $udom = $env{'user.domain'};
+ $uname = $env{'user.name'};
+ }
+ my ($result,%reqinfo) = &get_request_settings($dom,$cnum,$udom,$uname);
if ($result eq 'ok') {
- if (($env{'user.name'} eq $reqinfo{'owner'}) &&
- ($env{'user.domain'} eq $reqinfo{'domain'})) {
+ if (($udom eq $reqinfo{'domain'}) && ($uname eq $reqinfo{'owner'})) {
$env{'form.chome'} = $reqinfo{'coursehome'};
$env{'form.cdescr'} = $reqinfo{'cdescr'};
$env{'form.crstype'} = $reqinfo{'crstype'};
@@ -2433,12 +3186,11 @@ sub retrieve_settings {
}
sub get_request_settings {
- my ($dom,$cnum) = @_;
+ my ($dom,$cnum,$udom,$uname) = @_;
my $requestkey = $dom.'_'.$cnum;
my ($result,%reqinfo);
if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
- my %history = &Apache::lonnet::restore($requestkey,'courserequests',
- $env{'user.domain'},$env{'user.name'});
+ my %history = &Apache::lonnet::restore($requestkey,'courserequests',$udom,$uname);
my $disposition = $history{'disposition'};
if (($disposition eq 'approval') || ($disposition eq 'pending')) {
if (ref($history{'details'}) eq 'HASH') {