--- loncom/interface/loncreatecourse.pm 2006/05/15 19:11:40 1.88 +++ loncom/interface/loncreatecourse.pm 2009/03/12 16:29:32 1.119 @@ -1,7 +1,7 @@ # The LearningOnline Network # Create a course # -# $Id: loncreatecourse.pm,v 1.88 2006/05/15 19:11:40 albertel Exp $ +# $Id: loncreatecourse.pm,v 1.119 2009/03/12 16:29:32 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,238 +27,61 @@ # ### -package Apache::loncreatecourse; +=head1 NAME -use strict; -use Apache::Constants qw(:common :http); -use Apache::lonnet; -use Apache::loncommon; -use Apache::lonratedt; -use Apache::londocs; -use Apache::lonlocal; -use Apache::londropadd; -use lib '/home/httpd/lib/perl'; +Apache::loncreatecourse.pm -# ================================================ Get course directory listing +=head1 SYNOPSIS -my @output=(); +Allows domain coordinators to create new +courses and assign course coordinators. -sub crsdirlist { - my ($courseid,$which)=@_; - @output=(); - return &innercrsdirlist($courseid,$which); -} - -sub innercrsdirlist { - my ($courseid,$which,$path)=@_; - my $dirptr=16384; - unless ($which) { $which=''; } else { $which.='/'; } - unless ($path) { $path=''; } else { $path.='/'; } - my %crsdata=&Apache::lonnet::coursedescription($courseid); - my @listing=&Apache::lonnet::dirlist - ($which,$crsdata{'domain'},$crsdata{'num'}, - &Apache::loncommon::propath($crsdata{'domain'},$crsdata{'num'})); - foreach (@listing) { - unless ($_=~/^\./) { - my @unpackline = split (/\&/,$_); - if ($unpackline[3]&$dirptr) { -# is a directory, recurse - &innercrsdirlist($courseid,$which.$unpackline[0], - $path.$unpackline[0]); - } else { -# is a file, put into output - push (@output,$path.$unpackline[0]); - } - } - } - return @output; -} +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. -# ============================================================= Read a userfile +=head1 SUBROUTINES -sub readfile { - my ($courseid,$which)=@_; - my %crsdata=&Apache::lonnet::coursedescription($courseid); - return &Apache::lonnet::getfile('/uploaded/'.$crsdata{'domain'}.'/'. - $crsdata{'num'}.'/'.$which); -} - -# ============================================================ Write a userfile - -sub writefile { - (my $courseid, my $which,$env{'form.output'})=@_; - my %crsdata=&Apache::lonnet::coursedescription($courseid); - return &Apache::lonnet::finishuserfileupload( - $crsdata{'num'},$crsdata{'domain'}, - 'output',$which); -} - -# ===================================================================== Rewrite - -sub rewritefile { - my ($contents,%rewritehash)=@_; - foreach (keys %rewritehash) { - my $pattern=$_; - $pattern=~s/(\W)/\\$1/gs; - my $new=$rewritehash{$_}; - $contents=~s/$pattern/$new/gs; - } - return $contents; -} - -# ============================================================= Copy a userfile - -sub copyfile { - my ($origcrsid,$newcrsid,$which)=@_; - unless ($which=~/\.sequence$/) { - return &writefile($newcrsid,$which, - &readfile($origcrsid,$which)); - } else { - my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid); - my %newcrsdata= &Apache::lonnet::coursedescription($newcrsid); - return &writefile($newcrsid,$which, - &rewritefile( - &readfile($origcrsid,$which), - ( - '/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/' - => '/uploaded/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/', - '/public/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/' - => '/public/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/' - ))); - } -} +=over -# =============================================================== Copy a dbfile +=item handler() -sub copydb { - my ($origcrsid,$newcrsid,$which)=@_; - $which=~s/\.db$//; - my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid); - my %newcrsdata= &Apache::lonnet::coursedescription($newcrsid); - my %data=&Apache::lonnet::dump - ($which,$origcrsdata{'domain'},$origcrsdata{'num'}); - foreach my $key (keys(%data)) { - if ($key=~/^internal./) { delete($data{$key}); } - } - return &Apache::lonnet::put - ($which,\%data,$newcrsdata{'domain'},$newcrsdata{'num'}); -} +=item print_course_creation_page() -# ========================================================== Copy resourcesdata +=item create_course() -sub copyresourcedb { - my ($origcrsid,$newcrsid)=@_; - my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid); - my %newcrsdata= &Apache::lonnet::coursedescription($newcrsid); - my %data=&Apache::lonnet::dump - ('resourcedata',$origcrsdata{'domain'},$origcrsdata{'num'}); - $origcrsid=~s/^\///; - $origcrsid=~s/\//\_/; - $newcrsid=~s/^\///; - $newcrsid=~s/\//\_/; - my %newdata=(); - undef %newdata; - my $startdate=$data{$origcrsid.'.0.opendate'}; - if (!$startdate) { - # now global start date for assements try the enrollment start - my %start=&Apache::lonnet::get('environment', - ['default_enrollment_start_date'], - $origcrsdata{'domain'},$origcrsdata{'num'}); - - $startdate = $start{'default_enrollment_start_date'}; - } - my $today=time; - my $delta=0; - if ($startdate) { - my $oneday=60*60*24; - $delta=$today-$startdate; - $delta=int($delta/$oneday)*$oneday; - } -# ugly retro fix for broken version of types - foreach (keys %data) { - if ($_=~/\wtype$/) { - my $newkey=$_; - $newkey=~s/type$/\.type/; - $data{$newkey}=$data{$_}; - delete $data{$_}; - } - } -# adjust symbs - my $pattern='uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'; - $pattern=~s/(\W)/\\$1/gs; - my $new= 'uploaded/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/'; - foreach (keys %data) { - if ($_=~/$pattern/) { - my $newkey=$_; - $newkey=~s/$pattern/$new/; - $data{$newkey}=$data{$_}; - delete $data{$_}; - } - } -# adjust dates - foreach (keys %data) { - my $thiskey=$_; - $thiskey=~s/^$origcrsid/$newcrsid/; - $newdata{$thiskey}=$data{$_}; - if ($data{$_.'.type'}=~/^date_(start|end)$/) { - if ($delta > 0) { - $newdata{$thiskey}=$newdata{$thiskey}+$delta; - } else { - # no delta, it's unlikely we want the old dates and times - delete($newdata{$thiskey}); - delete($newdata{$thiskey.'.type'}); - } - } - } - return &Apache::lonnet::put - ('resourcedata',\%newdata,$newcrsdata{'domain'},$newcrsdata{'num'}); -} +=item print_intro_page() -# ========================================================== Copy all userfiles +=item upload_batchfile() -sub copyuserfiles { - my ($origcrsid,$newcrsid)=@_; - foreach (&crsdirlist($origcrsid,'userfiles')) { - if ($_ !~m|^scantron_|) { - ©file($origcrsid,$newcrsid,$_); - } - } -} -# ========================================================== Copy all userfiles +=item process_batchfile() -sub copydbfiles { - my ($origcrsid,$newcrsid)=@_; +=back - my ($origcrs_discussion) = ($origcrsid=~m|^/(.*)|); - $origcrs_discussion=~s|/|_|g; - foreach (&crsdirlist($origcrsid)) { - if ($_=~/\.db$/) { - unless - ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata|\Q$origcrs_discussion\E|slots|slot_reservations|gradingqueue|reviewqueue|CODEs)/) { - ©db($origcrsid,$newcrsid,$_); - my $histfile=$_; - $histfile=~s/\.db$/\.hist/; - ©file($origcrsid,$newcrsid,$histfile); - } - } - } -} +=cut -# ======================================================= Copy all course files +package Apache::loncreatecourse; -sub copycoursefiles { - my ($origcrsid,$newcrsid)=@_; - ©userfiles($origcrsid,$newcrsid); - ©dbfiles($origcrsid,$newcrsid); - ©resourcedb($origcrsid,$newcrsid); -} +use strict; +use Apache::Constants qw(:common :http); +use Apache::lonnet; +use Apache::loncommon; +use Apache::londocs; +use Apache::lonlocal; +use Apache::lonuserutils; +use Apache::lonclonecourse; +use LONCAPA::batchcreatecourse; +use LONCAPA; # ===================================================== Phase one: fill-in form sub print_course_creation_page { my $r=shift; + my $crstype = 'Group'; + if ($env{'form.phase'} eq 'courseone') { + $crstype = 'Course'; + } my $defdom=$env{'request.role.domain'}; - my %host_servers = &Apache::loncommon::get_library_servers($defdom); + my %host_servers = &Apache::lonnet::get_servers($defdom,'library'); my $course_home = '' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'chsr'}) + .$course_home + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'cidn'}.' ('.$lt{'opt'}.')') + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'iinf'}.'

