';
if ($context eq 'crosslist') {
$output .= ''.&mt('Include?').'
'.
@@ -2395,7 +2761,7 @@ sub get_course_dom {
}
}
if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
- my ($types,$typename) = &course_types();
+ my ($types,$typename) = &Apache::loncommon::course_types();
if (ref($types) eq 'ARRAY') {
foreach my $type (@{$types}) {
if (&Apache::lonnet::usertools_access($env{'user.name'},
@@ -2479,7 +2845,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'};
@@ -2498,6 +2864,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)) {
@@ -2512,6 +2882,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'} = '';
+ }
}
}
}
@@ -2559,7 +2933,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');
@@ -2611,14 +2985,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'};
@@ -2650,6 +3030,25 @@ 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';
+ }
+ 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);
my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
@@ -2709,7 +3108,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 .= ''.$message.' ';
}
@@ -2717,11 +3120,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);
}
@@ -2733,14 +3136,86 @@ sub print_request_outcome {
$reqstatus = 'created';
my $role_result = &update_requestors_roles($dom,$cnum,$crstype,$details,
\%longroles);
- $output = ''.&mt('Your course request has been processed and the course has been created.').
- '
'.$role_result.' ';
+ if ($crstype eq 'community') {
+ $output = ''.&mt('Your community request has been processed and the community has been created.');
+ } else {
+ $output = ' '.&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 .= '
'.&mt('A concept test has been copied from your existing test: [_1].',''.$oldcdesc.'').' ';
+ if ($env{'form.cloneroster'}) {
+ $output .= '
'.&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 .= ''.$logging[-1].' ';
+ }
+ }
+ $output .= ''.
+ '- '.&mt('Access starts:').' '.
+ &Apache::lonlocal::locallocaltime($accessstart).'
'.
+ '- '.&mt('Access ends:').' '.&Apache::lonlocal::locallocaltime($accessend).'
'.
+ '
'.
+ ''.&mt('Manage Test').'';
+ $r->print($output);
+ $output = '';
+ } else {
+ &roster_upload_form($r,$output);
+ $output = '';
+ }
+ } else {
+ $output .= '';
+ &roster_upload_form($r,$output);
+ $output = '';
+ }
+ } elsif ($env{'form.concepttest'} eq 'defchosen') {
+ $output .= '
';
+ my $error = &Apache::londocsgci::store($caller,$dom,$cnum);
+ if ($error) {
+ $output .= ''.
+ &mt('An error occurred saving an auto-generated concept test: [_1].',$error).
+ '';
+ } else {
+ &Apache::lonuserstate::readmap($dom.'/'.$cnum);
+ $output .= &mt('A concept test has also been generated.');
+ }
+ $output .= '';
+ &roster_upload_form($r,$output);
+ $output = '';
+ } else {
+ $output .= '
'.&mt('The next step is to chose which questions are to be included in the Concept Test.').'';
+ $r->print($output);
+ &Apache::londocsgci::editor($r,'requestcrs',$dom,$cnum);
+ $output = '';
+ }
+ } else {
+ $output .= '
'.$role_result.'';
+ }
$creationresult = 'created';
} else {
- $output = ''.
- &mt('An error occurred when processing your course request.').
- '
'.
- &mt('You may want to review the request details and submit the request again.').
+ $output = '';
+ 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 .= '
'.
+ &mt('You may want to review the request details and submit the request again.').
'';
$creationresult = 'error';
}
@@ -2773,7 +3248,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.').'
'.
+ if ($crstype eq 'community') {
+ $output .= &mt('Your community request has been recorded.');
+ } else {
+ $output .= &mt('Your course request has been recorded.')
+ }
+ $output .= '
'.
¬ification_information($disposition,$req_notifylist,
$cnum,$now);
} else {
@@ -2805,8 +3285,12 @@ 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 .= ''.&mt('Your course request has been updated').' '.
- ¬ification_information($disposition,$req_notifylist,$cnum,$now);
+ if ($crstype eq 'community') {
+ $output .= ''.&mt('Your community request has been updated').' ';
+ } else {
+ $output .= ''.&mt('Your course request has been updated').' ';
+ }
+ $output .= ¬ification_information($disposition,$req_notifylist,$cnum,$now);
}
if ($validationerror ne '') {
$output .= ''.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'';
@@ -2826,85 +3310,101 @@ sub update_requestors_roles {
my $owner = $env{'user.name'}.':'.$env{'user.domain'};
if (ref($details) eq 'HASH') {
if (ref($details->{'personnel'}) eq 'HASH') {
- if (ref($details->{'personnel'}{$owner}) eq 'HASH') {
- my @roles;
- if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
- @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
- unless (grep(/^cc$/,@roles)) {
- push(@roles,'cc');
- }
- } else {
- @roles = ('cc');
+ my $ccrole = 'cc';
+ if ($crstype eq 'community') {
+ $ccrole = 'co';
+ }
+ unless (ref($details->{'personnel'}{$owner}) eq 'HASH') {
+ $details->{'personnel'}{$owner} = {
+ 'roles' => [$ccrole],
+ $ccrole => { 'usec' => [] },
+ };
+ }
+ my @roles;
+ if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
+ @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
+ unless (grep(/^\Q$ccrole\E$/,@roles)) {
+ push(@roles,$ccrole);
}
- foreach my $role (@roles) {
- my $start = $now;
- my $end = '0';
- if ($role eq 'st') {
- if ($details->{'accessstart'} ne '') {
- $start = $details->{'accessstart'};
- }
- if ($details->{'accessend'} ne '') {
- $end = $details->{'accessend'};
- }
- }
- my @usecs;
- if ($role ne 'cc') {
- if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
- @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
- }
- }
- if ($role eq 'st') {
- if (@usecs > 1) {
- my $firstsec = $usecs[0];
- @usecs = ($firstsec);
- }
- }
- if (@usecs == 0) {
- push(@usecs,'');
- }
- foreach my $usec (@usecs) {
- my (%userroles,%newrole,%newgroups,$spec,$area);
- my $area = '/'.$dom.'/'.$cnum;
- my $spec = $role.'.'.$area;
- if ($usec ne '') {
- $spec .= '/'.$usec;
- $area .= '/'.$usec;
- }
+ } else {
+ @roles = ($ccrole);
+ }
+ foreach my $role (@roles) {
+ my $refresh=$env{'user.refresh.time'};
+ if ($refresh eq '') {
+ $refresh = $env{'user.login.time'};
+ }
+ if ($refresh eq '') {
+ $refresh = $now;
+ }
+ my $start = $refresh-1;
+ my $end = '0';
+ if ($role eq 'st') {
+ if ($details->{'accessstart'} ne '') {
+ $start = $details->{'accessstart'};
+ }
+ if ($details->{'accessend'} ne '') {
+ $end = $details->{'accessend'};
+ }
+ }
+ my @usecs;
+ if ($role ne $ccrole) {
+ if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
+ @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
+ }
+ }
+ if ($role eq 'st') {
+ if (@usecs > 1) {
+ my $firstsec = $usecs[0];
+ @usecs = ($firstsec);
+ }
+ }
+ if (@usecs == 0) {
+ push(@usecs,'');
+ }
+ foreach my $usec (@usecs) {
+ my (%userroles,%newrole,%newgroups,$spec,$area);
+ my $area = '/'.$dom.'/'.$cnum;
+ my $spec = $role.'.'.$area;
+ if ($usec ne '') {
+ $spec .= '/'.$usec;
+ $area .= '/'.$usec;
+ }
+ if ($role =~ /^cr\//) {
+ &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom,
+ $cnum,$spec,$area);
+ } else {
+ &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom,
+ $spec,$cnum,$area);
+ }
+ &Apache::lonnet::set_userprivs(\%userroles,\%newrole,
+ \%newgroups);
+ $userroles{'user.role.'.$spec} = $start.'.'.$end;
+ &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
+ if (($end == 0) || ($end > $now)) {
+ my $showrole = $role;
if ($role =~ /^cr\//) {
- &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom,
- $cnum,$spec,$area);
- } else {
- &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom,
- $spec,$cnum,$area);
+ $showrole = &Apache::lonnet::plaintext($role,$crstype);
+ } elsif (ref($longroles) eq 'HASH') {
+ if ($longroles->{$role} ne '') {
+ $showrole = $longroles->{$role};
+ }
}
- &Apache::lonnet::set_userprivs(\%userroles,\%newrole,
- \%newgroups);
- $userroles{'user.role.'.$spec} = $start.'.'.$end;
- &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
- if (($end == 0) || ($end > $now)) {
- my $showrole = $role;
- if ($role =~ /^cr\//) {
- $showrole = &Apache::lonnet::plaintext($role,$crstype);
- } elsif (ref($longroles) eq 'HASH') {
- if ($longroles->{$role} ne '') {
- $showrole = $longroles->{$role};
- }
+ if ($start <= $now) {
+ $active .= ''.$showrole;
+ if ($usec ne '') {
+ $active .= ' - '.&mt('section:').' '.$usec;
}
- if ($start <= $now) {
- $active .= ''.$showrole;
- if ($usec ne '') {
- $active .= ' - '.&mt('section:').' '.$usec;
- }
- $active .= '';
- $numactive ++;
- } else {
- $future .= ''.$showrole;
- if ($usec ne '') {
- $future .= ' - '.&mt('section:').' '.$usec;
- }
- $future .= '';
- $numfuture ++;
+ $active .= '';
+ $numactive ++;
+ } else {
+ $future .= ''.$showrole;
+ if ($usec ne '') {
+ $future .= ' - '.&mt('section:').' '.$usec;
}
+ $future .= '';
+ $numfuture ++;
}
}
}
@@ -2913,19 +3413,121 @@ 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 .= '
';
}
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,'','',&Apache::lonlocal::locallocaltime($details->{'accessstart'})).
- ' ';
+ 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,'','',&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,'','',&Apache::lonlocal::locallocaltime($details->{'accessstart'}));
+ }
+ $output .= ' ';
}
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) = @_;
+ $r->print(''.&mt('If you have a text file available containing student e-mail addresses and initial passwords, you may upload it now.').'
'.
+ &mt('You may also enroll students at a later date by visiting the [_1]"Menu"[_2] page and choosing: [_1]"Manage Enrollment"[_2].','','').' '.
+ '');
+}
+
sub notification_information {
my ($disposition,$req_notifylist,$cnum,$now) = @_;
my %emails = &Apache::loncommon::getemails();
@@ -3054,31 +3656,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]);
- my ($types,$typename) = &course_types();
+ 'userroles',['active','future'],['cc','co'],[$dom]);
+ my ($types,$typename) = &Apache::loncommon::course_types();
my %requests = &Apache::lonnet::dumpstore('courserequests',$udom,$uname);
- my %count;
- if (ref($types) eq 'ARRAY') {
- foreach my $type (@{$types}) {
- $count{$type} = 0;
- }
- }
+ my $count = 0;
foreach my $key (keys(%requests)) {
my ($cdom,$cnum) = split('_',$key);
- if (exists($crsroles{$cnum.':'.$cdom.':cc'})) {
- if (ref($requests{$key}) eq 'HASH') {
- my $type = $requests{$key}{'crstype'};
- if ($type =~ /^official|unofficial|community$/) {
- $count{$type} ++;
- }
+ if (ref($requests{$key}) eq 'HASH') {
+ next if ($requests{$key}{'crstype'} ne $crstype);
+ if (($crstype eq 'community') &&
+ (exists($crsroles{$cnum.':'.$cdom.':co'}))) {
+ $count ++;
+ } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial')) &&
+ (exists($crsroles{$cnum.':'.$cdom.':cc'}))) {
+ $count ++;
}
}
}
- if ($count{$crstype} < $limit) {
+ if ($count < $limit) {
return 'process';
} else {
if (ref($typename) eq 'HASH') {
- $$message = &mt('Your request has not been processed because you have reached the limit for the number of courses of this type.').'
'.&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.').
+ '
'.&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.').
+ '
'.&mt("Your $typename->{$crstype} limit is [_1].",$limit);
+ }
}
return 'rejected';
}
@@ -3250,5 +3855,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;
|