--- loncom/interface/lonrequestcourse.pm 2009/09/07 06:30:49 1.30
+++ loncom/interface/lonrequestcourse.pm 2010/07/07 17:27:41 1.54
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.30 2009/09/07 06:30:49 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.54 2010/07/07 17:27:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,10 +52,6 @@ described at http://www.lon-capa.org.
=item onload_action()
-=item check_can_request()
-
-=item course_types()
-
=item print_main_menu()
=item request_administration()
@@ -98,8 +94,6 @@ described at http://www.lon-capa.org.
=item print_request_outcome()
-=item get_processtype()
-
=item check_autolimit()
=item retrieve_settings()
@@ -134,7 +128,7 @@ sub handler {
}
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['action','showdom','cnum','state']);
+ ['action','showdom','cnum','state','crstype','queue']);
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $dom = &get_course_dom();
my $action = $env{'form.action'};
@@ -144,7 +138,7 @@ sub handler {
$states{'display'} = ['details'];
$states{'view'} = ['pick_request','details','cancel','removal'];
- $states{'log'} = ['filter','display'];
+ $states{'log'} = ['display'];
$states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) {
@@ -161,7 +155,7 @@ sub handler {
my @invalidcrosslist;
my %trail = (
- crstype => 'Course Request Action',
+ crstype => 'Request Action',
codepick => 'Category',
courseinfo => 'Description',
enrollment => 'Access Dates',
@@ -172,20 +166,21 @@ sub handler {
details => 'Request Details',
cancel => 'Cancel Request',
removal => 'Outcome',
+ display => 'Request Logs',
);
if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
$trail{'enrollment'} = 'Enrollment';
}
- my ($page,$crumb,$newinstcode,$codechk,$checkedcode) =
+ my ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description) =
&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 $queue = $env{'form.queue'};
+ my $reqkey = $cnum.'_'.$queue;
my $namespace = 'courserequestqueue';
my $domconfig = &Apache::lonnet::get_domainconfiguser($dom);
my %queued =
@@ -196,16 +191,30 @@ sub handler {
if (($udom =~ /^$match_domain$/) && ($uname =~ /^$match_username$/)) {
$result = &retrieve_settings($dom,$cnum,$udom,$uname);
} else {
- $warning = &mt('Invalid username or domain for course requestor');
+ if ($env{'form.crstype'} eq 'community') {
+ $warning = &mt('Invalid username or domain for community requestor');
+ } else {
+ $warning = &mt('Invalid username or domain for course requestor');
+ }
}
} else {
- $warning = &mt('No information was found for this course request.');
+ if ($env{'form.crstype'} eq 'community') {
+ $warning = &mt('No information was found for this community request.');
+ } else {
+ $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.');
+ if ($env{'form.crstype'} eq 'any') {
+ $warning = &mt('You do not have rights to view course or community request information.');
+ } elsif ($env{'form.crstype'} eq 'community') {
+ $warning = &mt('You do not have rights to view community request information.');
+ } 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')) {
@@ -239,7 +248,7 @@ sub handler {
$crosslistcode .= $env{'form.crosslist_'.$i.'_'.$item};
}
if ($crosslistcode ne '') {
- $codechk{$i} =
+ ($codechk{$i}, my $rest) =
&Apache::lonnet::auto_validate_instcode('',$dom,$crosslistcode);
}
unless ($codechk{$i} eq 'valid') {
@@ -267,6 +276,9 @@ sub handler {
$jscript = &mainmenu_javascript();
} else {
$jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
+ if ($state eq 'courseinfo') {
+ $jscript .= &cloning_javascript();
+ }
}
}
@@ -276,27 +288,29 @@ sub handler {
my $loaditems = &onload_action($action,$state);
- my %can_request;
- my $canreq = &check_can_request($dom,\%can_request);
+ my (%can_request,%request_domains);
+ my $canreq =
+ &Apache::lonnet::check_can_request($dom,\%can_request,\%request_domains);
if ($action eq 'new') {
if ($canreq) {
if ($state eq 'crstype') {
&print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,
- $crumb);
+ $crumb,\%request_domains);
} else {
&request_administration($r,$action,$state,$page,\%states,$dom,
$jscript,$loaditems,$crumb,$newinstcode,
- $codechk,$checkedcode,\@invalidcrosslist);
+ $codechk,$checkedcode,$description,
+ \@invalidcrosslist);
}
} else {
- $r->print(&header('Course Requests').$crumb.
+ $r->print(&header('Course/Community Requests').$crumb.
'<div class="LC_warning">'.
- &mt('You do not have privileges to request creation of courses.').
+ &mt('You do not have privileges to request creation of courses or communities.').
'</div>'.&Apache::loncommon::end_page());
}
} elsif ($action eq 'view') {
if ($state eq 'crstype') {
- &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,$crumb);
+ &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,$crumb,\%request_domains);
} else {
&request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
$loaditems,$crumb);
@@ -304,18 +318,35 @@ sub handler {
} 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>'.
+ $r->print(&header('Course/Community Requests','','' ,'',$args).$crumb.
+ '<h3>'.&mt('Course/Community 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);
+ $loaditems,$crumb,'','','','','',$uname,$udom);
}
} elsif ($action eq 'log') {
- &print_request_logs($jscript,$loaditems,$crumb);
+ if ($state eq 'crstype') {
+ &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb,\%request_domains);
+ } else {
+ $jscript .= <<ENDJS;
+
+function backPage(formname,prevstate) {
+ formname.state.value = prevstate;
+ formname.submit();
+}
+
+function setPage(formname) {
+ formname.page.value = '1';
+ return;
+}
+
+ENDJS
+ &print_request_logs($r,$dom,$jscript,$loaditems,$crumb);
+ }
} else {
- &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);
+ &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb,\%request_domains);
}
return OK;
}
@@ -344,9 +375,25 @@ function setAction(courseForm) {
END
}
+sub cloning_javascript {
+ return <<"END";
+function setCloneDisplay(courseForm) {
+ if (courseForm.cloning.length > 1) {
+ for (var i=0; i<courseForm.cloning.length; i++) {
+ if (courseForm.cloning[i].checked) {
+ if (courseForm.cloning[i].value == 1) {
+ document.getElementById('cloneoptions').style.display="block";;
+ }
+ }
+ }
+ }
+}
+END
+}
+
sub get_breadcrumbs {
my ($dom,$action,$state,$states,$trail) = @_;
- my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles);
+ my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description);
my $page = 0;
if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
if (defined($action)) {
@@ -371,7 +418,7 @@ sub get_breadcrumbs {
$$state = 'codepick';
$page --;
} else {
- $codechk =
+ ($codechk,$description) =
&Apache::lonnet::auto_validate_instcode('',
$dom,$newinstcode);
if ($codechk ne 'valid') {
@@ -389,7 +436,7 @@ sub get_breadcrumbs {
if ($$state eq $states->{$action}[$i]) {
&Apache::lonhtmlcommon::add_breadcrumb(
{text=>"$trail->{$$state}"});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
last;
} else {
if (($$state eq 'process') || ($$state eq 'removal')) {
@@ -409,14 +456,14 @@ sub get_breadcrumbs {
} else {
&Apache::lonhtmlcommon::add_breadcrumb(
{text=>'Pick Action'});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
}
} else {
&Apache::lonhtmlcommon::add_breadcrumb(
{text=>'Pick Action'});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
}
- return ($page,$crumb,$newinstcode,$codechk,$checkedcode);
+ return ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description);
}
sub header {
@@ -452,6 +499,7 @@ sub form_elements {
},
courseinfo => {
cdescr => 'text',
+ cloning => 'radio',
clonecrs => 'text',
clonedom => 'selectbox',
datemode => 'radio',
@@ -527,9 +575,9 @@ sub form_elements {
);
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'};
@@ -587,63 +635,19 @@ sub onload_action {
if ($state eq 'crstype') {
$loaditems{'onload'} = 'javascript:setAction(document.mainmenu_action);javascript:setType(document.mainmenu_coursetype)';
} else {
- $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)';
+ $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs);';
}
- }
- return \%loaditems;
-}
-
-sub check_can_request {
- my ($dom,$can_request) = @_;
- my $canreq = 0;
- my ($types,$typename) = &course_types();
- my @options = ('approval','validate','autolimit');
- my $optregex = join('|',@options);
- if ((ref($can_request) eq 'HASH') && (ref($types) eq 'ARRAY')) {
- foreach my $type (@{$types}) {
- if (&Apache::lonnet::usertools_access($env{'user.name'},
- $env{'user.domain'},
- $type,undef,'requestcourses')) {
- $canreq ++;
- if ($dom eq $env{'user.domain'}) {
- $can_request->{$type} = 1;
- }
- }
- if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
- my @curr = split(',',$env{'environment.reqcrsotherdom.'.$type});
- if (@curr > 0) {
- $canreq ++;
- unless ($dom eq $env{'user.domain'}) {
- if (grep(/^\Q$dom\E:($optregex)(=?\d*)$/,@curr)) {
- $can_request->{$type} = 1;
- }
- }
- }
- }
+ if ($state eq 'courseinfo') {
+ $loaditems{'onload'} .= 'javascript:setCloneDisplay(document.requestcrs);';
}
}
- return $canreq;
-}
-
-sub course_types {
- my @types = ('official','unofficial','community');
- my %typename = (
- official => 'Official course',
- unofficial => 'Unofficial course',
- community => 'Community',
- );
- return (\@types,\%typename);
+ return \%loaditems;
}
-
sub print_main_menu {
- my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb) = @_;
- my ($types,$typename) = &course_types();
- my $onchange;
- unless ($env{'form.interface'} eq 'textual') {
- $onchange = 1;
- }
-
+ my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb,$request_domains) = @_;
+ my ($types,$typename) = &Apache::loncommon::course_types();
+ my $onchange = 'this.form.submit()';
my $nextstate_setter = "\n";
if (ref($states) eq 'HASH') {
foreach my $key (keys(%{$states})) {
@@ -681,17 +685,18 @@ function check_can_request(crschoice,act
var unofficial = '';
var community = '';
END
-
- foreach my $item (keys(%{$can_request})) {
- $js .= "
+ if (ref($can_request) eq 'HASH') {
+ foreach my $item (keys(%{$can_request})) {
+ $js .= "
$item = 1;
";
+ }
}
my %lt = &Apache::lonlocal::texthash(
official => 'You are not permitted to request creation of an official course in this domain.',
unofficial => 'You are not permitted to request creation of an unofficial course in this domain.',
community => 'You are not permitted to request creation of a community this domain.',
- all => 'You must choose a specific course type when making a new course request.\\nAll types is not allowed.',
+ all => 'You must choose a specific course type when making a new course request.\\n\"All types\" is not allowed.',
);
$js .= <<END;
if (crschoice == 'official') {
@@ -721,20 +726,59 @@ END
}
return true;
}
-
END
-
- $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.'<div>'.
+ my ($pagetitle,$pageinfo,$domaintitle);
+ if (ref($can_request) eq 'HASH') {
+ if (($can_request->{'official'}) || ($can_request->{'unofficial'})) {
+ if ($can_request->{'community'}) {
+ $pagetitle = 'Course/Community Requests';
+ $pageinfo = &mt('Request creation of a new course or community, or review your pending requests.');
+ $domaintitle = &mt('Course/Community Domain');
+ } else {
+ $pagetitle = 'Course Requests';
+ $pageinfo = &mt('Request creation of a new course, or review your pending course requests.');
+ $domaintitle = &mt('Course Domain');
+ }
+ } elsif ($can_request->{'community'}) {
+ $pagetitle = 'Community Requests';
+ $pageinfo = &mt('Request creation of a new course, or review your pending requests.');
+ $domaintitle = &mt('Community Domain');
+ } else {
+ $pagetitle = 'Course/Community Requests';
+ $pageinfo = &mt('You do not have rights to request creation of courses in this domain; please choose a different domain.');
+ $domaintitle = &mt('Course/Community Domain');
+ }
+ }
+ my @incdoms;
+ if (ref($request_domains) eq 'HASH') {
+ foreach my $item (keys(%{$request_domains})) {
+ if (ref($request_domains->{$item}) eq 'ARRAY') {
+ foreach my $possdom (@{$request_domains->{$item}}) {
+ unless(grep(/^\Q$possdom\E$/,@incdoms)) {
+ push(@incdoms,$possdom);
+ }
+ }
+ }
+ }
+ }
+ $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
+ '<p>'.$pageinfo.'</p>'.
+ '<div>'.
&Apache::lonhtmlcommon::start_pick_box().
- &Apache::lonhtmlcommon::row_title(&mt('Course Domain')).
+ &Apache::lonhtmlcommon::row_title($domaintitle).
'<form name="domforcourse" method="post" action="/adm/requestcourse">'.
- &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange));
+ &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange,\@incdoms));
if (!$onchange) {
$r->print(' <input type="submit" name="godom" value="'.
&mt('Change').'" />');
}
+ unless ((ref($can_request) eq 'HASH') && (keys(%{$can_request}) > 0)) {
+ $r->print(&Apache::lonhtmlcommon::row_closure(1)."\n".
+ &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
+ &Apache::loncommon::end_page());
+ return;
+ }
$r->print('</form>'.&Apache::lonhtmlcommon::row_closure());
-
my $formname = 'requestcrs';
my $nexttext = &mt('Next');
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
@@ -744,25 +788,36 @@ END
<option value="view">'.&mt('View/Modify/Cancel pending requests').'</option>
<option value="log">'.&mt('View request history').'</option>
</select></form>'.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::row_title(&mt('Course Type')).'
+ &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_title(&mt('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')) {
- foreach my $type (@{$types}) {
- my $selected = '';
- if ($type eq 'official') {
- $selected = ' selected="selected"';
+<select size="1" name="crstype">');
+ if (ref($can_request) eq 'HASH') {
+ if (keys(%{$can_request}) > 1) {
+ $r->print(' <option value="any">'.&mt('All types').'</option>');
+ }
+ if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
+ foreach my $type (@{$types}) {
+ next unless($can_request->{$type});
+ my $selected = '';
+ if ($env{'form.crstype'} eq '') {
+ if ($type eq 'official') {
+ $selected = ' selected="selected"';
+ }
+ } else {
+ if ($type eq $env{'form.crstype'}) {
+ $selected = ' selected="selected"';
+ }
+ }
+ $r->print('<option value="'.$type.'"'.$selected.'>'.&mt($typename->{$type}).
+ '</option>'."\n");
}
- $r->print('<option value="'.$type.'"'.$selected.'>'.$typename->{$type}.
- '</option>'."\n");
}
}
$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".
+ '<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'."\n".
'<input type="hidden" name="state" value="crstype" />'."\n".
'<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
'<input type="hidden" name="crstype" value="" />'."\n".
@@ -776,7 +831,8 @@ END
sub request_administration {
my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb,
- $newinstcode,$codechk,$checkedcode,$invalidcrosslist,$uname,$udom) = @_;
+ $newinstcode,$codechk,$checkedcode,$description,$invalidcrosslist,
+ $uname,$udom) = @_;
my $js;
if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) {
$js = <<END;
@@ -800,12 +856,25 @@ END
}
if ($action eq 'new') {
my $jsextra;
- unless (($state eq 'review') || ($state eq 'process')) {
+ if (($state eq 'courseinfo') || ($state eq 'codepick')) {
$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);
+ my $title;
+ if ($env{'form.crstype'} eq 'community') {
+ $title = 'Request a community';
+ } else {
+ $title = 'Request a course';
+ }
+ $r->print(&header($title,$js.$jscript,$loaditems,$jsextra).$crumb);
&print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
- $codechk,$checkedcode,$invalidcrosslist);
+ $codechk,$checkedcode,$description,$invalidcrosslist);
} elsif ($action eq 'view') {
my $jsextra;
my $formname = 'requestcrs';
@@ -820,12 +889,27 @@ END
} elsif ($state eq 'cancel') {
$jsextra = &viewcancel_javascript($formname);
}
- $r->print(&header('Manage course requests',$js.$jscript.$jsextra,$loaditems).
- $crumb);
+ my $title;
+ if ($env{'form.crstype'} eq 'community') {
+ $title = 'Manage community requests';
+ } else {
+ $title = 'Manage course requests';
+ }
+ $r->print(&header($title,$js.$jscript.$jsextra,$loaditems).$crumb);
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></div>');
+ my $title;
+ if ($env{'form.crstype'} eq 'community') {
+ $title = &mt('Pending community requests');
+ } elsif ($env{'form.crstype'} eq 'official') {
+ $title = &mt('Pending requests for official courses');
+ } elsif ($env{'form.crstype'} eq 'unofficial') {
+ $title = &mt('Pending requests for unofficial courses');
+ } else {
+ $title = &mt('Pending course/community requests');
+ }
+ $r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
+ &print_request_status($dom,$action).'</form></div>');
} elsif ($state eq 'details') {
my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
my $origcnum = $env{'form.cnum'};
@@ -836,7 +920,13 @@ END
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
}
- $r->print('<h3>'.&mt('Course Request Details').'</h3><div>'."\n".$form."\n".
+ my $title;
+ if ($env{'form.crstype'} eq 'community') {
+ $title = &mt('Community Request Details');
+ } else {
+ $title = &mt('Course Request Details');
+ }
+ $r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
\@code_order)."\n".
'<input name="origcnum" value="'.$origcnum.'" type="hidden" />'."\n");
@@ -849,12 +939,18 @@ 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 $title;
+ if ($env{'form.crstype'} eq 'community') {
+ $title = &mt('Cancel community request');
+ } else {
+ $title = &mt('Cancel course request');
+ }
my ($result,$output) = &print_cancel_request($dom,$env{'form.origcnum'});
- $r->print('<h3>'.&mt('Cancel course request').'</h3><div>'."\n".$form."\n".
+ $r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
$output);
my @excluded = &get_excluded_elements($dom,$states,'view','cancel');
$r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</div>');
@@ -863,10 +959,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') {
@@ -902,7 +999,11 @@ END
'<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
'<input type="hidden" name="orignum" value="'.$cnum.'" />'."\n");
if ($result eq 'ok') {
- $r->print(&mt('Your course request has been cancelled.'));
+ if ($env{'form.crstype'} eq 'community') {
+ $r->print(&mt('Your community request has been cancelled.'));
+ } else {
+ $r->print(&mt('Your course request has been cancelled.'));
+ }
} else {
$r->print('<div class="LC_error">'.
&mt('The request cancellation process was not complete.').
@@ -917,18 +1018,184 @@ END
&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>'.
+ my ($title,$header);
+ if ($env{'form.crstype'} eq 'community') {
+ $title = 'Community Request';
+ $header = &mt('Community Request');
+ } else {
+ $title = 'Course Request';
+ $header = &mt('Course Request');
+ }
+ $r->print(&header($title,'','','',{ 'only_body' => 1}).
+ $crumb."\n".'<h3>'.$header.'</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);
}
$r->print(&Apache::loncommon::end_page());
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";
@@ -956,7 +1223,7 @@ sub get_instcode {
sub print_request_form {
my ($r,$action,$state,$page,$states,$dom,$newinstcode,$codechk,$checkedcode,
- $invalidcrosslist) = @_;
+ $description,$invalidcrosslist) = @_;
my $formname = 'requestcrs';
my ($next,$prev,$message,$output,$codepicker,$crstype);
$prev = $states->{$action}[$page-1];
@@ -966,7 +1233,7 @@ sub print_request_form {
next => 'Next',
);
$crstype = $env{'form.crstype'};
- $r->print('<form name="'.$formname.'" method="post" action="/adm/requestcourse">');
+ $r->print('<br /><form name="'.$formname.'" method="post" action="/adm/requestcourse">');
my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk,
@disallowed);
if ($crstype eq 'official') {
@@ -1003,7 +1270,9 @@ sub print_request_form {
$codepicker = &coursecode_form($dom,'instcode',\@codetitles,
\%cat_titles,\%cat_order);
if ($codepicker) {
- $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box().$codepicker.
+ $r->print(&mt('Specify the course to be created.').
+ '<div>'.&Apache::lonhtmlcommon::start_pick_box().
+ $codepicker.
&Apache::lonhtmlcommon::end_pick_box().'</div>');
} else {
$next = $states->{$action}[$page+2];
@@ -1019,7 +1288,7 @@ sub print_request_form {
if ($instcode eq '') {
$prev = $states->{$action}[$page-2];
}
- $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
+ $r->print(&courseinfo_form($dom,$formname,$crstype,$next,$description));
} elsif ($state eq 'enrollment') {
if ($crstype eq 'official') {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
@@ -1108,14 +1377,26 @@ sub print_request_form {
if ($env{'form.origcnum'} =~ /^($match_courseid)$/) {
$cnum = $env{'form.origcnum'};
} else {
- $cnum = &Apache::lonnet::generate_coursenum($dom);
+ my $gentype = 'Course';
+ if ($crstype eq 'community') {
+ $gentype = 'Community';
+ }
+ $cnum = &Apache::lonnet::generate_coursenum($dom,$gentype);
}
&Apache::lonnet::auto_possible_instcodes($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).
+ if ($crstype eq 'community') {
+ $r->print('<h3>'.&mt('Review community request details before submission').'</h3>');
+ } else {
+ $r->print('<h3>'.&mt('Review course request details before submission').'</h3>');
+ }
+ $r->print(&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');
+ if ($crstype eq 'community') {
+ $navtxt{'next'} = &mt('Submit community request');
+ } else {
+ $navtxt{'next'} = &mt('Submit course request');
+ }
} elsif ($state eq 'process') {
if ($crstype eq 'official') {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
@@ -1168,7 +1449,8 @@ sub print_request_form {
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;
}
@@ -1242,7 +1524,7 @@ sub get_excluded_elements {
sub print_enrollment_menu {
my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
$invalidcrosslist) =@_;
- my ($sections,$autoenroll,$access_dates,$output);
+ my ($sections,$autoenroll,$access_dates,$output,$hasauto);
my $starttime = time;
my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
@@ -1261,7 +1543,8 @@ sub print_enrollment_menu {
$section_form = &inst_section_selector($dom,$instcode);
if ($section_form) {
$sections = &Apache::lonhtmlcommon::row_headline().
- '<h3>'.&mt('Sections for auto-enrollment').'</h3>'.
+ '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Sections').
+ ' '.&mt('Sections for auto-enrollment').'</h3>'.
&Apache::lonhtmlcommon::row_closure(1).
$section_form;
}
@@ -1278,7 +1561,7 @@ sub print_enrollment_menu {
}
if ($crosslist_form) {
$crosslist_form .=
- &Apache::lonhtmlcommon::row_title(&mt('Add another?')).
+ &Apache::lonhtmlcommon::row_title(&mt('Add another')).
'<input name="crosslisttotal" type="hidden" value="'.$crosslisttotal.'" />'.
'<input name="addcrosslist" type="checkbox" value="'.$crosslisttotal.'"'.
' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
@@ -1288,26 +1571,29 @@ sub print_enrollment_menu {
&Apache::lonhtmlcommon::row_closure(1).
$crosslist_form;
}
+ $hasauto = 1;
$autoenroll =
- &Apache::lonhtmlcommon::row_title(&mt('Add registered students automatically')).
+ &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autoadd').' '.&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(1).
- &Apache::lonhtmlcommon::row_title(&mt('Drop unregistered students automatically')).
+ &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autodrop').' '.&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(1).
- &date_setting_table($starttime,$endtime,$formname,'enroll',%enrolltitles);
+ &date_setting_table($starttime,$endtime,$formname,'enroll',
+ $hasauto,%enrolltitles);
}
}
my $access_dates =
- &date_setting_table($starttime,$endtime,$formname,'access',%accesstitles);
+ &date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
+ %accesstitles);
$output .= &Apache::lonhtmlcommon::start_pick_box();
if ($sections) {
$output .= $sections;
@@ -1361,18 +1647,23 @@ sub inst_section_selector {
'<th>'.&mt('Include?').'<input type="hidden" name="sectotal" '.
'value="'.$sectotal.'" /></th>'.
'<th>'.&mt('Institutional Section').'</th>'.
- '<th>'.&mt('LON-CAPA section').'</th>'.
+ '<th>'.&Apache::loncommon::help_open_topic('Course_Request_LCSection').
+ ' '.&mt('LON-CAPA section').'</th>'.
&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.
@@ -1386,7 +1677,7 @@ sub inst_section_selector {
}
sub date_setting_table {
- my ($starttime,$endtime,$formname,$prefix,%datetitles) = @_;
+ my ($starttime,$endtime,$formname,$prefix,$hasauto,%datetitles) = @_;
my ($perpetual,$table);
my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
$starttime,'','','',1,'','','',1);
@@ -1399,11 +1690,27 @@ sub date_setting_table {
&mt('No end date').'</label></span>';
$closure = '1';
}
- $table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}).
- $startform.
+
+ my %help_item = (
+ access => {
+ start => 'Course_Request_Access_Start',
+ end => 'Course_Request_Access_End',
+ },
+ enroll => {
+ start => 'Course_Request_Enroll_Start',
+ end => 'Course_Request_Enroll_End',
+ },
+ );
+ if ($hasauto) {
+ $help_item{'access'}{'start'} = 'Course_Request_RegAccess_Start';
+ $help_item{'access'}{'end'} = 'Course_Request_RegAccess_End';
+ }
+
+ $table = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'start'}).
+ ' '.&mt($datetitles{'start'})).$startform.
&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::row_title($datetitles{'end'}).
- $endform.$perpetual.
+ &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'end'}).
+ ' '.&mt($datetitles{'end'})).$endform.$perpetual.
&Apache::lonhtmlcommon::row_closure($closure);
return $table;
}
@@ -1426,12 +1733,12 @@ sub print_personnel_menu {
}
my @items = ('uname','dom','lastname','firstname','emailaddr','hidedom');
- my $roleoptions;
- my @roles = &Apache::lonuserutils::roles_by_context('course');
my $type = 'Course';
if ($crstype eq 'community') {
$type = 'Community';
}
+ my $roleoptions;
+ my @roles = &Apache::lonuserutils::roles_by_context('course','',$type);
foreach my $role (@roles) {
my $plrole = &Apache::lonnet::plaintext($role,$type);
$roleoptions .= ' <option value="'.$role.'">'.$plrole.'</option>'."\n";
@@ -1466,8 +1773,13 @@ sub print_personnel_menu {
}
if ($persontotal) {
+ my %lt = &Apache::lonlocal::texthash(
+ community => 'Requestor is automatically assigned Coordinator role.',
+ official => 'Requestor is automatically assigned Course Coordinator role.',
+ );
+ $lt{'unofficial'} = $lt{'official'};
$output .= &Apache::lonhtmlcommon::row_headline().
- '<h3>'.&mt('Requestor is automatically assigned Course Coordinator role.').' '.&mt('Include other personnel?').'</h3>';
+ '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').' '.$lt{$crstype}.' '.&mt('Include other personnel?').'</h3>';
}
for (my $i=0; $i<$persontotal; $i++) {
my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
@@ -1509,16 +1821,22 @@ sub print_personnel_menu {
'<td align="center" valign="top">'.&mt('First Name').'<br />'.$form_elems{'firstname'}.'</td>'."\n".
'<td align="center" valign="top">'.&mt('Last Name').'<br />'.$form_elems{'lastname'}.'</td>'."\n".
'<td align="center" valign="top">'.&mt('E-mail').'<br />'.$form_elems{'emailaddr'}.'</td></tr>'."\n".
- '<tr><td align="center" valign="top">'.&mt('Role').'<br />'.$roleselector.'</td>'."\n".
- '<td'.$seccolspan.' align="center" valign="top">'.&mt('Section(s)').'<br />'.$sectionselector.'</td>'."\n".
+ '<tr><td align="center" valign="top">'.&Apache::loncommon::help_open_topic('Course_Roles').' '.&mt('Role').'<br />'.$roleselector.'</td>'."\n".
+ '<td'.$seccolspan.' align="center" valign="top">'.
+ &Apache::loncommon::help_open_topic('Course_Request_Rolesection').' '.&mt('LON-CAPA Section(s)').'<br />'.$sectionselector.'</td>'."\n".
'</tr></table>'.&Apache::lonhtmlcommon::row_closure();
}
- $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another?')).
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another')).
'<input name="persontotal" type="hidden" value="'.$persontotal.'" />'.
'<input name="addperson" type="checkbox" value="'.$persontotal.'"'.
' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
"'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().'</div>';
+ if ($crstype eq 'community') {
+ $output .= '<p>'.&mt('You may also add users later, once the community has been created, by using the "Manage community users" link, accessible from the "Main Menu".').'</p>';
+ } else {
+ $output .= '<p>'.&mt('You may also add users later, once the course has been created, by using the "Manage course users" link, accessible from the "Main Menu".').'</p>';
+ }
return $output;
}
@@ -1526,10 +1844,12 @@ sub current_lc_sections {
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);
+ 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);
+ }
}
}
}
@@ -1537,67 +1857,111 @@ sub current_lc_sections {
return @currsecs;
}
-sub print_request_status {
- my ($dom) = @_;
+sub sorted_request_history {
+ my ($dom,$action,$curr_req) = @_;
+ my ($after,$before,$statusfilter,$crstypefilter);
+ if ($env{'form.status'} ne '') {
+ $statusfilter = $env{'form.status'};
+ }
+ if ($env{'form.crstype'} ne '') {
+ $crstypefilter = $env{'form.crstype'};
+ }
+ if (ref($curr_req) eq 'HASH') {
+ $after = $curr_req->{'requested_after_date'},
+ $before = $curr_req->{'requested_before_date'};
+ $statusfilter = $curr_req->{'status'};
+ $crstypefilter = $curr_req->{'crstype'};
+ }
my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
$env{'user.name'},'^status:'.$dom);
- my ($output,$formname,%queue_by_date,%typenames);
- if ($env{'form.crstype'} eq 'any') {
- %typenames = &Apache::lonlocal::texthash (
- official => 'Official course',
- unofficial => 'Unofficial course',
- community => 'Community',
- );
- }
+ my %queue_by_date;
+ my ($types,$typenames) = &Apache::loncommon::course_types();
foreach my $key (keys(%statusinfo)) {
- if (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')) {
- (undef,my($cdom,$cnum)) = split(':',$key);
- next if ($cdom ne $dom);
- my $requestkey = $cdom.'_'.$cnum;
- if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
- my %history = &Apache::lonnet::restore($requestkey,'courserequests',
- $env{'user.domain'},$env{'user.name'});
- my $entry;
- my $timestamp = $history{'reqtime'};
- my $crstype = $history{'crstype'};
- my $disposition = $history{'disposition'};
+ if ($action eq 'view') {
+ next unless (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending'));
+ } else {
+ next unless (($statusfilter eq 'any') ||
+ ($statusfilter eq $statusinfo{$key}));
+ }
+ (undef,my($cdom,$cnum)) = split(':',$key);
+ next if ($cdom ne $dom);
+ my $requestkey = $cdom.'_'.$cnum;
+ if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+ my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+ $env{'user.domain'},$env{'user.name'});
+ my $entry;
+ my $reqtime = $history{'reqtime'};
+ my $lastupdate = $history{'timestamp'};
+ my $crstype = $history{'crstype'};
+ my $disposition = $history{'disposition'};
+ my $status = $history{'status'};
+ if ($action eq 'view') {
next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
- next unless (($env{'form.crstype'} eq 'any') ||
- ($env{'form.crstype'} eq $crstype));
+ } else {
+ next if (($reqtime < $after) || ($reqtime > $before));
+ }
+ next unless (($crstypefilter eq 'any') ||
+ ($crstypefilter eq $crstype));
+ if ($action eq 'view') {
next unless (($disposition eq 'approval') ||
($disposition eq 'pending'));
- if (ref($history{'details'}) eq 'HASH') {
- $entry = $requestkey.':'.$crstype.':'.
- &escape($history{'details'}{'cdescr'});
- if ($crstype eq 'official') {
- $entry .= ':'.&escape($history{'details'}{'instcode'});
+ }
+ if (ref($history{'details'}) eq 'HASH') {
+ $entry = $requestkey.':'.$crstype.':'.
+ &escape($history{'details'}{'cdescr'});
+ if ($action eq 'log') {
+ $entry .= ':'.$lastupdate.':';
+ if ($statusinfo{$key} ne '') {
+ $entry .= $statusinfo{$key};
+ } elsif ($status ne '') {
+ $entry .= $status;
+ } else {
+ $entry .= $disposition;
}
}
- if ($entry ne '') {
- if (exists($queue_by_date{$timestamp})) {
- if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
- push(@{$queue_by_date{$timestamp}},$entry);
- }
- } else {
- @{$queue_by_date{$timestamp}} = ($entry);
+ if ($crstype eq 'official') {
+ $entry .= ':'.&escape($history{'details'}{'instcode'});
+ }
+ }
+ if ($entry ne '') {
+ if (exists($queue_by_date{$reqtime})) {
+ if (ref($queue_by_date{$reqtime}) eq 'ARRAY') {
+ push(@{$queue_by_date{$reqtime}},$entry);
}
+ } else {
+ @{$queue_by_date{$reqtime}} = ($entry);
}
}
}
}
- $formname = 'requestcrs';
+ return %queue_by_date;
+}
+
+sub print_request_status {
+ my ($dom,$action) = @_;
+ my %queue_by_date = &sorted_request_history($dom,$action);
my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
- $output = '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+ my $formname = 'requestcrs';
+ my ($types,$typenames) = &Apache::loncommon::course_types();
+ my $output = '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
'<input type="hidden" name="state" value="'.$env{'form.state'}.'" />'."\n".
'<input type="hidden" name="crstype" value="'.$env{'form.crstype'}.'" />'."\n".
'<input type="hidden" name="showdom" value="" />'."\n".
'<input type="hidden" name="cnum" value="" />'."\n";
if (@sortedtimes > 0) {
+ my $desctitle;
+ if ($env{'form.crstype'} eq 'any') {
+ $desctitle = &mt('Course/Community Description')
+ } elsif ($env{'form.crstype'} eq 'community') {
+ $desctitle = &mt('Community Description')
+ } else {
+ $desctitle = &mt('Course Description');
+ }
$output .= &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Action').'</th>'.
- '<th>'.&mt('Course Description').'</th>'.
+ '<th>'.$desctitle.'</th>'.
'<th>'.&mt('Domain').'</th>';
if ($env{'form.crstype'} eq 'any') {
$output .= '<th>'.&mt('Type').'</th>';
@@ -1619,7 +1983,10 @@ sub print_request_status {
'<td>'.&unescape($desc).'</td>'.
'<td>'.$cdom.'</td>';
if ($env{'form.crstype'} eq 'any') {
- my $typename = $typenames{$type};
+ my $typename;
+ if (ref($typenames) eq 'HASH') {
+ $typename = &mt($typenames->{$type});
+ }
if ($typename eq '') {
$typename = &mt('Unknown type');
}
@@ -1642,7 +2009,13 @@ sub print_request_status {
}
$output .= &Apache::loncommon::end_data_table();
} else {
- $output .= '<div>'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
+ if ($env{'form.crstype'} eq 'any') {
+$output .= '<div>'.&mt('You have no matching course or community requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
+ } elsif ($env{'form.crstype'} eq 'community') {
+ $output .= '<div>'.&mt('You have no matching community requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
+ } else {
+ $output .= '<div>'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
+ }
}
$output .= '
<br /><input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />';
@@ -1667,7 +2040,7 @@ sub print_cancel_request {
}
$output = &mt('No further action will be taken');
} elsif (ref($history{'details'}) eq 'HASH') {
- my ($types,$typename) = &course_types();
+ my ($types,$typename) = &Apache::loncommon::course_types();
my $showtype = $crstype;
if (defined($typename->{$crstype})) {
$showtype = $typename->{$crstype};
@@ -1683,8 +2056,12 @@ sub print_cancel_request {
'<td>'.$showtype.'</td>'.
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().
- '<br /><div class="LC_warning">'.
- &mt('Cancelling the request will remove it from the queue of pending course requests').'</div>';
+ '<br /><div class="LC_warning">';
+ if ($crstype eq 'community') {
+ $output .= &mt('Cancelling the request will remove it from the queue of pending community requests').'</div>';
+ } else {
+ $output .= &mt('Cancelling the request will remove it from the queue of pending course requests').'</div>';
+ }
$result = 'ok';
} else {
$output = '<div class="LC_error">'.&mt('No record exists for the course ID').'</div>';
@@ -1746,14 +2123,295 @@ ENDJS
}
sub print_request_logs {
- my ($jscript,$loaditems,$crumb) = @_;
+ my ($r,$dom,$jscript,$loaditems,$crumb) = @_;
+ my $title;
+ if ($env{'form.crstype'} eq 'community') {
+ $title = 'Community Request Logs';
+ } elsif ($env{'form.crstype'} eq 'any') {
+ $title = 'Course/Community Request Logs';
+ } else {
+ $title = 'Course Request Logs';
+ }
+ $r->print(&header($title,$jscript,$loaditems).$crumb);
+ my $formname = 'requestcrs';
+ $r->print('<form action="/adm/requestcourse" method="post" name="'.$formname.'" onsubmit="javascript:setPage(this);">'."\n".
+ '<input type="hidden" name="action" value="log" />'."\n".
+ '<input type="hidden" name="state" value="display" />'."\n");
+ # set defaults
+ my $now = time();
+ my $defstart = $now - (7*24*3600); #7 days ago
+ my %defaults = (
+ page => '1',
+ show => '10',
+ crstype => 'any',
+ status => 'any',
+ requested_before_date => $now,
+ requested_after_date => $defstart,
+ );
+ my ($types,$typenames) = &Apache::loncommon::course_types();
+ my $more_records = 0;
+ my %curr;
+ foreach my $item ('show','page','crstype','status') {
+ $curr{$item} = $env{'form.'.$item};
+ }
+ $curr{'requested_after_date'} = &Apache::lonhtmlcommon::get_date_from_form('requested_after_date');
+ $curr{'requested_before_date'} = &Apache::lonhtmlcommon::get_date_from_form('requested_before_date');
+ foreach my $key (keys(%defaults)) {
+ if ($curr{$key} eq '') {
+ $curr{$key} = $defaults{$key};
+ }
+ }
+ my ($statuses,$statusnames) = &reqstatus_names($curr{'crstype'});
+ $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
+ &requestlog_display_filter($formname,\%curr));
+ my %queue_by_date = &sorted_request_history($dom,$env{'form.action'},\%curr);
+ my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
+ my $showntablehdr = 0;
+ my $tablehdr = &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th> </th><th>'.&mt('Request Date').'</th>'.
+ '<th>'.&mt('Description').'</th>';
+ if ($curr{'crstype'} eq 'any') {
+ $tablehdr .= '<th>'.&mt('Course Type').'</th>';
+ }
+ if (($curr{'crstype'} eq 'official') || ($curr{'crstype'} eq 'any')) {
+ $tablehdr .= '<th>'.&mt('Institutional Code').'</th>';
+ }
+ if ($curr{'status'} eq 'any') {
+ $tablehdr .= '<th>'.&mt('Status').'</th>';
+ } elsif ($curr{'status'} eq 'created') {
+ $tablehdr .= '<th>'.&mt('Creation Date').'</th>';
+ } elsif ($curr{'status'} eq 'cancelled') {
+ $tablehdr .= '<th>'.&mt('Cancellation Date').'</th>';
+ } elsif ($curr{'status'} eq 'rejected') {
+ $tablehdr .= '<th>'.&mt('Rejection Date').'</th>';
+ }
+ $tablehdr .= &Apache::loncommon::end_data_table_header_row();
+ my ($minshown,$maxshown);
+ $minshown = 1;
+ my $count = 0;
+ if ($curr{'show'} ne &mt('all')) {
+ $maxshown = $curr{'page'} * $curr{'show'};
+ if ($curr{'page'} > 1) {
+ $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
+ }
+ }
+ my $norecords;
+ if (@sortedtimes > 0) {
+ foreach my $item (@sortedtimes) {
+ if ($curr{'show'} ne &mt('all')) {
+ if ($count >= $curr{'page'} * $curr{'show'}) {
+ $more_records = 1;
+ last;
+ }
+ }
+ $count ++;
+ next if ($count < $minshown);
+ if (!$showntablehdr) {
+ $r->print($tablehdr);
+ $showntablehdr = 1;
+ }
+ my $showtime = &Apache::lonlocal::locallocaltime($item);
+ if (ref($queue_by_date{$item}) eq 'ARRAY') {
+ foreach my $request (sort(@{$queue_by_date{$item}})) {
+ my ($key,$crstype,$desc,$timestamp,$status,$instcode) = split(':',$request);
+ my ($cdom,$cnum) = split('_',$key);
+ my $output = &Apache::loncommon::start_data_table_row().
+ '<td>'.$count.'</td>'.
+ '<td>'.$showtime.'</td>'.
+ '<td>'.&unescape($desc).'</td>';
+ if ($curr{'crstype'} eq 'any') {
+ my $typename;
+ if (ref($typenames) eq 'HASH') {
+ $typename = &mt($typenames->{$crstype});
+ }
+ if ($typename eq '') {
+ $typename = &mt('Unknown type');
+ }
+ $output .= '<td>'.$typename.'</td>';
+ }
+ if (($curr{'crstype'} eq 'any') ||
+ ($curr{'crstype'} eq 'official')) {
+ my $showinstcode;
+ if ($crstype eq 'official') {
+ $showinstcode = &unescape($instcode);
+ } else {
+ $showinstcode = &mt('Not applicable');
+ }
+ $output .= '<td>'.$showinstcode.'</td>';
+ }
+ if ($curr{'status'} eq 'any') {
+ my $statusname = &mt('Unknown status');
+ if (ref($statusnames) eq 'HASH') {
+ if ($statusnames->{$status} ne '') {
+ $statusname = $statusnames->{$status};
+ }
+ }
+ if (($status eq 'created') || ($status eq 'cancelled') ||
+ ($status eq 'rejected')) {
+ $statusname .= ' '.&Apache::lonlocal::locallocaltime($timestamp);
+ }
+ $output .= '<td>'.$statusname.'</td>';
+ } elsif (($status eq 'created') || ($status eq 'cancelled') ||
+ ($status eq 'rejected')) {
+ $output .= '<td>'.&Apache::lonlocal::locallocaltime($timestamp).'</td>';
+ }
+ $output .= &Apache::loncommon::end_data_table_row();
+ $r->print($output);
+ }
+ }
+ }
+ if ($showntablehdr) {
+ $r->print(&Apache::loncommon::end_data_table());
+ if (($curr{'page'} > 1) || ($more_records)) {
+ $r->print('<table><tr>');
+ if ($curr{'page'} > 1) {
+ $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
+ }
+ if ($more_records) {
+ $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
+ }
+ $r->print('</tr></table>');
+ $r->print(<<"ENDSCRIPT");
+<script type="text/javascript">
+// <![CDATA[
+function chgPage(caller) {
+ if (caller == 'previous') {
+ document.$formname.page.value --;
+ }
+ if (caller == 'next') {
+ document.$formname.page.value ++;
+ }
+ document.$formname.submit();
+ return;
+}
+// ]]>
+</script>
+ENDSCRIPT
+ }
+ } else {
+ $norecords = 1;
+ }
+ } else {
+ $norecords = 1;
+ }
+ if ($norecords) {
+ $r->print('<p class="LC_info">'.
+ &mt('There are no records to display').
+ '</p>');
+ }
+ $r->print('</form>'.
+ &Apache::loncommon::end_page());
return;
}
+sub reqstatus_names {
+ my ($crstype) = @_;
+ my @statuses = qw(created approval pending rejected cancelled);
+ my %statusnames =
+ &Apache::lonlocal::texthash (
+ created => 'Created',
+ approval => 'Queued pending approval',
+ pending => 'Queued pending validation',
+ rejected => 'Request rejected',
+ cancelled => 'Request cancelled',
+ );
+ if (($crstype eq 'official') || ($crstype eq 'unofficial')) {
+ $statusnames{'created'} = &mt('Course created');
+ } elsif ($crstype eq 'community') {
+ $statusnames{'created'} = &mt('Community created');
+ }
+ return (\@statuses,\%statusnames);
+}
+
+sub requestlog_display_filter {
+ my ($formname,$curr) = @_;
+ my $nolink = 1;
+ my $output = '<table><tr><td valign="top">'.
+ '<span class="LC_nobreak"><b>'.&mt('Records/page:').'</b></span><br />'.
+ &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+ (&mt('all'),5,10,20,50,100,1000,10000)).
+ '</td><td> </td>';
+ my $startform =
+ &Apache::lonhtmlcommon::date_setter($formname,'requested_after_date',
+ $curr->{'requested_after_date'},undef,
+ undef,undef,undef,undef,undef,undef,$nolink);
+ my $endform =
+ &Apache::lonhtmlcommon::date_setter($formname,'requested_before_date',
+ $curr->{'requested_before_date'},undef,
+ undef,undef,undef,undef,undef,undef,$nolink);
+ $output .= '<td valign="top"><b>'.&mt('Window during which course/community was requested:').'</b><br />'.
+ '<table><tr><td>'.&mt('After:').
+ '</td><td>'.$startform.'</td></tr>'.
+ '<tr><td>'.&mt('Before:').'</td>'.
+ '<td>'.$endform.'</td></tr></table>'.
+ '</td>'.
+ '<td> </td>';
+ my ($types,$typenames) = &Apache::loncommon::course_types();
+ if (ref($types) eq 'ARRAY') {
+ if (@{$types} > 1) {
+ $output .= '<td valign="top"><b>'.
+ &mt('Course Type:').'</b><br /><select name="crstype">';
+ my $selstr = '';
+ if ($curr->{'crstype'} eq 'any') {
+ $selstr = ' selected="selected"';
+ }
+ $output .= '<option value="any"'.$selstr.'>'.&mt('All types').'</option>'."\n";
+ foreach my $crstype (@{$types}) {
+ my $selstr = '';
+ if ($curr->{'crstype'} eq $crstype) {
+ $selstr = ' selected="selected"';
+ }
+ my $typename = $crstype;
+ if (ref($typenames) eq 'HASH') {
+ if ($typenames->{$crstype} ne '') {
+ $typename = $typenames->{$crstype};
+ }
+ }
+ $output .= '<option value="'.$crstype.'"'.$selstr.'>'.$typename.'</option>'."\n";
+ }
+ $output .= '</select></td>';
+ }
+ }
+ my ($statuses,$statusnames) = &reqstatus_names($curr->{'crstype'});
+ if (ref($statuses) eq 'ARRAY') {
+ if (@{$statuses} > 1) {
+ $output .= '<td valign="top"><b>'.
+ &mt('Request Status:').'</b><br /><select name="status">';
+ my $selstr = '';
+ if ($curr->{'status'} eq 'any') {
+ $selstr = ' selected="selected"';
+ }
+ $output .= '<option value="any"'.$selstr.'>'.&mt('Any status').'</option>'."\n";
+ foreach my $status (@{$statuses}) {
+ my $selstr = '';
+ if ($curr->{'status'} eq $status) {
+ $selstr = ' selected="selected"';
+ }
+ my $statusname = $status;
+ if (ref($statusnames) eq 'HASH') {
+ if ($statusnames->{$status} ne '') {
+ $statusname = $statusnames->{$status};
+ }
+ }
+ $output .= '<option value="'.$status.'"'.$selstr.'>'.$statusname.'</option>'."\n";
+ }
+ $output .= '</select></td>';
+ }
+ }
+ $output .= '</tr></table>';
+
+ # Update Display button
+ $output .= '<p>'.
+ '<input type="submit" value="'.&mt('Update Display').'" />'.
+ '</p><hr />';
+ return $output;
+}
+
sub print_review {
my ($dom,$codetitles,$cat_titles,$cat_order,$code_order,$uname,$udom,
$disallowed,$disallowmsg) = @_;
- my ($types,$typename) = &course_types();
+ my ($types,$typename) = &Apache::loncommon::course_types();
my ($owner,$ownername,$owneremail);
if ($uname eq '' || $udom eq '') {
$uname = $env{'user.name'};
@@ -1772,7 +2430,7 @@ sub print_review {
$crstypename = $env{'form.crstype'};
if (ref($typename) eq 'HASH') {
unless ($typename->{$env{'form.crstype'}} eq '') {
- $crstypename = $typename->{$env{'form.crstype'}};
+ $crstypename = &mt($typename->{$env{'form.crstype'}});
}
}
my $category = 'Course';
@@ -1873,10 +2531,12 @@ sub print_review {
my %ctxt = &clone_text();
$inst_headers .= '<th>'.&mt('Clone From').'</th>';
- if (($env{'form.clonecrs'} =~ /^$match_name$/) &&
+ if (($env{'form.cloning'}) &&
+ ($env{'form.clonecrs'} =~ /^$match_name$/) &&
($env{'form.clonedom'} =~ /^$match_domain$/)) {
my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
- $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'});
+ $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
+ $env{'form.crstype'});
if ($canclone) {
my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
$env{'form.clonecrs'},('description','internal.coursecode'));
@@ -1918,29 +2578,40 @@ sub print_review {
}
my $container = 'Course';
+ my $ccrole = 'cc';
if ($env{'form.crstype'} eq 'community') {
$container = 'Community';
+ $ccrole = 'co';
}
$personnel_headers = '<th>'.&mt('Name').'</th><th>'.&mt('Username:Domain').
'</th><th>'.&mt('Role').'</th><th>'.&mt('LON-CAPA Sections').
'</th>';
+
$personnel_values .= '<tr><td>'.$ownername.'</td><td>'.$owner.'</td>'.
- '<td>'.&Apache::lonnet::plaintext('cc',$container).'</td>'.
+ '<td>'.&Apache::lonnet::plaintext($ccrole,$container).'</td>'.
'<td>'.&mt('None').'</td></tr>';
for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
if ($env{'form.person_'.$i.'_uname'} ne '') {
if (ref($disallowed) eq 'ARRAY') {
next if (grep(/^$i$/,@{$disallowed}));
}
- my @allsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+ 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);
@@ -1954,7 +2625,7 @@ sub print_review {
if ($showsec eq '') {
$showsec = &mt('None');
}
- if ($env{'form.person_'.$i.'_role'} eq 'cc') {
+ if ($env{'form.person_'.$i.'_role'} eq $ccrole) {
$showsec = &mt('None');
}
my $role = $env{'form.person_'.$i.'_role'};
@@ -2026,33 +2697,57 @@ sub dates_from_form {
}
sub courseinfo_form {
- my ($dom,$formname,$crstype,$next) = @_;
- my $nodescr = &mt('You must provide a (brief) course description.');
+ my ($dom,$formname,$crstype,$next,$description) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ official => 'You must provide a (brief) course description.',
+ community => 'You must provide a (brief) community description.'
+ );
+ $lt{'unofficial'} = $lt{'official'};
my $js_validate = <<"ENDJS";
<script type="text/javascript">
// <![CDATA['
function validateForm() {
if ((document.$formname.cdescr.value == "") || (document.$formname.cdescr.value == "undefined")) {
- alert('$nodescr');
+ alert('$lt{$crstype}');
return;
}
nextPage(document.$formname,'$next');
}
+
+function toggleCloning() {
+ var willclone;
+ if (document.$formname.cloning.length > 1) {
+ for (var i=0; i<document.$formname.cloning.length; i++) {
+ if (document.$formname.cloning[i].checked) {
+ willclone = document.$formname.cloning[i].value;
+ }
+ }
+ }
+ if (willclone == 1) {
+ document.getElementById('cloneoptions').style.display="block";
+ } else {
+ document.getElementById('cloneoptions').style.display="none";
+ document.$formname.clonecrs.value = '';
+ }
+}
+
// ]]
</script>
ENDJS
my $title = &mt('Brief Course Description');
+ my $clonetitle = &mt('Clone content and settings from an existing course?');
if ($crstype eq 'community') {
$title = &mt('Brief Community Description');
+ $clonetitle = &mt('Clone content and settings from an existing community?');
}
- my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
+ my $output .= $js_validate."\n".&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_headline().
- '<h3>'.$title.'</h3>'.
+ '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Description').' '.$title.'</h3>'.
&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title(&mt('Description')).
- '<input type="text" size="40" name="cdescr" />';
+ '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($dom,'chome',
'default','hide');
@@ -2063,10 +2758,22 @@ ENDJS
$output .= $home_server_pick.
&Apache::lonhtmlcommon::row_closure().
&Apache::lonhtmlcommon::row_headline().
- '<h3>'.&mt('Clone content and settings from an existing course?').'</h3>'.
+ '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').' '.$clonetitle.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_title(&mt('Clone?')).
+ '<label><input type="radio" name="cloning" value="1" '.
+ 'onclick="javascript:toggleCloning()" />'.
+ &mt('Yes').(' 'x2).'</label><label>'.
+ '<input type="radio" name="cloning" value="0" checked="checked" '.
+ 'onclick="javascript:toggleCloning()" />'.&mt('No').'</label>'.
+ '</h3>'.
&Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_headline().
+ '<div id="cloneoptions" style="display: none" >'.
+ &Apache::lonhtmlcommon::start_pick_box().
&clone_form($dom,$formname,$crstype).
- &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+ &Apache::lonhtmlcommon::end_pick_box().'</div>'.
+ &Apache::lonhtmlcommon::end_pick_box()."\n";
return $output;
}
@@ -2076,15 +2783,16 @@ sub clone_form {
if ($crstype eq 'community') {
$type = 'Community';
}
- my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').
- &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
my %lt = &clone_text();
my $output .=
+ &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'<label>'.
+ &Apache::loncommon::select_dom_form($dom,'clonedom').'</label>'.
+ &Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
- '<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(1).
+ '<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();opencrsbrowser('."'$formname','clonecrs','clonedom','','','','','$type'".')" />'.
+ '</label> '.
+ &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type).
+ &Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.
'<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
'</label><br /><label>'.
@@ -2111,10 +2819,14 @@ sub clone_text {
sub coursecode_form {
my ($dom,$context,$codetitles,$cat_titles,$cat_order,$num) = @_;
my $output;
- my %rowtitle = (
+ my %rowtitle = &Apache::lonlocal::texthash (
instcode => 'Course Category',
crosslist => 'Cross Listed Course',
);
+ my %helpitem = (
+ instcode => 'Course_Request_Category',
+ crosslist => 'Course_Request_Crosslist',
+ );
if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH') &&
(ref($cat_order))) {
my ($sel,$instsec,$lcsec);
@@ -2130,7 +2842,7 @@ sub coursecode_form {
my $lastitem = pop(@{$codetitles});
my $lastinput = '<input type="text" size="5" name="'.$sel.'_'. $lastitem.'" />';
if (@{$codetitles} > 0) {
- $output = &Apache::lonhtmlcommon::row_title($rowtitle{$context}).
+ $output = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($helpitem{$context}).' '.$rowtitle{$context}).
'<table><tr>';
if ($context eq 'crosslist') {
$output .= '<td>'.&mt('Include?').'<br />'.
@@ -2203,7 +2915,7 @@ sub get_course_dom {
}
}
if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
- my ($types,$typename) = &course_types();
+ my ($types,$typename) = &Apache::loncommon::course_types();
if (ref($types) eq 'ARRAY') {
foreach my $type (@{$types}) {
if (&Apache::lonnet::usertools_access($env{'user.name'},
@@ -2242,11 +2954,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.'" '.
@@ -2254,16 +2966,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>');
}
@@ -2288,6 +3018,10 @@ sub print_request_outcome {
}
$now = time;
$crstype = $env{'form.crstype'};
+ my $ccrole = 'cc';
+ if ($crstype eq 'community') {
+ $ccrole = 'co';
+ }
my @instsections;
if ($crstype eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {
@@ -2349,24 +3083,31 @@ sub print_request_outcome {
} else {
@{$personnel{$uname.':'.$udom}{'roles'}} = ($role);
}
- if ($role eq 'cc') {
+ if ($role eq $ccrole) {
@{$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 {
@@ -2394,14 +3135,16 @@ sub print_request_outcome {
}
my $clonecrs = '';
my $clonedom = '';
- if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) &&
+ if (($env{'form.cloning'}) &&
+ ($env{'form.clonecrs'} =~ /^($match_courseid)$/) &&
($env{'form.clonedom'} =~ /^($match_domain)$/)) {
my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
$env{'form.clonedom'});
if ($clonehome ne 'no_host') {
my $canclone =
&Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
- $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'});
+ $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
+ $crstype);
if ($canclone) {
$clonecrs = $env{'form.clonecrs'};
$clonedom = $env{'form.clonedom'};
@@ -2434,7 +3177,9 @@ sub print_request_outcome {
personnel => \%personnel,
};
my (@inststatuses,$storeresult,$creationresult);
- my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
+ my $val =
+ &Apache::loncoursequeueadmin::get_processtype($env{'user.name'},$env{'user.domain'},
+ $env{'user.adv'},$dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
if ($crstype eq 'official') {
$output = &mt('You are not permitted to request creation of official courses.');
@@ -2492,7 +3237,11 @@ sub print_request_outcome {
$reqstatus = $disposition;
my ($modified,$queued);
if ($disposition eq 'rejected') {
- $output = &mt('Your course request was rejected.');
+ if ($crstype eq 'community') {
+ $output = &mt('Your community request was rejected.');
+ } else {
+ $output = &mt('Your course request was rejected.');
+ }
if ($message) {
$output .= '<div class="LC_warning">'.$message.'</div>';
}
@@ -2500,11 +3249,11 @@ sub print_request_outcome {
} elsif ($disposition eq 'process') {
my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
- my @roles = &Apache::lonuserutils::roles_by_context('course');
my $type = 'Course';
if ($crstype eq 'community') {
$type = 'Community';
}
+ my @roles = &Apache::lonuserutils::roles_by_context('course','',$type);
foreach my $role (@roles) {
$longroles{$role}=&Apache::lonnet::plaintext($role,$type);
}
@@ -2516,14 +3265,22 @@ sub print_request_outcome {
$reqstatus = 'created';
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>';
+ if ($crstype eq 'community') {
+ $output = '<p>'.&mt('Your community request has been processed and the community has been created.');
+ } else {
+ $output = '<p>'.&mt('Your course request has been processed and the course has been created.');
+ }
+ $output .= '<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.').
+ $output = '<span class="LC_error">';
+ if ($crstype eq 'community') {
+ $output .= &mt('An error occurred when processing your community request.');
+ } else {
+ $output .= &mt('An error occurred when processing your course request.');
+ }
+ $output .= '<br />'.
+ &mt('You may want to review the request details and submit the request again.').
'</span>';
$creationresult = 'error';
}
@@ -2538,6 +3295,9 @@ sub print_request_outcome {
description => $env{'form.cdescr'},
},
};
+ if ($crstype eq 'official') {
+ $request->{$requestid}->{'instcode'} = $instcode;
+ }
my $statuskey = 'status:'.$dom.':'.$cnum;
my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey],
$env{'user.domain'},$env{'user.name'});
@@ -2556,7 +3316,12 @@ sub print_request_outcome {
my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
$dom);
if ($putresult eq 'ok') {
- $output = &mt('Your course request has been recorded.').'<br />'.
+ if ($crstype eq 'community') {
+ $output .= &mt('Your community request has been recorded.');
+ } else {
+ $output .= &mt('Your course request has been recorded.')
+ }
+ $output .= '<br />'.
¬ification_information($disposition,$req_notifylist,
$cnum,$now);
} else {
@@ -2567,32 +3332,22 @@ sub print_request_outcome {
}
}
}
- my ($statusresult);
- if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
- $storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
- 'courserequests');
- if ($storeresult eq 'ok') {
- my %status = (
- 'status:'.$dom.':'.$cnum => $reqstatus,
- );
- $statusresult = &Apache::lonnet::put('courserequests',\%status);
- }
- } else {
- $storeresult = 'error: invalid requestkey format';
- }
- if ($storeresult ne 'ok') {
- $output .= '<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 />';
- &Apache::lonnet::logthis("Error saving course request status for $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
- }
+ ($storeresult,my $updateresult) =
+ &Apache::loncoursequeueadmin::update_coursereq_status(\%reqhash,$dom,
+ $cnum,$reqstatus,'request');
if ($modified && $queued && $storeresult eq 'ok') {
- $output .= '<p>'.&mt('Your course request has been updated').'</p>'.
- ¬ification_information($disposition,$req_notifylist,$cnum,$now);
+ if ($crstype eq 'community') {
+ $output .= '<p>'.&mt('Your community request has been updated').'</p>';
+ } else {
+ $output .= '<p>'.&mt('Your course request has been updated').'</p>';
+ }
+ $output .= ¬ification_information($disposition,$req_notifylist,$cnum,$now);
}
if ($validationerror ne '') {
- $output .= '<span class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
+ $output .= '<p class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
+ }
+ if ($updateresult) {
+ $output .= $updateresult;
}
}
if ($creationresult ne '') {
@@ -2609,85 +3364,101 @@ sub update_requestors_roles {
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');
+ my $ccrole = 'cc';
+ if ($crstype eq 'community') {
+ $ccrole = 'co';
+ }
+ unless (ref($details->{'personnel'}{$owner}) eq 'HASH') {
+ $details->{'personnel'}{$owner} = {
+ 'roles' => [$ccrole],
+ $ccrole => { 'usec' => [] },
+ };
+ }
+ my @roles;
+ if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
+ @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
+ unless (grep(/^\Q$ccrole\E$/,@roles)) {
+ push(@roles,$ccrole);
}
- 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;
- }
+ } else {
+ @roles = ($ccrole);
+ }
+ foreach my $role (@roles) {
+ my $refresh=$env{'user.refresh.time'};
+ if ($refresh eq '') {
+ $refresh = $env{'user.login.time'};
+ }
+ if ($refresh eq '') {
+ $refresh = $now;
+ }
+ my $start = $refresh-1;
+ 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 $ccrole) {
+ 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\//) {
- &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom,
- $cnum,$spec,$area);
- } else {
- &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom,
- $spec,$cnum,$area);
+ $showrole = &Apache::lonnet::plaintext($role,$crstype);
+ } elsif (ref($longroles) eq 'HASH') {
+ if ($longroles->{$role} ne '') {
+ $showrole = $longroles->{$role};
+ }
}
- &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;
}
- 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 ++;
+ $active .= '</a></li>';
+ $numactive ++;
+ } else {
+ $future .= '<li>'.$showrole;
+ if ($usec ne '') {
+ $future .= ' - '.&mt('section:').' '.$usec;
}
+ $future .= '</li>';
+ $numfuture ++;
}
}
}
@@ -2696,15 +3467,27 @@ sub update_requestors_roles {
}
if ($active) {
if ($numactive == 1) {
- $output = &mt('Use the following link to enter the course:');
+ if ($crstype eq 'Community') {
+ $output = &mt('Use the following link to enter the community:');
+ } else {
+ $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:');
+ if ($crstype eq 'Community') {
+ $output = &mt('Use the following links to your new roles to enter the community:');
+ } 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>';
+ if ($crstype eq 'Community') {
+ $output .= &mt('The following community [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'}))
+ } else {
+ $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'}));
+ }
+ $output .= ' <ul>'.$future.'</ul>';
}
return $output;
}
@@ -2740,128 +3523,43 @@ sub notification_information {
'</div>';
} else {
$output .= '<div class="LC_warning">'.
- &mt('Your request status is: [_1].',$disposition).
- '</div>'
+ &mt('Your request status is: [_1].',$disposition).
+ '</div>';
}
return $output;
}
-sub get_processtype {
- my ($dom,$crstype,$inststatuses,$domconfig) = @_;
- return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH'));
- my (%userenv,%settings,$val);
- my @options = ('autolimit','validate','approval');
- if ($dom eq $env{'user.domain'}) {
- %userenv =
- &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
- 'requestcourses.'.$crstype,'inststatus');
- if ($userenv{'requestcourses.'.$crstype}) {
- $val = $userenv{'requestcourses.'.$crstype};
- @{$inststatuses} = ('_custom_');
- } else {
- my ($task,%alltasks);
- if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
- %settings = %{$domconfig->{'requestcourses'}};
- if (ref($settings{$crstype}) eq 'HASH') {
- if (($env{'user.adv'}) && ($settings{$crstype}{'_LC_adv'} ne '')) {
- $val = $settings{$crstype}{'_LC_adv'};
- @{$inststatuses} = ('_LC_adv_');
- } else {
- if ($userenv{'inststatus'} ne '') {
- @{$inststatuses} = split(',',$userenv{'inststatus'});
- } else {
- @{$inststatuses} = ('default');
- }
- foreach my $status (@{$inststatuses}) {
- if (exists($settings{$crstype}{$status})) {
- my $value = $settings{$crstype}{$status};
- next unless ($value);
- unless (exists($alltasks{$value})) {
- if (ref($alltasks{$value}) eq 'ARRAY') {
- unless(grep(/^\Q$status\E$/,@{$alltasks{$value}})) {
- push(@{$alltasks{$value}},$status);
- }
- } else {
- @{$alltasks{$value}} = ($status);
- }
- }
- }
- }
- my $maxlimit = 0;
-
- foreach my $key (sort(keys(%alltasks))) {
- if ($key =~ /^autolimit=(\d*)$/) {
- if ($1 eq '') {
- $val ='autolimit=';
- last;
- } elsif ($1 > $maxlimit) {
- $maxlimit = $1;
- }
- }
- }
- if ($maxlimit) {
- $val = 'autolimit='.$maxlimit;
- } else {
- foreach my $option (@options) {
- if ($alltasks{$option}) {
- $val = $option;
- last;
- }
- }
- }
- }
- }
- }
- }
- } else {
- %userenv = &Apache::lonnet::userenvironment($env{'user.domain'},
- $env{'user.name'},'reqcrsotherdom.'.$env{'form.crstype'});
- if ($userenv{'reqcrsotherdom.'.$crstype}) {
- my @doms = split(',',$userenv{'reqcrsotherdom.'.$crstype});
- my $optregex = join('|',@options);
- foreach my $item (@doms) {
- my ($extdom,$extopt) = split(':',$item);
- if ($extdom eq $dom) {
- if ($extopt =~ /^($optregex)(=?\d*)$/) {
- $val = $1.$2;
- }
- last;
- }
- }
- @{$inststatuses} = ('_external_');
- }
- }
- return $val;
-}
-
sub check_autolimit {
my ($uname,$udom,$dom,$crstype,$limit,$message) = @_;
my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},
- 'userroles',['active','future'],['cc'],[$dom]);
- my ($types,$typename) = &course_types();
+ 'userroles',['active','future'],['cc','co'],[$dom]);
+ my ($types,$typename) = &Apache::loncommon::course_types();
my %requests = &Apache::lonnet::dumpstore('courserequests',$udom,$uname);
- my %count;
- if (ref($types) eq 'ARRAY') {
- foreach my $type (@{$types}) {
- $count{$type} = 0;
- }
- }
+ my $count = 0;
foreach my $key (keys(%requests)) {
my ($cdom,$cnum) = split('_',$key);
- if (exists($crsroles{$cnum.':'.$cdom.':cc'})) {
- if (ref($requests{$key}) eq 'HASH') {
- my $type = $requests{$key}{'crstype'};
- if ($type =~ /^official|unofficial|community$/) {
- $count{$type} ++;
- }
+ if (ref($requests{$key}) eq 'HASH') {
+ next if ($requests{$key}{'crstype'} ne $crstype);
+ if (($crstype eq 'community') &&
+ (exists($crsroles{$cnum.':'.$cdom.':co'}))) {
+ $count ++;
+ } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial')) &&
+ (exists($crsroles{$cnum.':'.$cdom.':cc'}))) {
+ $count ++;
}
}
}
- if ($count{$crstype} < $limit) {
+ if ($count < $limit) {
return 'process';
} else {
if (ref($typename) eq 'HASH') {
- $$message = &mt('Your request has not been processed because you have reached the limit for the number of courses of this type.').'<br />'.&mt("Your $typename->{$crstype} limit is [_1].",$limit);
+ if ($crstype eq 'community') {
+ $$message = &mt('Your request has not been processed because you have reached the limit for the number of communities.').
+ '<br />'.&mt("Your limit is [_1].",$limit);
+ } else {
+ $$message = &mt('Your request has not been processed because you have reached the limit for the number of courses of this type.').
+ '<br />'.&mt("Your $typename->{$crstype} limit is [_1].",$limit);
+ }
}
return 'rejected';
}