+//
$coursebrowserjs
END
@@ -299,7 +318,7 @@ END
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title($lt{'ctit'})
- .''
+ .''
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title($lt{'chsr'})
@@ -313,7 +332,9 @@ END
if ($crstype eq 'Course') {
$r->print(&Apache::lonhtmlcommon::row_headline()
.''.$lt{'iinf'}.'
'
- .$lt{'stat'}
+ .$lt{'stat'}.' '
+ .&mt('Default credits can also be specified, if different from the domain defaults (official courses: [_1]; unofficial courses: [_2]; textbook courses: [_3]).',
+ $domdefaults{'officialcredits'},$domdefaults{'unofficialcredits'},$domdefaults{'textbookcredits'})
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title($lt{'ccod'})
@@ -331,8 +352,21 @@ END
.'
('.$lt{'cscs'}.')'
.&Apache::lonhtmlcommon::row_closure()
);
+ if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) {
+ $r->print(&Apache::lonhtmlcommon::row_title($lt{'ccre'})
+ .''
+ .'
('.$lt{'cred'}.')'
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+ }
+ $r->print(&Apache::lonhtmlcommon::row_title($lt{'crcd'})
+ .''
+ .''.&mt('Yes').(' 'x2)
+ .''.&mt('No')
+ .'
+ .&Apache::lonhtmlcommon::row_closure()
+ );
}
-
# Table: New Course / Clone Course
$r->print(&Apache::lonhtmlcommon::row_headline()
.''.$lt{'crco'}.'
'
@@ -377,7 +411,7 @@ END
.&Apache::lonhtmlcommon::row_closure(1)
.&Apache::lonhtmlcommon::end_pick_box()
- .' | '
+ .' | '
# Clone Course:
.''
@@ -405,7 +439,7 @@ END
.' '
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_headline()
- .$lt{'asov'}
+ .''.$lt{'asov'}.''
.&Apache::lonhtmlcommon::row_closure(1)
.&Apache::lonhtmlcommon::end_pick_box()
.' | '
@@ -427,7 +461,10 @@ END
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title($lt{'oaas'})
- .''
+ .''
+ .''.(' 'x2)
+ .''.', '
+ .$lt{'sta'}.' '.$openallfrom.''
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_headline()
@@ -442,6 +479,10 @@ END
.''
.&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title($lt{'scof'})
+ .''
+ .&Apache::lonhtmlcommon::row_closure()
+
.&Apache::lonhtmlcommon::row_headline()
.''.$lt{'cmmn'}.'
'
.&Apache::lonhtmlcommon::row_closure()
@@ -537,7 +578,8 @@ END
-'
+
+
'
);
} elsif ($crstype eq 'Community') {
$r->print('
@@ -559,7 +601,9 @@ sub create_course {
my $ccuname =&LONCAPA::clean_username($env{'form.ccuname'});
my $ccdomain=&LONCAPA::clean_domain($env{'form.ccdomain'});
my $crstype = 'Community';
- my ($enrollstart,$enrollend,$startaccess,$endaccess);
+ my ($enrollstart,$enrollend,$startaccess,$endaccess,$openallfrom);
+ my %domdefaults =
+ &Apache::lonnet::get_domain_defaults($env{'request.role.domain'});
if ($env{'form.phase'} eq 'coursetwo') {
$crstype='Course';
@@ -568,6 +612,7 @@ sub create_course {
}
$startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess');
$endaccess = &Apache::lonhtmlcommon::get_date_from_form('endaccess');
+ $openallfrom = &Apache::lonhtmlcommon::get_date_from_form('openallfrom');
my $autharg;
my $authtype;
@@ -626,15 +671,26 @@ sub create_course {
endaccess => $endaccess,
setpolicy => $env{'form.setpolicy'},
setcontent => $env{'form.setcontent'},
+ setcomment => $env{'form.setcomment'},
reshome => $env{'form.reshome'},
setkeys => $env{'form.setkeys'},
keyauth => $env{'form.keyauth'},
disresdis => $env{'form.disresdis'},
disablechat => $env{'form.disablechat'},
openall => $env{'form.openall'},
+ openallfrom => $openallfrom,
firstres => $env{'form.firstres'}
};
+ if (($crstype eq 'Course') &&
+ ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'})) {
+ $args->{'defaultcredits'} = $env{'form.defaultcredits'};
+ }
+
+ if ($env{'form.uniquecode'}) {
+ $args->{'uniquecode'} = 1;
+ }
+
#
# Verify data
#
@@ -663,12 +719,12 @@ sub create_course {
,$env{'form.course_home'}.&Apache::loncommon::end_page()));
return;
}
- my ($courseid,$crsudom,$crsunum);
+ my ($courseid,$crsudom,$crsunum,$code);
my ($success,$output) =
&Apache::loncommon::construct_course($args,\$logmsg,\$courseid,
\$crsudom,\$crsunum,
$env{'user.domain'},
- $env{'user.name'},'dc_create');
+ $env{'user.name'},'dc_create',undef,undef,\$code);
$r->print($output);
if ($success) {
#
@@ -688,8 +744,15 @@ sub create_course {
$r->print(
''.&mt('Manage Access Keys').'
');
}
- # Flush the course logs so reverse user roles immediately updated
- &Apache::lonnet::flushcourselogs();
+ if ($code) {
+ $r->print(
+ ''.&mt('Course identifier to share with students: [_1]',$code).'
'
+ );
+ }
+ if ($env{'form.crscode'} ne '') {
+ &Apache::lonnet::devalidate_cache_new('instcats',$crsudom);
+ }
+ ®ister_cleanups($r,$crsudom,$env{'form.crscode'});
$r->print(''.&mt('Roles will be active at next login').'.
');
}
$r->print(''.
@@ -698,7 +761,7 @@ sub create_course {
}
sub print_intro_page {
- my ($r,$show_all_choices) = @_;
+ my ($r,$show_all_choices,$cancreate,$permission) = @_;
my $start_page =
&Apache::loncommon::start_page('Create a New Course or Community');
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Options','Create_Course',undef,'Create_Courses');
@@ -707,6 +770,10 @@ sub print_intro_page {
my $helplink=&Apache::loncommon::help_open_topic('Create_Course_Community',&mt('Help on Creating Courses and Communities'));
# Create menu
+ my $approve = 'Display requests awaiting approval';
+ if ($permission->{'create'}) {
+ $approve = 'Approve or reject requests';
+ }
my @menu;
@menu =
({ categorytitle => 'Course/Community Creation',
@@ -714,25 +781,25 @@ sub print_intro_page {
{
linktext => 'Create a single course',
url => '/adm/createcourse?phase=courseone',
- permission => 1,
+ permission => $permission->{'create'},
#help => '',
- icon => 'ccrs.png',
+ icon => 'crsnew.png',
linktitle => 'Create a new course by completing an online form.'
},
{
linktext => 'Create a single community',
url => '/adm/createcourse?phase=groupone',
- permission => $show_all_choices,
+ permission => $permission->{'create'} && $cancreate->{'Community'},
#help => '',
- icon => 'ccrs.png',
+ icon => 'crsnew.png',
linktitle => 'Create a new collaborative community by completing an online form.'
},
{
linktext => 'Create courses/communities by uploading an attributes file',
url => '/adm/createcourse?phase=batchone',
- permission => 1,
+ permission => $permission->{'create'},
help => 'Batch_Creation',
- icon => 'ccrs.png',
+ icon => 'uplcrs.png',
linktitle => 'Upload an attributes file containing specifications for one or more courses or communities in XML format.'
},
]
@@ -740,19 +807,20 @@ sub print_intro_page {
{ categorytitle => 'Course/Community Requests',
items => [
{
- linktext => 'Approve or reject requests',
+ linktext => $approve,
url => '/adm/createcourse?phase=requestdisplay',
permission => $show_all_choices,
#help => '',
- icon => 'ccrs.png',
+ icon => 'rcrs.png',
linktitle => 'Display course and community creation requests submitted by authorized users, held pending approval by a Domain Coordinator.'
},
{
- linktext => 'Display official course requests',
+ linktext => 'View pending official course requests',
url => '/adm/createcourse?phase=pendingdisplay',
permission => $show_all_choices,
#help => '',
- icon => 'ccrs.png',
+ icon => 'edit-find.png',
+ alttext => '',
linktitle => 'Display official course requests submitted by authorized users, held pending validation of instructor status.'
},
]
@@ -800,43 +868,68 @@ sub upload_batchfile {
sub process_batchfile {
my $r = shift;
- my $start_page =
- &Apache::loncommon::start_page('Create a New Course or Community');
- my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Outcome','Create_Course',undef,'Create_Courses');
- my $end_page =
- &Apache::loncommon::end_page();
my $defdom=$env{'request.role.domain'};
- my $batchfilepath=&Apache::lonnet::userfileupload('coursecreatorxml',undef,
- 'batchupload',undef,undef,
- undef,undef,$defdom);
- my ($batchdir,$filename) = ($batchfilepath =~ m-^(.+)/pending/([^/]+)$-);
- my ($result,$logmsg);
- if (-e "$batchfilepath") {
- open(FILE,"<$batchfilepath");
- my @buffer = ;
- close(FILE);
- if ((defined($filename)) && (defined($batchdir))) {
- my @requests = ($filename);
- my %courseids = ();
- ($result,$logmsg) = &LONCAPA::batchcreatecourse::create_courses(
- \@requests,\%courseids,'web',$defdom,
- $env{'user.name'},$env{'user.domain'});
- if ($result) {
- if (!-e "$batchdir/processed") {
- mkdir("$batchdir/processed", 0755);
- open(FILE,">$batchdir/processed/$filename");
- print FILE @buffer;
+ my $uname = $env{'user.name'};
+ my $udom = $env{'user.domain'};
+ my $dir = &LONCAPA::tempdir().'addcourse';
+ my ($result,$logmsg,$keysmsg,$codesref,$instcodesref);
+ if (($defdom =~ /^$match_domain$/) && ($uname =~ /^$match_username$/) && ($udom =~/^$match_domain$/)) {
+ my $batchfilepath=&Apache::lonnet::userfileupload('coursecreatorxml',undef,
+ 'batchupload',undef,undef,
+ undef,undef,$defdom);
+ if ($batchfilepath =~ m{^(\Q$dir/$defdom/web/$uname\E_\Q$udom\E)/pending/([^/]+)$}) {
+ my ($batchdir,$filename) = ($1,$2);
+ if (-e "$batchfilepath") {
+ if (open(FILE,"<",$batchfilepath)) {
+ my @buffer = ;
close(FILE);
- if (-e "$batchdir/processed/$filename") {
- unlink("$batchdir/pending/$filename");
+ if ((defined($filename)) && (defined($batchdir))) {
+ my @requests = ($filename);
+ my %courseids = ();
+ ($result,$logmsg,$keysmsg,$codesref,$instcodesref) =
+ &LONCAPA::batchcreatecourse::create_courses(
+ \@requests,\%courseids,'web',$defdom,
+ $uname,$udom);
+ if (keys(%courseids) > 0) {
+ if (!-e "$batchdir/processed") {
+ mkdir("$batchdir/processed", 0755);
+ }
+ if (-d "$batchdir/processed") {
+ if (open(FILE,">","$batchdir/processed/$filename")) {
+ print FILE @buffer;
+ close(FILE);
+ }
+ }
+ if (-e "$batchdir/processed/$filename") {
+ unlink("$batchdir/pending/$filename");
+ }
+ my $updatecats;
+ if ((ref($instcodesref) eq 'HASH') && (keys(%{$instcodesref}) > 0)) {
+ &Apache::lonnet::devalidate_cache_new('instcats',$defdom);
+ $updatecats = 1;
+ }
+ ®ister_cleanups($r,$defdom,$updatecats);
+
+ }
}
+ } else {
+ $result = ''.&mt('Could not open attributes file.').'
'.&mt('No courses created.').'
';
}
+ } else {
+ $result = ''.&mt('No uploaded attributes file found.').'
'.&mt('No courses created.').'
';
}
+ } else {
+ $result = ''.&mt('Invalid path to attributes file.').'
'.&mt('No courses created.').'
';
}
+ } else {
+ $result = ''.&mt("Your username, domain, and/or your current role's domain are missing or contain invalid characters.").
+ '
'.&mt('No courses created.').'
';
}
- $r->print($start_page.$crumbs.$logmsg.$result.'
'.
- &mt('Creation options menu').''.$end_page);
-
+ $r->print(&Apache::loncommon::start_page('Create a New Course, Community or Placement Test').
+ &Apache::lonhtmlcommon::breadcrumbs('Creation Outcome','Create_Course',undef,'Create_Courses').
+ $logmsg.$result.'
'.
+ &mt('Creation options menu').''.
+ &Apache::loncommon::end_page());
}
sub courserequestbrowser_javascript {
@@ -931,7 +1024,7 @@ sub print_creation_logs {
if ($numtitles) {
if (($curr{'type'} eq 'official') || ($curr{'type'} eq 'unofficial')) {
$instcodefilter = &instcode_srchstr($dom,$numtitles);
- &Apache::courseclassifier::instcode_search_str($dom,$numtitles);
+ &Apache::courseclassifier::instcode_search_str($dom,$numtitles,\@codetitles);
if ($curr{'type'} eq 'official') {
$regexpok = 1;
} else {
@@ -1123,7 +1216,7 @@ sub creation_display_filter {
$typename = $typenames->{$type};
}
}
- $output .= ''."\n";
+ $output .= ''."\n";
}
$output .= '