' + .$lt{'stat'} + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'ccod'}) + .'' + .'
('.$lt{'toin'}.')' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'snid'}) + .'' + .'
('.$lt{'csli'}.')' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'crcs'}) + .'' + .'
('.$lt{'cscs'}.')' + .&Apache::lonhtmlcommon::row_closure() + ); - $r->print(<print(&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'crco'}.'

' + .&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .''.$lt{'cncr'}.'' + .' '.&mt('or').' ' + .''.$lt{'cecr'}.'' + .&Apache::loncommon::end_data_table_header_row() + .&Apache::loncommon::start_data_table_row() + + # New Course: + .'' + .&Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title($lt{'map'}) + .'' + .''.$lt{'smap'}.'' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title('') + .'' + .'
('.$lt{'ocik'}.')' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title($lt{'fres'}) + .'' + .' ' + .'' + .' ' + .'' + .'
('.$lt{'stco'}.')' + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + + .' ' + + # Clone Course: + .'' + .&Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title($lt{'cid'}) + .'' + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::row_title($lt{'dmn'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title($lt{'dsh'}) + .'
' + .'
' + .'' + .' ' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_headline() + .$lt{'asov'} + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + .'' + .&Apache::loncommon::end_data_table_row() + .&Apache::loncommon::end_data_table() + .&Apache::lonhtmlcommon::row_closure() + ); + + $r->print(&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'dads'}.'

' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title($lt{'dacc'}) + .$access_table + .&Apache::lonhtmlcommon::row_closure() + ); + + $r->print(&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'assp'}.'

' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'oaas'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'mssg'}.'

' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'scpf'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'scfc'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'cmmn'}.'

' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'dsrd'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'dsuc'}) + .''.$lt{'acco'}.'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'snak'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'kaut'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'rshm'}.'

' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'rshm'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'aens'}.'

' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'aadd'}) + .'' + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'audr'}) + .'' + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'dacu'}) + .$enroll_table + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'psam'}) + .$lt{'pcda'}.'
' + .$krbform.'
' + .$intform.'
' + .$locform + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'nech'}) + .$lt{'nccl'}.'
' + .'' + .'' + .'
' + .$lt{'ndcl'}.'
' + .'' + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'irsp'}) + .' ' + .' ' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'cgrs'}.'

' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'cgrq'}) + .'Mb' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'cc'}.'

' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'user'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + + .&Apache::lonhtmlcommon::row_title($lt{'dmn'},"","LC_odd_row_value") + .$domform + .&Apache::lonhtmlcommon::row_closure(1) + + .&Apache::lonhtmlcommon::end_pick_box() + ); + + $r->print(< +

+ + + +

+ +ENDDOCUMENT + + } elsif ($crstype eq 'Group') { + $r->print(< -

$lt{'cinf'}

+

$lt{'ginf'}

-

-

-

$lt{'iinf'}

-

-$lt{'stat'} -

- -
-($lt{'toin'}) -

- -
-($lt{'csli'}) -

- -
-($lt{'cscs'})

-

$lt{'crco'}

+

$lt{'grco'}

- +
$lt{'cncr'}$lt{'cecr'}
$lt{'cngr'}$lt{'cegr'}

$lt{'smap'}

- +
($lt{'ocik'}):

-$lt{'fres'}
($lt{'stco'}): +$lt{'fres'}
($lt{'stgo'}):    



- 
+
+
+ +
 
$lt{'asov'}.
-

$lt{'assp'}

-

-

+

$lt{'mssg'}


$lt{'cmmn'}


$lt{'acco'}


@@ -515,61 +619,12 @@ $lt{'asov'}.

-

$lt{'aens'}

-$lt{'aesc'} -

-

-$lt{'aadd'} - - -

-$lt{'audr'} - - -

-$lt{'dacu'} -$enroll_table -

-$lt{'dacc'} -$access_table -

-$lt{'psam'}.
-$lt{'pcda'}. -

-$krbform -
-$intform -
-$locform -

-$lt{'nech'}
-$lt{'nccl'}
- - -
-$lt{'ndcl'}
- - -

-$lt{'irsp'} - - +

$lt{'grts'}

+$lt{'grtq'} +Mb

-

$lt{'cc'}

+

$lt{'gc'}

- - + + +

-$end_page ENDDOCUMENT + } + $r->print($end_page); } # ====================================================== Phase two: make course sub create_course { my $r=shift; - my $ccuname=$env{'form.ccuname'}; - my $ccdomain=$env{'form.ccdomain'}; - $ccuname=~s/\W//g; - $ccdomain=~s/\W//g; - - my $enrollstart = &Apache::lonhtmlcommon::get_date_from_form('startenroll'); - my $enrollend = &Apache::lonhtmlcommon::get_date_from_form('endenroll'); - my $startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess'); - my $endaccess = &Apache::lonhtmlcommon::get_date_from_form('endaccess'); + my $ccuname =&LONCAPA::clean_username($env{'form.ccuname'}); + my $ccdomain=&LONCAPA::clean_domain($env{'form.ccdomain'}); + my $crstype = 'Group'; + my ($enrollstart,$enrollend,$startaccess,$endaccess); + + if ($env{'form.phase'} eq 'coursetwo') { + $crstype='Course'; + $enrollstart=&Apache::lonhtmlcommon::get_date_from_form('startenroll'); + $enrollend=&Apache::lonhtmlcommon::get_date_from_form('endenroll'); + } + $startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess'); + $endaccess = &Apache::lonhtmlcommon::get_date_from_form('endaccess'); my $autharg; my $authtype; @@ -620,12 +680,14 @@ sub create_course { $autharg = $env{'form.locarg'}; } } - my $logmsg; - my $start_page=&Apache::loncommon::start_page('Create a New Course'); - $r->print($start_page); + my $start_page=&Apache::loncommon::start_page('Create a New '.$crstype); + my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Outcome','Create_Course',undef,'Create_Courses'); + + $r->print($start_page.$crumbs); my $args = { + crstype => $crstype, ccuname => $ccuname, ccdomain => $ccdomain, cdescr => $env{'form.title'}, @@ -634,10 +696,13 @@ sub create_course { course_home => $env{'form.course_home'}, nonstandard => $env{'form.nonstandard'}, crscode => $env{'form.crscode'}, + crsquota => $env{'form.crsquota'}, clonecourse => $env{'form.clonecourse'}, clonedomain => $env{'form.clonedomain'}, + datemode => $env{'form.datemode'}, + dateshift => $env{'form.dateshift'}, crsid => $env{'form.crsid'}, - curruser => $env{'user.name'}, + curruser => $env{'user.name'}.':'.$env{'user.domain'}, crssections => $env{'form.crssections'}, crsxlist => $env{'form.crsxlist'}, autoadds => $env{'form.autoadds'}, @@ -669,311 +734,162 @@ sub create_course { # Check the veracity of the course coordinator if (&Apache::lonnet::homeserver($ccuname,$ccdomain) eq 'no_host') { $r->print('
'); - $r->print(&mt('No such user').' '.$ccuname.' '.&mt('at').' '.$ccdomain.'.
'); - $r->print(&mt("Please click Back on your browser and select another user, or ")); - $r->print(' - - - - -
'.&Apache::loncommon::end_page()); + $r->print('
' + .&mt('No such user [_1] at domain [_2].',''.$ccuname.'',''.$ccdomain.'') + .'
'); + $r->print(&mt('Please click Back on your browser and select another user, or [_1]Create User[_2]' + , '' + .'' + .'' + .'' + ) + .''.&Apache::loncommon::end_page() + ); return; } # Check the proposed home server for the course - my %host_servers = &Apache::loncommon::get_library_servers - ($env{'request.role.domain'}); + my %host_servers = + &Apache::lonnet::get_servers($env{'request.role.domain'},'library'); if (! exists($host_servers{$env{'form.course_home'}})) { - $r->print(&mt('Invalid home server for course').': '. - $env{'form.course_home'}.&Apache::loncommon::end_page()); + $r->print(&mt('Invalid home server for course: [_1]' + ,$env{'form.course_home'}.&Apache::loncommon::end_page())); return; } my ($courseid,$crsudom,$crsunum); - $r->print(&construct_course($args,\$logmsg,\$courseid,\$crsudom,\$crsunum,$env{'user.domain'},$env{'user.name'})); - -# -# Make the requested user a course coordinator -# - if (($ccdomain) && ($ccuname)) { - $r->print(&mt('Assigning role of course coordinator to').' '. - $ccuname.' at '.$ccdomain.': '. - &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,'cc').'

