--- loncom/interface/lonrequestcourse.pm 2009/11/18 19:15:44 1.40
+++ loncom/interface/lonrequestcourse.pm 2010/02/04 21:01:30 1.41.2.4
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.40 2009/11/18 19:15:44 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.41.2.4 2010/02/04 21:01:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -143,6 +143,10 @@ sub handler {
$states{'log'} = ['filter','display'];
$states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
+ if ($dom eq 'gcitest') {
+ $states{'new'} = ['courseinfo','review','process'];
+ }
+
if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) {
unless ($env{'form.state'} eq 'crstype') {
unshift(@{$states{'new'}},'codepick');
@@ -169,6 +173,10 @@ sub handler {
cancel => 'Cancel Request',
removal => 'Outcome',
);
+ 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';
@@ -360,6 +368,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;
@@ -401,7 +417,7 @@ sub get_breadcrumbs {
if ($$state eq $states->{$action}[$i]) {
&Apache::lonhtmlcommon::add_breadcrumb(
{text=>"$trail->{$$state}"});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
last;
} else {
if (($$state eq 'process') || ($$state eq 'removal')) {
@@ -420,13 +436,13 @@ sub get_breadcrumbs {
}
} else {
&Apache::lonhtmlcommon::add_breadcrumb(
- {text=>'Pick Action'});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
+ {text=>$firstcrumb});
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
}
} else {
&Apache::lonhtmlcommon::add_breadcrumb(
- {text=>'Pick Action'});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
+ {text=>$firstcrumb});
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
}
return ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description);
}
@@ -499,12 +515,22 @@ sub form_elements {
},
);
my %servers = &Apache::lonnet::get_servers($dom,'library');
+ if ($dom eq 'gcitest') {
+ %{$elements{'new'}{'courseinfo'}} = (
+ cdescr => 'text',
+ concepttest => 'radio',
+ );
+ }
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);
@@ -601,6 +627,9 @@ sub onload_action {
} else {
$loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)';
}
+ if (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) {
+ $loaditems{'onload'} = 'javascript:setInitialVisibility()';
+ }
}
return \%loaditems;
}
@@ -626,7 +655,9 @@ 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;
@@ -650,20 +681,20 @@ function check_can_request(crschoice,act
var unofficial = '';
var community = '';
END
- if (ref($can_request) eq 'HASH') {
- 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'}");
@@ -671,9 +702,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') {
@@ -685,13 +716,14 @@ 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'})) {
@@ -714,6 +746,40 @@ END
$domaintitle = &mt('Course/Community Domain');
}
}
+
+ 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 either:').
+ '<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.').'</p><p>'.&mt('The most efficient way to enroll students is to upload a text file containing usernames and passwords.').'<br />'.&mt("Students' full e-mail addresses should 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="action" 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})) {
@@ -830,6 +896,8 @@ 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";
}
my $title;
if ($env{'form.crstype'} eq 'community') {
@@ -1365,7 +1433,7 @@ sub print_request_form {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
}
- my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
+ my ($storeresult,$result) = &print_request_outcome($r,$dom,\@codetitles,
\@code_order);
$r->print($result);
if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
@@ -1374,7 +1442,9 @@ 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;
}
}
@@ -1557,7 +1627,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;
}
@@ -1577,8 +1646,12 @@ sub print_enrollment_menu {
&Apache::lonhtmlcommon::row_closure(1).
$access_dates
}
- return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
- &Apache::lonhtmlcommon::end_pick_box().'</div>';
+ if ($dom eq 'gcitest') {
+ return $output;
+ } else {
+ return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
+ &Apache::lonhtmlcommon::end_pick_box().'</div>';
+ }
}
sub show_invalid_crosslists {
@@ -1696,12 +1769,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";
@@ -2170,41 +2243,52 @@ 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'},
+ 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';
+ }
+ $inst_values .= '<td>'.$concepttest.'</td>';
+ } else {
+ $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'},
$env{'form.crstype'});
- if ($canclone) {
- my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
+ 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) {
+ $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>';
+ } 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>';
@@ -2217,15 +2301,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 '') {
@@ -2261,7 +2348,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'};
@@ -2355,6 +2442,11 @@ function validateForm() {
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('Clone content and settings from an existing course?');
if ($crstype eq 'community') {
$title = &mt('Brief Community Description');
@@ -2364,8 +2456,12 @@ ENDJS
&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.'" />';
+ if ($dom eq 'gcitest') {
+ $output .= &Apache::lonhtmlcommon::row_closure(1).
+ &concepttest_form();
+ }
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($dom,'chome',
'default','hide');
@@ -2374,15 +2470,34 @@ ENDJS
&Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
}
$output .= $home_server_pick.
- &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_closure();
+ if ($dom eq 'gcitest') {
+ my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order);
+ my $invalidcrosslist = [];
+ $output .= &print_enrollment_menu($formname,$instcode,$dom,
+ \@codetitles,\%cat_titles,\%cat_order,
+ \@code_order,$invalidcrosslist);
+ } else {
+ $output .=
&Apache::lonhtmlcommon::row_headline().
'<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').' '.$clonetitle.'</h3>'.
&Apache::lonhtmlcommon::row_closure(1).
- &clone_form($dom,$formname,$crstype).
- &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+ &clone_form($dom,$formname,$crstype);
+ }
+ $output .= &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
return $output;
}
+sub concepttest_form {
+ return &Apache::lonhtmlcommon::row_title(&mt('Questions included in Concept Test')).
+ '<input type="radio" name="concepttest" value="defchosen" /> '.
+ &mt('Automatically selected by WebCenter').
+ '</label><br /><label>'.
+ '<input type="radio" name="concepttest" value="editmyown" checked="checked" /> '.
+ &mt('Chosen by you from Concept Inventory').
+ '</label><br /><label>';
+}
+
sub clone_form {
my ($dom,$formname,$crstype) = @_;
my $type = 'Course';
@@ -2604,7 +2719,7 @@ sub display_navbuttons {
}
sub print_request_outcome {
- my ($dom,$codetitles,$code_order) = @_;
+ my ($r,$dom,$codetitles,$code_order) = @_;
my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
%sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
my $sectotal = $env{'form.sectotal'};
@@ -2623,6 +2738,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)) {
@@ -2684,7 +2803,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');
@@ -2776,6 +2895,16 @@ sub print_request_outcome {
accessend => $accessend,
personnel => \%personnel,
};
+ if ($dom eq 'gcitest') {
+ if ($env{'form.concepttest'} eq 'editmyown') {
+ $details->{'firstres'} = 'nav';
+ } else {
+ $details->{'firstres'} = 'blank';
+ }
+ $details->{'clonedom'} = 'gci';
+ $details->{'clonecrs'} = '8v226795a882b4bcagcil1';
+ $details->{'datemode'} = 'delete';
+ }
my (@inststatuses,$storeresult,$creationresult);
my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
@@ -2847,11 +2976,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);
}
@@ -2868,7 +2997,41 @@ sub print_request_outcome {
} else {
$output = '<p>'.&mt('Your course request has been processed and the course has been created.');
}
- $output .= '<br />'.$role_result.'</p>';
+ 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();
+ if ($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>'.
+ '<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 at a later date by visiting the [_1]"Menu"[_2] page and choosing: [_1]"Manage Enrollment"[_2].','<i>','</i>').'</p>'.
+ '</form><form name="studentform" method="post" enctype="multipart/form-data" '.
+ ' action="/adm/createuser">'."\n";
+ $r->print($output);
+ &Apache::lonuserutils::print_first_users_upload_form($r,'course');
+ $r->print('</form>');
+ $output = '';
+ } else {
+ $output .= '</form><br />'.&mt('The next step is to chose which questions are to be included in the Concept Test.').'</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">';
@@ -2973,23 +3136,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 '') {
@@ -3000,7 +3174,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'}};
}
@@ -3065,19 +3239,111 @@ 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 notification_information {
my ($disposition,$req_notifylist,$cnum,$now) = @_;
my %emails = &Apache::loncommon::getemails();
@@ -3206,31 +3472,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';
}