--- loncom/interface/lonrequestcourse.pm 2009/10/25 14:48:55 1.38
+++ loncom/interface/lonrequestcourse.pm 2010/11/08 21:44:55 1.41.2.8
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.38 2009/10/25 14:48:55 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.41.2.8 2010/11/08 21:44:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -128,13 +128,21 @@ sub handler {
if ($r->header_only) {
return OK;
}
-
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','showdom','cnum','state','crstype']);
&Apache::lonhtmlcommon::clear_breadcrumbs();
- my $dom = &get_course_dom();
- my $action = $env{'form.action'};
+ my $action = $env{'form.reqaction'};
my $state = $env{'form.state'};
+ my $context;
+ &generate_page($r,$action,$state,$context);
+ return OK;
+}
+
+sub generate_page {
+ my ($r,$action,$state,$context) = @_;
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['action','showdom','cnum','state','crstype']);
+ my $dom = &get_course_dom();
my (%states,%stored);
my ($jscript,$uname,$udom,$result,$warning);
@@ -143,8 +151,19 @@ sub handler {
$states{'log'} = ['filter','display'];
$states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
+ if ($dom eq 'gcitest') {
+ $states{'new'} = ['courseinfo','review','process'];
+ if ($env{'form.concepttest'} eq 'editmyown') {
+ push(@{$states{'new'}},'chooseitems','uploadroster','enrolling');
+ } elsif (($env{'form.concepttest'} eq 'defchosen') ||
+ (($env{'form.concepttest'} eq 'cloning') && (!$env{'form.cloneroster'}))) {
+ push(@{$states{'new'}},'uploadroster','enrolling');
+ } else {
+ push(@{$states{'new'}},'done');
+ }
+ }
if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) {
- unless ($env{'form.state'} eq 'crstype') {
+ unless ($state eq 'crstype') {
unshift(@{$states{'new'}},'codepick');
}
}
@@ -157,7 +176,7 @@ sub handler {
my @invalidcrosslist;
my %trail = (
- crstype => 'Course Request Action',
+ crstype => 'Request Action',
codepick => 'Category',
courseinfo => 'Description',
enrollment => 'Access Dates',
@@ -168,7 +187,15 @@ sub handler {
details => 'Request Details',
cancel => 'Cancel Request',
removal => 'Outcome',
+ chooseitems => 'Saved Test',
+ uploadroster => 'Upload Roster',
+ enrolling => 'Completed',
+ done => 'Completed',
);
+ if ($dom eq 'gcitest') {
+ $trail{'crstype'} = 'Building a Test';
+ $trail{'courseinfo'} = 'Test Information';
+ }
if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
$trail{'enrollment'} = 'Enrollment';
@@ -192,16 +219,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')) {
@@ -260,9 +301,12 @@ sub handler {
$env{'form.clonedom'} = $dom;
}
if ($state eq 'crstype') {
- $jscript = &mainmenu_javascript();
+ $jscript = &mainmenu_javascript($action);
} else {
$jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
+ if ($state eq 'courseinfo') {
+ $jscript .= &cloning_javascript();
+ }
}
}
@@ -270,30 +314,35 @@ sub handler {
$jscript .= "\n".&Apache::loncommon::userbrowser_javascript();
}
- my $loaditems = &onload_action($action,$state);
+ my $loaditems = &onload_action($action,$state,$dom);
- my %can_request;
- my $canreq = &Apache::lonnet::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,$description,
\@invalidcrosslist);
+ if ($state eq 'chooseitems' || $state eq 'uploadroster' ||
+ $state eq 'enrolling') {
+ return $canreq;
+ }
}
} 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);
@@ -301,8 +350,8 @@ 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 {
@@ -312,12 +361,13 @@ sub handler {
} elsif ($action eq 'log') {
&print_request_logs($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;
+ return;
}
sub mainmenu_javascript {
+ my ($action) = @_;
return <<"END";
function setType(courseForm) {
for (var i=0; i<courseForm.crstype.length; i++) {
@@ -330,11 +380,27 @@ function setType(courseForm) {
}
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;
+ for (var i=0; i<courseForm.reqaction.length; i++) {
+ if (courseForm.reqaction.options[i].value == "$action") {
+ courseForm.reqaction.options[i].selected = true;
} else {
- courseForm.action.options[i].selected = false;
+ courseForm.reqaction.options[i].selected = false;
+ }
+ }
+}
+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";;
+ }
+ }
}
}
}
@@ -345,6 +411,14 @@ sub get_breadcrumbs {
my ($dom,$action,$state,$states,$trail) = @_;
my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description);
my $page = 0;
+ my $firstcrumb = 'Pick Action';
+ my $crumbtitle = 'Course/Community Requests';
+ my $crumbhelp = 'Course_Requests';
+ if ($dom eq 'gcitest') {
+ $firstcrumb = 'Building a Test';
+ $crumbtitle = 'Create Concept Test';
+ $crumbhelp = 'Concept_Test_Creation';
+ }
if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
if (defined($action)) {
my $done = 0;
@@ -382,11 +456,24 @@ sub get_breadcrumbs {
}
}
}
+ my %forms = (
+ chooseitems => 'requestcrs',
+ uploadroster => 'studentform',
+ enrolling => 'requestcrs',
+ done => 'requestcrs',
+ );
+ my $lastidx;
+ for (my $i=0; $i<@{$states->{$action}}; $i++) {
+ if ($$state eq $states->{$action}[$i]) {
+ $lastidx = $i;
+ last;
+ }
+ }
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');
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
last;
} else {
if (($$state eq 'process') || ($$state eq 'removal')) {
@@ -396,22 +483,43 @@ sub get_breadcrumbs {
}
);
} else {
- &Apache::lonhtmlcommon::add_breadcrumb(
+ if (($$state eq 'chooseitems') || ($$state eq 'uploadroster') ||
+ ($$state eq 'enrolling') || ($$state eq 'done')) {
+ if (($states->{$action}[$i] ne 'process') &&
+ ($states->{$action}[$i] ne 'chooseitems') &&
+ ($states->{$action}[$i] ne 'uploadroster') &&
+ ($states->{$action}[$i] ne 'enrolling') &&
+ ($states->{$action}[$i] ne 'done')) {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ { href => '/adm/requestcourse',
+ text => "$trail->{$states->{$action}[$i]}",
+ }
+ );
+ } else {
+ my $diff = $i-$lastidx;
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ { href => "javascript:history.go($diff)",
+ 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');
+ {text=>$firstcrumb});
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
}
} else {
&Apache::lonhtmlcommon::add_breadcrumb(
- {text=>'Pick Action'});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+ {text=>$firstcrumb});
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
}
return ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description);
}
@@ -427,11 +535,13 @@ sub header {
if (ref($args) eq 'HASH') {
my %loadhash = (
'add_entries' => $loaditems,
+ 'function' => 'norole',
);
my %arghash = (%loadhash,%{$args});
- $args = \%arghash;
+ $args = \%arghash;
} else {
- $args = {'add_entries' => $loaditems,};
+ $args = {'add_entries' => $loaditems,
+ 'function' => 'norole'};
}
}
return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$args);
@@ -449,6 +559,7 @@ sub form_elements {
},
courseinfo => {
cdescr => 'text',
+ cloning => 'radio',
clonecrs => 'text',
clonedom => 'selectbox',
datemode => 'radio',
@@ -484,12 +595,27 @@ sub form_elements {
},
);
my %servers = &Apache::lonnet::get_servers($dom,'library');
+ if ($dom eq 'gcitest') {
+ %{$elements{'new'}{'courseinfo'}} = (
+ cdescr => 'text',
+ concepttest => 'radio',
+ );
+ if (&show_cloneable()) {
+ $elements{'new'}{'courseinfo'}{'clonecrs'} = 'selectbox';
+ $elements{'new'}{'courseinfo'}{'clonedom'} = 'hidden';
+ $elements{'new'}{'courseinfo'}{'cloneroster'} = 'checkbox';
+ }
+ }
my $numlib = keys(%servers);
if ($numlib > 1) {
$elements{'new'}{'courseinfo'}{'chome'} = 'selectbox';
} else {
$elements{'new'}{'courseinfo'}{'chome'} = 'hidden';
}
+ if ($dom eq 'gcitest') {
+ my %mergedhash = (%{$elements{'new'}{'courseinfo'}},%{$elements{'new'}{'enrollment'}});
+ %{$elements{'new'}{'courseinfo'}} = %mergedhash;
+ }
my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem);
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
@@ -584,18 +710,18 @@ 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 print_main_menu {
- my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb) = @_;
+ my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb,$request_domains) = @_;
my ($types,$typename) = &Apache::loncommon::course_types();
my $onchange;
unless ($env{'form.interface'} eq 'textual') {
- $onchange = 1;
+ $onchange = 'this.form.submit()';
}
my $nextstate_setter = "\n";
@@ -611,11 +737,13 @@ sub print_main_menu {
}
}
- my $js = <<"END";
+ my $js;
+ unless ($dom eq 'gcitest') {
+ $js = <<"END";
function nextPage(formname) {
var crschoice = document.mainmenu_coursetype.crstype.value;
- var actionchoice = document.mainmenu_action.action.value;
+ var actionchoice = document.mainmenu_action.reqaction.value;
if (check_can_request(crschoice,actionchoice) == true) {
if ((actionchoice == 'new') && (crschoice == 'official')) {
nextstate = 'codepick';
@@ -623,7 +751,7 @@ function nextPage(formname) {
$nextstate_setter
}
formname.crstype.value = crschoice;
- formname.action.value = actionchoice;
+ formname.reqaction.value = actionchoice;
formname.state.value= nextstate;
formname.submit();
}
@@ -635,19 +763,20 @@ function check_can_request(crschoice,act
var unofficial = '';
var community = '';
END
-
- foreach my $item (keys(%{$can_request})) {
- $js .= "
- $item = 1;
+ 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.',
- );
- $js .= <<END;
+ }
+ }
+ 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.',
+ );
+ $js .= <<END;
if (crschoice == 'official') {
if (official != 1) {
alert("$lt{'official'}");
@@ -655,9 +784,9 @@ END
}
} else {
if (crschoice == 'unofficial') {
- if (unofficial != 1) {
- alert("$lt{'unofficial'}");
- return false;
+ if (unofficial != 1) {
+ alert("$lt{'unofficial'}");
+ return false;
}
} else {
if (crschoice == 'community') {
@@ -669,50 +798,134 @@ END
if (actionchoice == 'new') {
alert("$lt{'all'}");
return false;
- }
+ }
}
}
}
return true;
}
-
END
+ }
+ 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');
+ }
+ }
- $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.
- '<p>'.&mt('Request creation of a new course, or review your pending course requests.').'</p>'.
+ if ($dom eq 'gcitest') {
+ my $formname = 'requestcrs';
+ my $nexttext = &mt('Continue');
+ $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
+ '<p>'.&mt('Deployment of a Concept Test requires completion of the following three steps:').'<ol>'.
+ '<li>'.&mt('Creation of a course "container" and setting of access dates').'</li>'.
+ '<li>'.&mt('Assembly of a valid test from Concept Inventory questions').'</li>'.
+ '<li>'.&mt('Enrollment of students').'</li>'.
+ '</ol></p><p>'.&mt('When assembling a test you may:').
+ '<br />'.&mt('(a) have a valid test built automatically by the WebCenter, or').'<br />'.&mt('(b) select the questions to include by combining questions chosen from eleven bins with four mandatory questions, or').
+ '<br />'.&mt('(c) copy one of your existing tests (including optional copying of the student roster)').'</p><p>'.&mt('The most efficient way to enroll students is to upload a text file containing usernames and passwords.').'<br />'.&mt("Students' e-mail addresses must be used as their usernames to ensure uniqueness.").'</p><div>'.
+ '<form name="'.$formname.'" method="post" action="/adm/requestcourse">'."\n".
+ '<input type="hidden" name="state" value="courseinfo" />'."\n".
+ '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
+ '<input type="hidden" name="crstype" value="unofficial" />'."\n".
+ '<input type="hidden" name="reqaction" value="new" />'."\n".
+ '<input type="button" name="next" value="'.$nexttext.
+ '" onclick="this.form.submit();" />'."\n".
+ '</form></div>'.
+ &Apache::loncommon::end_page());
+ return;
+ }
+
+ 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;
+ }
+
+ 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')).'
<form name="mainmenu_action" method="post" action="">
-<select size="1" name="action" >
+<select size="1" name="reqaction" >
<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></form>'.
&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::row_title(&mt('Course Type')).'
+ &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.'>'.&mt($typename->{$type}).
- '</option>'."\n");
}
}
$r->print('</select></form>'."\n".
@@ -722,7 +935,7 @@ END
'<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="hidden" name="reqaction" value="" />'."\n".
'<input type="button" name="next" value="'.$nexttext.
'" onclick="javascript:nextPage(document.'.$formname.')" />'."\n".
'</form></div>');
@@ -748,8 +961,13 @@ END
if (($action eq 'new') || ($action eq 'view')) {
$js .= <<END;
-function backPage(formname,prevstate) {
+function backPage(formname,prevstate,currstate) {
formname.state.value = prevstate;
+ if (currstate == "enrolling") {
+ if (prevstate == "chooseitems" || prevstate == "uploadroster") {
+ formname.action = "/adm/createuser";
+ }
+ }
formname.submit();
}
@@ -766,8 +984,20 @@ END
}
} elsif ($state eq 'personnel') {
$js .= "\n".§ion_check_javascript()."\n".&personnel_lcsec_js();
+ } elsif (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) {
+ $js .= "\n".&Apache::londocsgci::builder_javascript()."\n";
}
- $r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
+ my $title;
+ if ($env{'form.crstype'} eq 'community') {
+ $title = 'Request a community';
+ } elsif (&Apache::loncommon::needs_gci_custom()) {
+ $title = 'Create a new Concept Test';
+ } else {
+ $title = 'Request a course';
+ }
+ $r->print(&header($title,$js.$jscript,$loaditems,$jsextra).$crumb);
+ return if (($state eq 'chooseitems') || ($state eq 'uploadroster') ||
+ ($state eq 'enrolling'));
&print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
$codechk,$checkedcode,$description,$invalidcrosslist);
} elsif ($action eq 'view') {
@@ -784,12 +1014,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,$state).'</form></div>');
} elsif ($state eq 'details') {
my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
my $origcnum = $env{'form.cnum'};
@@ -800,7 +1045,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");
@@ -817,8 +1068,14 @@ END
$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,11 +1120,15 @@ END
}
$r->print('<h3>'.&mt('Request Cancellation').'</h3><div>'."\n".$form."\n".
'<input type="hidden" name="state" value="'.$state.'" />'."\n".
- '<input type="hidden" name="action" value="'.$action.'" />'."\n".
+ '<input type="hidden" name="reqaction" value="'.$action.'" />'."\n".
'<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.').
@@ -882,8 +1143,16 @@ 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());
@@ -1134,29 +1403,29 @@ sub print_request_form {
&Apache::lonhtmlcommon::end_pick_box().'</div>');
} else {
$next = $states->{$action}[$page+2];
- $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
+ $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next));
}
} else {
if ($crstype eq 'official') {
$next = $states->{$action}[$page+2];
}
- $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
+ $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next));
}
} elsif ($prev eq 'codepick') {
if ($instcode eq '') {
$prev = $states->{$action}[$page-2];
}
- $r->print(&courseinfo_form($dom,$formname,$crstype,$next,$description));
+ $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next,$description));
} elsif ($state eq 'enrollment') {
if ($crstype eq 'official') {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
}
- $r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,
+ $r->print(&print_enrollment_menu($formname,$state,$instcode,$dom,\@codetitles,
\%cat_titles,\%cat_order,\@code_order,
$invalidcrosslist));
} elsif ($state eq 'personnel') {
- $r->print(&print_personnel_menu($dom,$formname,$crstype,$invalidcrosslist));
+ $r->print(&print_personnel_menu($dom,$formname,$state,$crstype,$invalidcrosslist));
} elsif ($state eq 'review') {
my (%alerts,%rulematch,%inst_results,%curr_rules,%got_rules,%disallowmsg);
my $now = time;
@@ -1239,17 +1508,25 @@ sub print_request_form {
}
&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');
- } elsif ($state eq 'process') {
+ 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,
\%cat_order,\@code_order);
}
- my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
- \@code_order);
+ my ($storeresult,$result) = &print_request_outcome($r,$dom,\@codetitles,
+ \@code_order,$formname);
$r->print($result);
if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
$r->print('<p>');
@@ -1257,9 +1534,13 @@ sub print_request_form {
$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>');
+ unless ($env{'form.concepttest'}) {
+ $r->print('<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
+ }
return;
}
+ } elsif ($state eq 'uploadroster') {
+ &roster_upload_form($r,$output,$formname);
}
my @excluded = &get_excluded_elements($dom,$states,$action,$state);
if ($state eq 'personnel') {
@@ -1294,12 +1575,39 @@ sub print_request_form {
if ($state eq 'enrollment') {
push(@excluded,'crosslisttotal');
}
- $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
- &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
- $navtxt{'next'},$state);
+ if ($state eq 'done') {
+ $r->print(&done_display());
+ } else {
+ $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded));
+ &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+ $navtxt{'next'},$state);
+ }
+ $r->print('</form>');
return;
}
+sub done_display {
+ return '<h3>'.&mt('Concept Test creation is complete').'</h3>'.
+ '<p>'.&mt('The following management tools are available via the "[_1]Manage Tests[_2]" tab, or from the toolbar on the [_3]Concept Test Contents[_4] page.[_5]',
+ '<a href="/adm/menu">','</a>','<a href="/adm/navmaps">','</a>','<br />').
+ '<dl class="LC_GCI_Menu">'.
+ '<dt>'.&mt('Concept Test Contents').'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/nav.png\');">'.&mt('Display the Table of Contents for your Concept Test.').'</dd>'.
+ '<dt>'.&mt('Assemble Concept Test').'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/docs.png\');">'.&mt('If no students have attempted the Concept Test you will be able to modify it. You can also change the start and end date of the test itself.').'</dd></dl>'.
+ '<dl class="LC_GCI_Menu">'.
+ '<dt>'.&mt('Enrollment and Student Activity').'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/cprv.png\');">'.&mt('Display or download a course roster, and view information about completion status and last login. You can also add new students, or change access dates for existing students.').'</dd>'.
+ '<dt>'.&mt("What's New?").'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/new.png\');">'.&mt('View information about changes in your Concept Test course.').'</dd></dl>'.
+ '<dl class="LC_GCI_Menu">'.
+ '<dt>'.&mt('Prepare Printable Concept Test').'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/prnt.png\');">'.&mt('Create a PDF which you can send to a printer to create a hardcopy of the Concept Test.').'</dd>'.
+ '<dt>'.&mt('Concept Test Statistics').'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/chrt.png\');">'.&mt('After the closing date of the Concept Test you can view and download statistics for the test, as well as anonymized submission data.').'</dd>'.
+ '</dl></p>';
+}
+
sub get_cancreate_status {
my ($persondom,$personname,$dom) = @_;
my ($rules,$ruleorder) =
@@ -1364,16 +1672,25 @@ sub get_excluded_elements {
if (grep(/^instcode_/,@excluded)) {
push(@excluded,'instcode');
}
+ if ($env{'form.initmap'}) {
+ push(@excluded,'initmap');
+ }
+ if ($env{'form.output'}) {
+ push(@excluded,'output');
+ }
return @excluded;
}
sub print_enrollment_menu {
- my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
- $invalidcrosslist) =@_;
+ my ($formname,$state,$instcode,$dom,$codetitles,$cat_titles,$cat_order,
+ $code_order,$invalidcrosslist) =@_;
my ($sections,$autoenroll,$access_dates,$output,$hasauto);
my $starttime = time;
- my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
-
+ my $diff = 6*30*24*60*60; # 6 months from now, approx
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $diff = 7*24*60*60; # 7 days from now, approx
+ }
+ my $endtime = $starttime+$diff;
my %accesstitles = (
'start' => 'Default start access',
'end' => 'Default end access',
@@ -1407,10 +1724,10 @@ 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'}.
+ ' onclick="javascript:nextPage(document.'.$formname.",'".$state.
"'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
$sections .= &Apache::lonhtmlcommon::row_headline.
'<h3>'.&mt('Crosslisted courses for auto-enrollment').'</h3>'.
@@ -1421,16 +1738,16 @@ sub print_enrollment_menu {
$autoenroll =
&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">'.
+ '<input type="radio" name="autoadds" value="1" />'.
&mt('Yes').'</label>'.(' 'x3).'<label>'.
- '<input type="radio" name="autoadds" value="0" checked="checked">'.
+ '<input type="radio" name="autoadds" value="0" checked="checked" />'.
&mt('No').'</label></span>'.
&Apache::lonhtmlcommon::row_closure(1).
&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">'.
+ '<input type="radio" name="autodrops" value="1" />'.
&mt('Yes').'</label>'.(' 'x3).'<label>'.
- '<input type="radio" name="autodrops" value="0" checked="checked">'.
+ '<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',
@@ -1440,7 +1757,6 @@ sub print_enrollment_menu {
my $access_dates =
&date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
%accesstitles);
- $output .= &Apache::lonhtmlcommon::start_pick_box();
if ($sections) {
$output .= $sections;
}
@@ -1458,10 +1774,14 @@ sub print_enrollment_menu {
$output .= &Apache::lonhtmlcommon::row_headline('Access').
'<h3>'.$header.'</h3>'.
&Apache::lonhtmlcommon::row_closure(1).
- $access_dates
+ $access_dates;
+ }
+ if ($dom eq 'gcitest') {
+ return $output;
+ } else {
+ return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
+ &Apache::lonhtmlcommon::end_pick_box().'</div>';
}
- return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
- &Apache::lonhtmlcommon::end_pick_box().'</div>';
}
sub show_invalid_crosslists {
@@ -1525,15 +1845,21 @@ sub inst_section_selector {
sub date_setting_table {
my ($starttime,$endtime,$formname,$prefix,$hasauto,%datetitles) = @_;
my ($perpetual,$table);
+ my $no_hh_mm_ss = 1;
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $no_hh_mm_ss = '';
+ }
my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
- $starttime,'','','',1,'','','',1);
+ $starttime,'','','',$no_hh_mm_ss,'','','',1);
my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
- $endtime,'','','',1,'','','',1);
+ $endtime,'','','',$no_hh_mm_ss,'','','',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>';
+ unless (&Apache::loncommon::needs_gci_custom()) {
+ $perpetual = ' <span class="LC_nobreak"><label>'.
+ '<input type="checkbox" name="no_end_date" />'.
+ &mt('No end date').'</label></span>';
+ }
$closure = '1';
}
@@ -1562,7 +1888,7 @@ sub date_setting_table {
}
sub print_personnel_menu {
- my ($dom,$formname,$crstype,$invalidcrosslist) = @_;
+ my ($dom,$formname,$state,$crstype,$invalidcrosslist) = @_;
my $output;
if ($crstype eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {
@@ -1579,12 +1905,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";
@@ -1672,13 +1998,17 @@ sub print_personnel_menu {
&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'}.
+ ' onclick="javascript:nextPage(document.'.$formname.",'".$state.
"'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'</div>'.
- '<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>';
+ &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;
}
@@ -1700,7 +2030,7 @@ sub current_lc_sections {
}
sub print_request_status {
- my ($dom) = @_;
+ my ($dom,$action,$state) = @_;
my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
$env{'user.name'},'^status:'.$dom);
my ($output,$formname,%queue_by_date);
@@ -1743,17 +2073,25 @@ sub print_request_status {
}
$formname = 'requestcrs';
my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
- $output = '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+ $output = '<input type="hidden" name="reqaction" value="'.$action.'" />'."\n".
- '<input type="hidden" name="state" value="'.$env{'form.state'}.'" />'."\n".
+ '<input type="hidden" name="state" value="'.$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>';
@@ -1801,7 +2139,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'".')" />';
@@ -1842,8 +2186,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>';
@@ -1874,7 +2222,7 @@ sub viewdetails_javascript {
function nextPage(formname,nextstate) {
if (nextstate == "modify") {
formname.state.value = "personnel";
- formname.action.value = "new";
+ formname.reqaction.value = "new";
} else {
formname.state.value = nextstate;
}
@@ -2031,40 +2379,71 @@ sub print_review {
}
my %ctxt = &clone_text();
- $inst_headers .= '<th>'.&mt('Clone From').'</th>';
- if (($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'});
- if ($canclone) {
- my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
+ if ($dom eq 'gcitest') {
+ $inst_headers .= '<th>'.&mt('Test Questions').'</th>';
+ my $concepttest;
+ if ($env{'form.concepttest'} eq 'defchosen') {
+ $concepttest = 'Auto-generated';
+ } elsif ($env{'form.concepttest'} eq 'editmyown') {
+ $concepttest = 'Manually selected';
+ } elsif ($env{'form.concepttest'} eq 'cloning') {
+ $concepttest = 'Copied from existing test';
+ }
+ $inst_values .= '<td>'.$concepttest.(' 'x2).'</td>';
+ }
+ if (&show_cloneable()) {
+ $inst_headers .= '<th>'.&mt('Copy From').'</th>';
+ if ((($env{'form.cloning'}) ||
+ (($dom eq 'gcitest') && ($env{'form.concepttest'} eq '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{'form.crstype'});
+ if ($canclone) {
+ my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
$env{'form.clonecrs'},('description','internal.coursecode'));
- if (keys(%courseenv) > 0) {
- $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
- $inst_values .= '<td>'.$courseenv{'description'}.' ';
- my $cloneinst = $courseenv{'internal.coursecode'};
- if ($cloneinst ne '') {
- $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'};
- } else {
- $inst_values .= &mt('from').' '.$env{'form.clonedom'};
- }
- $inst_values .= '</td><td>';
- if ($env{'form.datemode'} eq 'preserve') {
- $inst_values .= $ctxt{'prd'};
- } elsif ($env{'form.datemode'} eq 'shift') {
- $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
- } else {
- $inst_values .= $ctxt{'ncd'};
- }
- $inst_values .= '</td>';
+ if (keys(%courseenv) > 0) {
+ if ($dom eq 'gcitest') {
+ $inst_headers .= '<th>'.$ctxt{'ros'}.'</th>';
+ } else {
+ $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
+ }
+ $inst_values .= '<td>'.$courseenv{'description'}.' ';
+ my $cloneinst = $courseenv{'internal.coursecode'};
+ if ($cloneinst ne '') {
+ $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'};
+ } else {
+ unless ($dom eq 'gcitest') {
+ $inst_values .= &mt('from').' '.$env{'form.clonedom'};
+ }
+ }
+ $inst_values .= (' 'x2).'</td><td>';
+ if ($dom eq 'gcitest') {
+ if ($env{'form.cloneroster'}) {
+ $inst_values .= &mt('Yes');
+ } else {
+ $inst_values .= &mt('No');
+ }
+ } else {
+ if ($env{'form.datemode'} eq 'preserve') {
+ $inst_values .= $ctxt{'prd'};
+ } elsif ($env{'form.datemode'} eq 'shift') {
+ $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
+ } else {
+ $inst_values .= $ctxt{'ncd'};
+ }
+ }
+ $inst_values .= '</td>';
+ } else {
+ $inst_values .= '<td>'.&mt('Unknown').'</td>';
+ }
} else {
- $inst_values .= '<td>'.&mt('Unknown').'</td>';
+ $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
}
- } else {
- $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
- }
- } else {
- $inst_values .= '<td>'.&mt('None').'</td>';
+ } else {
+ $inst_values .= '<td>'.&mt('None').'</td>';
+ }
}
$enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
'<th>'.&mt('Access Ends').'</th>';
@@ -2077,15 +2456,18 @@ 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 '') {
@@ -2121,7 +2503,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'};
@@ -2193,7 +2575,7 @@ sub dates_from_form {
}
sub courseinfo_form {
- my ($dom,$formname,$crstype,$next,$description) = @_;
+ my ($dom,$formname,$state,$crstype,$next,$description) = @_;
my %lt = &Apache::lonlocal::texthash(
official => 'You must provide a (brief) course description.',
community => 'You must provide a (brief) community description.'
@@ -2210,20 +2592,55 @@ function validateForm() {
}
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 $desctitle = &mt('Description');
+ if ($dom eq 'gcitest') {
+ $title = &mt('Concept Test Course Information');
+ $desctitle = &mt('Concept Test Title');
+ }
+ my $clonetitle = &mt('Copy content and settings from an existing course?');
if ($crstype eq 'community') {
$title = &mt('Brief Community Description');
+ $clonetitle = &mt('Copy 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>'.&Apache::loncommon::help_open_topic('Course_Request_Description').' '.$title.'</h3>'.
&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::row_title(&mt('Description')).
+ &Apache::lonhtmlcommon::row_title($desctitle).
'<input type="text" size="60" name="cdescr" value="'.$description.'" />';
+ my $showclone;
+ if ($dom eq 'gcitest') {
+ $showclone = &show_cloneable();
+ } else {
+ $showclone = 1;
+ }
+ if ($dom eq 'gcitest') {
+ $output .= &Apache::lonhtmlcommon::row_closure(1).
+ &concepttest_form($showclone);
+ }
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($dom,'chome',
'default','hide');
@@ -2232,12 +2649,82 @@ ENDJS
&Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
}
$output .= $home_server_pick.
- &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_headline().
- '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').' '.&mt('Clone content and settings from an existing course?').'</h3>'.
- &Apache::lonhtmlcommon::row_closure(1).
- &clone_form($dom,$formname,$crstype).
- &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+ &Apache::lonhtmlcommon::row_closure();
+ if ($showclone && $dom ne 'gcitest') {
+ $output .= &Apache::lonhtmlcommon::row_headline().
+ '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').' '.$clonetitle.
+ '<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>';
+ }
+ if ($dom eq 'gcitest') {
+ my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order);
+ my $invalidcrosslist = [];
+ $output .= &print_enrollment_menu($formname,$state,$instcode,$dom,
+ \@codetitles,\%cat_titles,\%cat_order,
+ \@code_order,$invalidcrosslist);
+ }
+ $output .= &Apache::lonhtmlcommon::end_pick_box()."\n";
+ return $output;
+}
+
+sub concepttest_form {
+ my ($showclone) = @_;
+ my $output = &Apache::lonhtmlcommon::row_title(&mt('Questions included in Concept Test')).
+ '<label>'.
+ '<input type="radio" name="concepttest" value="editmyown" checked="checked" /> '.
+ &mt('Chosen by you from Concept Inventory').
+ '</label><br />'.
+ '<label>'.
+ '<input type="radio" name="concepttest" value="defchosen" /> '.
+ &mt('Automatically selected by WebCenter').
+ '</label>';
+ if ($showclone) {
+ $output .= '<br /><span class="LC_nobreak"><label>'.
+ '<input type="radio" name="concepttest" value="cloning" /> '.
+ &mt('Copied from existing Test: ').
+ '</label>'.&select_oldtest().(' ' x2).
+ '<input type="hidden" name="clonedom" value="gcitest" />'.
+ '<label><input type="checkbox" value="1" name="cloneroster" />'.
+ &mt('Copy roster').'</label>';
+ }
+ return $output;
+}
+
+sub select_oldtest {
+ my $output = '<select name="clonecrs"><option value="" selected="selected">'.
+ '</option>';
+ my %courses = &Apache::loncommon::existing_gcitest_courses('cc');
+ my %Sortby;
+ foreach my $course (sort(keys(%courses))) {
+ next unless (ref($courses{$course}) eq 'HASH');
+ my $clean_title = $courses{$course}{'description'};
+ $clean_title =~ s/\W+//g;
+ if ($clean_title eq '') {
+ $clean_title = $courses{$course}{'description'};
+ }
+ push(@{$Sortby{$clean_title}},$course);
+ }
+ my @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby));
+ foreach my $item (@sorted_courses) {
+ foreach my $course (@{$Sortby{$item}}) {
+ my ($cdom,$cnum) = split('_',$course);
+ if (($cdom eq 'gcitest') && (ref($courses{$course}) eq 'HASH')) {
+ my $cdesc = $courses{$course}{'description'};
+ $output .= '<option value="'.$cnum.'">'.$cdesc.'</option>';
+ }
+ }
+ }
+ $output .= '</select>';
return $output;
}
@@ -2274,8 +2761,9 @@ sub clone_text {
'dmn' => 'Domain',
'dsh' => 'Date Shift',
'ncd' => 'Do not clone date parameters',
- 'prd' => 'Clone date parameters as-is',
+ 'prd' => 'Copy date parameters as-is',
'shd' => 'Shift date parameters by number of days',
+ 'ros' => 'Copy Roster',
);
}
@@ -2462,7 +2950,7 @@ sub display_navbuttons {
}
sub print_request_outcome {
- my ($dom,$codetitles,$code_order) = @_;
+ my ($r,$dom,$codetitles,$code_order,$formname) = @_;
my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
%sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
my $sectotal = $env{'form.sectotal'};
@@ -2481,6 +2969,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)) {
@@ -2495,6 +2987,10 @@ sub print_request_outcome {
push(@instsections,$sec);
}
$sections{$i}{'loncapa'} = $env{'form.loncapasec_'.$i};
+ $sections{$i}{'loncapa'} =~ s/\W//g;
+ if ($sections{$i}{'loncapa'} eq 'none') {
+ $sections{$i}{'loncapa'} = '';
+ }
}
}
}
@@ -2542,7 +3038,7 @@ 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');
@@ -2594,14 +3090,20 @@ sub print_request_outcome {
}
my $clonecrs = '';
my $clonedom = '';
- if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) &&
+ if ((($env{'form.cloning'}) ||
+ (($dom eq 'gcitest') && ($env{'form.concepttest'} eq 'cloning'))) &&
+ ($env{'form.clonecrs'} =~ /^($match_courseid)$/) &&
($env{'form.clonedom'} =~ /^($match_domain)$/)) {
+ if ($dom eq 'gcitest') {
+ $env{'form.clonedom'} = 'gcitest';
+ }
my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
$env{'form.clonedom'});
- if ($clonehome ne 'no_host') {
+ 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'};
@@ -2633,7 +3135,26 @@ sub print_request_outcome {
accessend => $accessend,
personnel => \%personnel,
};
- my (@inststatuses,$storeresult,$creationresult);
+ if ($dom eq 'gcitest') {
+ if ($env{'form.concepttest'} eq 'editmyown') {
+ $details->{'firstres'} = 'nav';
+ } else {
+ $details->{'firstres'} = 'blank';
+ }
+ if ($env{'form.concepttest'} eq 'cloning') {
+ if (($clonecrs) && ($clonedom eq 'gcitest')) {
+ $details->{'cloneroster'} = $env{'form.cloneroster'};
+ } else {
+ $details->{'clonedom'} = 'gci';
+ $details->{'clonecrs'} = '8v226795a882b4bcagcil1';
+ }
+ } else {
+ $details->{'clonedom'} = 'gci';
+ $details->{'clonecrs'} = '8v226795a882b4bcagcil1';
+ }
+ $details->{'datemode'} = 'delete';
+ }
+ my (@inststatuses,$storeresult,$creationresult,$donedisplay);
my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
if ($crstype eq 'official') {
@@ -2692,7 +3213,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>';
}
@@ -2700,11 +3225,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);
}
@@ -2716,14 +3241,86 @@ 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.');
+ }
+ if ($dom eq 'gcitest') {
+ my $caller = 'requestcrs';
+ &acquire_cc_role($dom,$cnum,'cc./'.$dom.'/'.$cnum);
+ my %parmresult =
+ &store_crsparms($dom,$cnum,$now,$accessstart,$accessend);
+ &Apache::londocsgci::setdefaults();
+ my %crsenvhash = (
+ suppress_tries => 'yes',
+ );
+ my $putresult = &Apache::lonnet::put('environment',\%crsenvhash,$dom,$cnum);
+ if ($env{'form.concepttest'} eq 'cloning') {
+ &Apache::lonuserstate::readmap($dom.'/'.$cnum);
+ if (($clonecrs) && ($clonedom eq 'gcitest')) {
+ my $cloneid = $clonedom.'/'.$clonecrs;
+ my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
+ my $oldcdesc = $clonedesc{'description'};
+ $output .= '<br />'.&mt('A concept test has been copied from your existing test: [_1].','<b>'.$oldcdesc.'</b>').'</p>';
+ if ($env{'form.cloneroster'}) {
+ $output .= '<br />'.&mt('You requested copying of the old student roster to the new course.');
+ if ($logmsg =~ /\Q\0\E/) {
+ my @logging = split("\0",$logmsg);
+ if (@logging) {
+ $output .= '<p>'.$logging[-1].'</p>';
+ }
+ }
+ $output .= '<ul>'.
+ '<li>'.&mt('Access starts:').' '.
+ &Apache::lonlocal::locallocaltime($accessstart).'</li>'.
+ '<li>'.&mt('Access ends:').' '.&Apache::lonlocal::locallocaltime($accessend).'</li>'.
+ '</ul><br />';
+ $r->print($output);
+ $output = '';
+ $donedisplay = 1;
+ } else {
+ &roster_upload_form($r,$output,$formname);
+ $output = '';
+ }
+ } else {
+ $output .= '</p>';
+ &roster_upload_form($r,$output,$formname);
+ $output = '';
+ }
+ } elsif ($env{'form.concepttest'} eq 'defchosen') {
+ $output .= '<br />';
+ my $error = &Apache::londocsgci::store($caller,$dom,$cnum);
+ if ($error) {
+ $output .= '<span class="LC_error">'.
+ &mt('An error occurred saving an auto-generated concept test: [_1].',$error).
+ '</span>';
+ } else {
+ &Apache::lonuserstate::readmap($dom.'/'.$cnum);
+ $output .= &mt('A concept test has also been generated.');
+ }
+ $output .= '</p>';
+ &roster_upload_form($r,$output,$formname);
+ $output = '';
+ } else {
+ $output .= '</p></form><br />'.&mt('The next step is to chose which questions are to be included in the Concept Test.').'<br /></p>';
+ $r->print($output);
+ &Apache::londocsgci::editor($r,'requestcrs',$dom,$cnum);
+ $output = '';
+ }
+ } else {
+ $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';
}
@@ -2756,7 +3353,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 {
@@ -2788,14 +3390,21 @@ sub print_request_outcome {
&Apache::lonnet::logthis("Error saving course request status for $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
}
if ($modified && $queued && $storeresult eq 'ok') {
- $output .= '<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>';
}
}
if ($creationresult ne '') {
+ if ($donedisplay) {
+ $r->print('<br />'.&done_display());
+ }
return ($creationresult,$output);
} else {
return ($storeresult,$output);
@@ -2809,23 +3418,34 @@ sub update_requestors_roles {
my $owner = $env{'user.name'}.':'.$env{'user.domain'};
if (ref($details) eq 'HASH') {
if (ref($details->{'personnel'}) eq 'HASH') {
+ my $ccrole = 'cc';
+ if ($crstype eq 'community') {
+ $ccrole = 'co';
+ }
unless (ref($details->{'personnel'}{$owner}) eq 'HASH') {
$details->{'personnel'}{$owner} = {
- 'roles' => ['cc'],
- 'cc' => { 'usec' => [] },
+ 'roles' => [$ccrole],
+ $ccrole => { 'usec' => [] },
};
}
my @roles;
if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
@roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
- unless (grep(/^cc$/,@roles)) {
- push(@roles,'cc');
+ unless (grep(/^\Q$ccrole\E$/,@roles)) {
+ push(@roles,$ccrole);
}
} else {
- @roles = ('cc');
+ @roles = ($ccrole);
}
foreach my $role (@roles) {
- my $start = $now;
+ 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 '') {
@@ -2836,7 +3456,7 @@ sub update_requestors_roles {
}
}
my @usecs;
- if ($role ne 'cc') {
+ if ($role ne $ccrole) {
if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
@usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
}
@@ -2901,19 +3521,163 @@ 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;
}
+sub acquire_cc_role {
+ my ($cdom,$cnum,$trolecode,$csec) = @_;
+ my %coursegroups = &Apache::lonnet::get_active_groups(
+ $env{'user.domain'},$env{'user.name'},$cdom, $cnum);
+ my $cgrps = join(':',keys(%coursegroups));
+ if ($env{'environment.recentroles'}) {
+ my %frozen_roles =
+ &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
+ &Apache::lonhtmlcommon::store_recent('roles',$trolecode,' ',
+ $frozen_roles{$trolecode});
+ }
+
+ &Apache::lonnet::appenv({"request.course.id" => '',
+ "request.course.fn" => '',
+ "request.course.uri" => '',
+ "request.course.sec" => '',
+ "request.role" => 'cm',
+ "request.role.adv" => $env{'user.adv'},
+ "request.role.domain" => $env{'user.domain'}});
+
+ &Apache::lonnet::log($env{'user.domain'},
+ $env{'user.name'},
+ $env{'user.home'},
+ "Role ".$trolecode);
+
+ &Apache::lonnet::appenv(
+ {'request.role' => $trolecode,
+ 'request.role.domain' => $cdom,
+ 'request.course.sec' => $csec,
+ 'request.course.groups' => $cgrps});
+ my ($furl,$ferr) = &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+ my $tadv;
+ if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
+ &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
+ return;
+}
+
+sub store_crsparms {
+ my ($cdom,$cnum,$now,$accessstart,$accessend) = @_;
+ my $topsymb = '___0___uploaded/'.$cdom.'/'.$cnum.'/default.sequence';
+ my %crsparms = (
+ buttonshide => {
+ value => 'yes',
+ type => 'string_yesno',
+ },
+ opendate => {
+ value => $accessstart,
+ type => 'date_start',
+ },
+ duedate => {
+ value => $accessend,
+ type => 'date_end',
+ },
+ problemstatus => {
+ value => 'no',
+ type => 'string_problemstatus',
+ },
+ maxtries => {
+ value => '1',
+ type => 'intpos',
+ },
+ discussend => {
+ value => $now,
+ type => 'date_end',
+ },
+ discusshide => {
+ value => 'yes',
+ type => 'string_yesno',
+ }
+ );
+ my %parmresult;
+ foreach my $item (keys(%crsparms)) {
+ $parmresult{$item} =
+ &Apache::lonparmset::storeparm_by_symb($topsymb,
+ '0_'.$item,14,$crsparms{$item}{'value'},
+ $crsparms{$item}{'type'},undef,$cdom);
+ }
+ return %parmresult;
+}
+
+sub roster_upload_form {
+ my ($r,$output,$formname,$titletext) = @_;
+ my $title = &mt('Request Processed');
+ if ($titletext ne '') {
+ $title = $titletext;
+ }
+ $r->print(<<"ENDJS");
+<script type="text/javascript">
+// <![CDATA['
+
+function toggleRosterUpload() {
+ var willupload;
+ if (document.$formname.roster.length > 1) {
+ for (var i=0; i<document.$formname.roster.length; i++) {
+ if (document.$formname.roster[i].checked) {
+ willupload = document.$formname.roster[i].value;
+ }
+ }
+ }
+ if (willupload == 1) {
+ document.getElementById('rosterupload').style.display="block";
+ document.getElementById('norosterupload').style.display="none";
+ } else {
+ document.getElementById('rosterupload').style.display="none";
+ document.getElementById('norosterupload').style.display="block";
+ }
+ return;
+}
+// ]]
+</script>
+
+ENDJS
+ $r->print('<h3>'.$title.'</h3>'.$output.
+ '<h4>'.&mt('Course roster file upload').'</h4>');
+ $r->print('<p>'.&mt('If you have a text file available containing student e-mail addresses and initial passwords, you may upload it now.').'<br />'.
+ &mt('You may also enroll students later with the [_1]"Enrollment/Activity"[_2] utility in the management toolbar.','<i>','</i>').'</p>'.
+ &mt('Upload roster file now?').' '.
+ '<label><input type="radio" name="roster" value="1" '.
+ 'onclick="javascript:toggleRosterUpload()" />'.
+ &mt('Yes').(' 'x2).'</label><label>'.
+ '<input type="radio" name="roster" value="0" checked="checked"'.
+ 'onclick="javascript:toggleRosterUpload()" />'.&mt('No').'</label><br />'.
+ '<div id="norosterupload"><input type="submit" value="'.&mt('Next').'" name="norostersub" />'.
+ '<input type="hidden" name="reqaction" value="new" />'.
+ '<input type="hidden" name="state" value="done" /></div></form>'.
+ '<div id="rosterupload" style="display: none"><form name="studentform" method="post" enctype="multipart/form-data" '.
+ ' action="/adm/createuser">'."\n");
+ &Apache::lonuserutils::print_first_users_upload_form($r,'course','noheader','requestcrs');
+ $r->print('<input type="hidden" name="concepttest" value="'.$env{'form.concepttest'}.'" />'.
+ '</div></form>');
+}
+
sub notification_information {
my ($disposition,$req_notifylist,$cnum,$now) = @_;
my %emails = &Apache::loncommon::getemails();
@@ -3042,31 +3806,34 @@ sub get_processtype {
sub check_autolimit {
my ($uname,$udom,$dom,$crstype,$limit,$message) = @_;
my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},
- 'userroles',['active','future'],['cc'],[$dom]);
+ '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';
}
@@ -3238,5 +4005,16 @@ sub generate_date_items {
return;
}
+sub show_cloneable {
+ my $showclone;
+ if (&Apache::loncommon::needs_gci_custom()) {
+ my %courses = &Apache::loncommon::existing_gcitest_courses('cc');
+ my $numcourses = scalar(keys(%courses));
+ return $numcourses;
+ } else {
+ return 1;
+ }
+}
+
1;