'); - } - if ($env{'form.setkeys'}) { - $r->print( - '

'.&mt('Manage Access Keys').'

'); - } -# Flush the course logs so reverse user roles immediately updated - &Apache::lonnet::flushcourselogs(); - $r->print('

'.&mt('Roles will be active at next login').'.

'. - '

'. - &mt('Create Another Course').'

'. + my ($success,$output) = + &Apache::loncommon::construct_course($args,\$logmsg,\$courseid, + \$crsudom,\$crsunum, + $env{'user.domain'}, + $env{'user.name'}); + $r->print($output); + if ($success) { + # + # Make the requested user a course coordinator or group coordinator + # + if (($ccdomain) && ($ccuname)) { + $r->print(&mt('Assigning role of '.$crstype.' Coordinator to [_1]:', + ,''.$ccuname.':'.$ccdomain.'') + .&Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid, + 'cc','','','','','createcourse').'

'); + } + if ($env{'form.setkeys'}) { + $r->print( + '

'.&mt('Manage Access Keys').'

'); + } + # Flush the course logs so reverse user roles immediately updated + &Apache::lonnet::flushcourselogs(); + $r->print('

'.&mt('Roles will be active at next login').'.

'); + } + $r->print('

'. + &mt("Create Another $crstype").'

'. &Apache::loncommon::end_page()); } -sub construct_course { - my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_; - my $outcome; - -# -# Open course -# - my %cenv=(); - $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'}, - $args->{'cdescr'}, - $args->{'curl'}, - $args->{'course_home'}, - $args->{'nonstandard'}, - $args->{'crscode'}, - $args->{'ccuname'}); - - # Note: The testing routines depend on this being output; see - # Utils::Course. This needs to at least be output as a comment - # if anyone ever decides to not show this, and Utils::Course::new - # will need to be suitably modified. - $outcome .= 'New LON-CAPA Course ID: '.$$courseid.'
'; -# -# Check if created correctly -# - ($$crsudom,$$crsunum)=($$courseid=~/^\/(\w+)\/(\w+)$/); - my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom); - $outcome .= &mt('Created on').': '.$crsuhome.'
'; -# -# Are we cloning? -# - my $cloneid=''; - if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) { - $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'}; - my ($clonecrsudom,$clonecrsunum)=($cloneid=~/^\/(\w+)\/(\w+)$/); - my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); - if ($clonehome eq 'no_host') { - $outcome .= - '
'.&mt('Attempting to clone non-existing course').' '.$cloneid.''; - } else { - $outcome .= - '
'.&mt('Cloning course from').' '.$clonehome.''; - my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); -# Copy all files - ©coursefiles($cloneid,$$courseid); -# Restore URL - $cenv{'url'}=$oldcenv{'url'}; -# Restore title - $cenv{'description'}=$oldcenv{'description'}; -# restore grading mode - if (defined($oldcenv{'grading'})) { - $cenv{'grading'}=$oldcenv{'grading'}; - } -# Mark as cloned - $cenv{'clonedfrom'}=$cloneid; - delete($cenv{'default_enrollment_start_date'}); - delete($cenv{'default_enrollment_end_date'}); - } - } -# -# Set environment (will override cloned, if existing) -# - my @sections = (); - my @xlists = (); - if ($args->{'crsid'}) { - $cenv{'courseid'}=$args->{'crsid'}; - } - if ($args->{'crscode'}) { - $cenv{'internal.coursecode'}=$args->{'crscode'}; - } - if ($args->{'ccuname'}) { - $cenv{'internal.courseowner'} = $args->{'ccuname'}; - } else { - $cenv{'internal.courseowner'} = $args->{'curruser'}; - } +sub print_intro_page { + my $r = shift; + my $start_page = + &Apache::loncommon::start_page('Create a New Course or Group Space'); + my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Options','Create_Course',undef,'Create_Courses'); + my $end_page = + &Apache::loncommon::end_page(); + my $helplink=&Apache::loncommon::help_open_topic('Create_Course_GroupSpace',&mt('Help on Creating Courses and Groups')); - my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner. - if ($args->{'crssections'}) { - $cenv{'internal.sectionnums'} = ''; - if ($args->{'crssections'} =~ m/,/) { - @sections = split/,/,$args->{'crssections'}; - } else { - $sections[0] = $args->{'crssections'}; - } - if (@sections > 0) { - foreach my $item (@sections) { - my ($sec,$gp) = split/:/,$item; - my $class = $args->{'crscode'}.$sec; - my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'}); - $cenv{'internal.sectionnums'} .= $item.','; - unless ($addcheck eq 'ok') { - push @badclasses, $class; - } - } - $cenv{'internal.sectionnums'} =~ s/,$//; - } - } -# do not hide course coordinator from staff listing, -# even if privileged - $cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; -# add crosslistings - if ($args->{'crsxlist'}) { - $cenv{'internal.crosslistings'}=''; - if ($args->{'crsxlist'} =~ m/,/) { - @xlists = split/,/,$args->{'crsxlist'}; - } else { - $xlists[0] = $args->{'crsxlist'}; - } - if (@xlists > 0) { - foreach my $item (@xlists) { - my ($xl,$gp) = split/:/,$item; - my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'}); - $cenv{'internal.crosslistings'} .= $item.','; - unless ($addcheck eq 'ok') { - push @badclasses, $xl; - } - } - $cenv{'internal.crosslistings'} =~ s/,$//; + my @choices = ({ internal_name => 'courseone', + name => &mt('Create a single course'), + short_description => + &mt('Create a new course by completing an online form.'), + }, + { internal_name => 'groupone', + name => &mt('Create a single collaborative group space'), + short_description => + &mt('Create a new group space for non-course use by completing an online form.'), + }, + { internal_name => 'batchone', + name => &mt('Create courses/groups by uploading an attributes file'), + short_description => + &mt('Upload an attributes file containing specifications for one or more courses or groups in XML format.'), + help => 'Batch_Creation', + }, + ); + my $options; + foreach my $choice (@choices) { + $options .='

'. + $choice->{'name'}.''; + if (exists($choice->{'help'})) { + $options .= &Apache::loncommon::help_open_topic($choice->{'help'}); } - } - if ($args->{'autoadds'}) { - $cenv{'internal.autoadds'}=$args->{'autoadds'}; - } - if ($args->{'autodrops'}) { - $cenv{'internal.autodrops'}=$args->{'autodrops'}; - } -# check for notification of enrollment changes - my @notified = (); - if ($args->{'notify_owner'}) { - if ($args->{'ccuname'} ne '') { - push(@notified,$args->{'ccuname'}.'@'.$args->{'ccdomain'}); - } - } - if ($args->{'notify_dc'}) { - if ($uname ne '') { - push(@notified,$uname.'@'.$udom); - } - } - if (@notified > 0) { - my $notifylist; - if (@notified > 1) { - $notifylist = join(',',@notified); - } else { - $notifylist = $notified[0]; - } - $cenv{'internal.notifylist'} = $notifylist; - } - if (@badclasses > 0) { - my %lt=&Apache::lonlocal::texthash( - 'tclb' => 'The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course. However, if automated course roster updates are enabled for this class, these particular sections/crosslistings will not contribute towards enrollment, because the user identified as the course owner for this LON-CAPA course', - 'dnhr' => 'does not have rights to access enrollment in these classes', - 'adby' => 'as determined by the policies of your institution on access to official classlists' - ); - $outcome .= ''.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').
    '."\n"; - foreach (@badclasses) { - $outcome .= "
  • $_
    • \n"; - } - $outcome .= "


\n"; - } - if ($args->{'no_end_date'}) { - $args->{'endaccess'} = 0; - } - $cenv{'internal.autostart'}=$args->{'enrollstart'}; - $cenv{'internal.autoend'}=$args->{'enrollend'}; - $cenv{'default_enrollment_start_date'}=$args->{'startaccess'}; - $cenv{'default_enrollment_end_date'}=$args->{'endaccess'}; - if ($args->{'showphotos'}) { - $cenv{'internal.showphotos'}=$args->{'showphotos'}; - } - $cenv{'internal.authtype'} = $args->{'authtype'}; - $cenv{'internal.autharg'} = $args->{'autharg'}; - if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) { - if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'} eq '') { - $outcome .= ''. - &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student').'

'; - } - } - if (($args->{'ccdomain'}) && ($args->{'ccuname'})) { - if ($args->{'setpolicy'}) { - $cenv{'policy.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; - } - if ($args->{'setcontent'}) { - $cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; - } - } - if ($args->{'reshome'}) { - $cenv{'reshome'}=$args->{'reshome'}.'/'; - $cenv{'reshome'}=~s/\/+$/\//; - } -# -# course has keyed access -# - if ($args->{'setkeys'}) { - $cenv{'keyaccess'}='yes'; - } -# if specified, key authority is not course, but user -# only active if keyaccess is yes - if ($args->{'keyauth'}) { - $args->{'keyauth'}=~s/[^\w\@]//g; - if ($args->{'keyauth'}) { - $cenv{'keyauth'}=$args->{'keyauth'}; - } + $options .= "

\n".' '.(' 'x8).$choice->{'short_description'}. + "\n"; } - if ($args->{'disresdis'}) { - $cenv{'pch.roles.denied'}='st'; - } - if ($args->{'disablechat'}) { - $cenv{'plc.roles.denied'}='st'; - } + $r->print(<print($start_page.$crumbs); + $r->print('

'.&mt('Upload a courses or groups attributes file').'

'); + $r->print('
'. + ''. + '

'. + '
'); + $r->print($end_page); + return; +} - $outcome .= ('
'.&mt('Setting environment').': '. - &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'
'); -# -# Open all assignments -# - if ($args->{'openall'}) { - my $storeunder=$$crsudom.'_'.$$crsunum.'.0.opendate'; - my %storecontent = ($storeunder => time, - $storeunder.'.type' => 'date_start'); - - $outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput - ('resourcedata',\%storecontent,$$crsudom,$$crsunum).'
'; - } -# -# Set first page -# - unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank') - || ($cloneid)) { - $outcome .= &mt('Setting first resource').': '; - my ($errtext,$fatal)= - &Apache::londocs::mapread($$crsunum,$$crsudom,'default.sequence'); - $outcome .= ($fatal?$errtext:'read ok').' - '; - my $title; my $url; - if ($args->{'firstres'} eq 'syl') { - $title='Syllabus'; - $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus'; - } else { - $title='Navigate Contents'; - $url='/adm/navmaps'; +sub process_batchfile { + my $r = shift; + my $start_page = + &Apache::loncommon::start_page('Create a New Course or Group Space'); + 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; + close(FILE); + if (-e "$batchdir/processed/$filename") { + unlink("$batchdir/pending/$filename"); + } + } + } } - $Apache::lonratedt::resources[1]=$title.':'.$url.':false:start:res'; - ($errtext,$fatal)= - &Apache::londocs::storemap($$crsunum,$$crsudom,'default.sequence'); - $outcome .= ($fatal?$errtext:'write ok').'
'; } - return $outcome; + $r->print($start_page.$crumbs.$logmsg.$result.'
'. + &mt('Creation options menu').''.$end_page); + } # ===================================================================== Handler @@ -990,18 +906,57 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - if ($env{'form.phase'} eq 'two') { + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['phase']); + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse", + text=>"Creation Options", + faq=>79,bug=>'Dom Coord Interface',}); + if (($env{'form.phase'} eq 'coursetwo') || + ($env{'form.phase'} eq 'grouptwo')) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.prevphase'}", + text=>&mt('[_1] Creation Settings',), + faq=>9,bug=>'Dom Coord Interface',}); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.phase'}", + text=>"Creation Outcome", + faq=>9,bug=>'Dom Coord Interface',}); &create_course($r); - } else { + } elsif (($env{'form.phase'} eq 'courseone') || + ($env{'form.phase'} eq 'groupone')) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.phase'}", + text=>&mt('[_1] Creation Settings',), + faq=>9,bug=>'Dom Coord Interface',}); &print_course_creation_page($r); + } elsif ($env{'form.phase'} eq 'batchone') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.phase'}", + text=>"Upload Description File", + faq=>9,bug=>'Dom Coord Interface',}); + &upload_batchfile($r); + } elsif ($env{'form.phase'} eq 'batchtwo') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.prevphase'}", + text=>"Upload Description File", + faq=>9,bug=>'Dom Coord Interface',}); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.phase'}", + text=>"Creation Outcome", + faq=>9,bug=>'Dom Coord Interface',}); + &process_batchfile($r); + } else { + &print_intro_page($r); } } else { $env{'user.error.msg'}= - "/adm/createcourse:ccc:0:0:Cannot create courses"; + "/adm/createcourse:ccc:0:0:Cannot create courses or groups"; return HTTP_NOT_ACCEPTABLE; } return OK; -} +} 1; __END__