--- loncom/interface/loncreatecourse.pm 2006/07/20 22:10:22 1.93.2.4
+++ 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.93.2.4 2006/07/20 22:10:22 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.119 2009/03/12 16:29:32 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -27,242 +27,61 @@
#
###
-package Apache::loncreatecourse;
-
-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 LONCAPA::batchcreatecourse;
-use lib '/home/httpd/lib/perl';
-use LONCAPA;
+=head1 NAME
-# ================================================ Get course directory listing
+Apache::loncreatecourse.pm
-my @output=();
+=head1 SYNOPSIS
-sub crsdirlist {
- my ($courseid,$which)=@_;
- @output=();
- return &innercrsdirlist($courseid,$which);
-}
+Allows domain coordinators to create new
+courses and assign course coordinators.
-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'},
- &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);
-}
+=over
-# ============================================================ Write a userfile
+=item handler()
-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);
-}
+=item print_course_creation_page()
-# ===================================================================== Rewrite
+=item create_course()
-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'}.'/'
- )));
- }
-}
-
-# =============================================================== Copy a dbfile
-
-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'});
-}
-
-# ========================================================== Copy resourcesdata
-
-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|groupmembership)/) {
- ©db($origcrsid,$newcrsid,$_);
- }
- }
- }
-}
+=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 = 'Course';
-# my $crstype = 'Group';
-# if ($env{'form.phase'} eq 'courseone') {
-# $crstype = 'Course';
-# }
+ 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 = '<select name="course_home" size="1">'."\n";
foreach my $server (sort(keys(%host_servers))) {
$course_home .= qq{<option value="$server"};
@@ -283,13 +102,13 @@ sub print_course_creation_page {
if ($crstype eq 'Course') {
my $starttime = time;
my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
- $enroll_table = &Apache::londropadd::date_setting_table($starttime,
- $endtime,'create_enrolldates');
- $access_table = &Apache::londropadd::date_setting_table($starttime,
- $endtime,'create_defaultdates');
+ $enroll_table = &Apache::lonuserutils::date_setting_table($starttime,
+ $endtime,'create_enrolldates');
+ $access_table = &Apache::lonuserutils::date_setting_table($starttime,
+ $endtime,'create_defaultdates');
($krbdef,$krbdefdom) =
&Apache::loncommon::get_kerberos_defaults($defdom);
- $javascript_validations=&Apache::londropadd::javascript_validations(
+ $javascript_validations=&Apache::lonuserutils::javascript_validations(
'createcourse',$krbdefdom);
my %param = ( formname => 'document.ccrs',
kerb_def_dom => $krbdefdom,
@@ -337,10 +156,14 @@ function validate(formname) {
'stco' => "standard courses only",
'blnk' => "Blank",
'sllb' => "Syllabus",
- 'navi' => "Navigate",
+ 'navi' => "Navigate Contents",
'cid' => "Course ID",
'dmn' => "Domain",
+ 'dsh' => "Date Shift",
'asov' => "Additional settings, if specified below, will override cloned settings",
+ 'ncd' => "Do not clone date parameters",
+ 'prd' => 'Clone date parameters as-is',
+ 'shd' => 'Shift date parameters by number of days',
'assp' => "Assessment Parameters",
'oaas' => "Open all assessments",
'mssg' => "Messaging",
@@ -348,7 +171,7 @@ function validate(formname) {
'scfc' => "Set content feedback to Course Coordinator",
'cmmn' => "Communication",
'dsrd' => "Disable student resource discussion",
- 'dsuc' => "Disable student use of chatrooms",
+ 'dsuc' => "Disable student use of chat rooms",
'acco' => "Access Control",
'snak' => "Students need access key to enter course",
'kaut' =>
@@ -362,8 +185,9 @@ function validate(formname) {
'no' => "No",
'audr' => "Automated drops",
'dacu' => "Duration of automated classlist updates",
+ 'dads' => 'Default Access Dates for Students',
'dacc' => "Default start and end dates for student access",
- 'psam' => "Please select the authentication mechanism",
+ 'psam' => "Please select the Authentication mechanism",
'pcda' => "Please choose the default authentication method to be used by new users added to this LON-CAPA domain by the automated enrollment process",
'nech' => "Notification of enrollment changes",
'nccl' => "Notification to course coordinator via LON-CAPA message when enrollment changes occur during the automated update?",
@@ -371,7 +195,7 @@ function validate(formname) {
'irsp' => "Include retrieval of student photographs?",
'rshm' => 'Resource Space Home',
'cgrs' => "Course Group Settings",
- 'cgrq' => "Set a quota for the total disk space available for storage of course group portfolio files.",
+ 'cgrq' => 'Set a quota for the total disk space available for storage of course group portfolio files',
'opco' => "Open Course",
'ginf' => "Group Information",
'gtit' => "Group Title",
@@ -385,7 +209,7 @@ function validate(formname) {
'sgpf' => "Set group policy feedback to Group Coordinator",
'scfg' => "Set content feedback to Group Coordinator",
'dmrd' => "Disable member resource discussion",
- 'dmuc' => "Disable member use of chatrooms",
+ 'dmuc' => "Disable member use of chat rooms",
'mnak' => "Members need access key to enter group",
'kaug' =>
'Key authority (<tt>id@domain</tt>) if other than group',
@@ -433,210 +257,252 @@ END
'Create_Course',undef,
'Create_Courses');
$r->print($start_page.$crumbs);
+
if ($crstype eq 'Course') {
+ $r->print('<form action="/adm/createcourse" method="post" name="ccrs"><div class="LC_createcourse">'
+ .&Apache::lonhtmlcommon::start_pick_box()
+
+ .&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'cinf'}.'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'ctit'})
+ .'<input type="text" size="50" name="title" />'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'chsr'})
+ .$course_home
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'cidn'}.' ('.$lt{'opt'}.')')
+ .'<input type="text" size="30" name="crsid" />'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'iinf'}.'</h3>'
+ .$lt{'stat'}
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'ccod'})
+ .'<input type="text" size="30" name="crscode" />'
+ .'<br />('.$lt{'toin'}.')'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'snid'})
+ .'<input type="text" size="30" name="crssections" />'
+ .'<br />('.$lt{'csli'}.')'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'crcs'})
+ .'<input type="text" size="30" name="crsxlist" />'
+ .'<br />('.$lt{'cscs'}.')'
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+
+ # Table: New Course / Clone Course
+ $r->print(&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'crco'}.'</h3>'
+ .&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.$lt{'cncr'}.'</th>'
+ .'<th> '.&mt('or').' </th>'
+ .'<th>'.$lt{'cecr'}.'</th>'
+ .&Apache::loncommon::end_data_table_header_row()
+ .&Apache::loncommon::start_data_table_row()
+
+ # New Course:
+ .'<td>'
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title($lt{'map'})
+ .'<input type="text" size="50" name="topmap" />'
+ .'<a href="javascript:openbrowser(\'ccrs\',\'topmap\')">'.$lt{'smap'}.'</a>'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title('<label for="nonstd">'.$lt{'sacr'}.'</label>')
+ .'<input id="nonstd" type="checkbox" name="nonstandard" />'
+ .'<br />('.$lt{'ocik'}.')'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title($lt{'fres'})
+ .'<label>'
+ .'<input type="radio" name="firstres" value="blank" />'.$lt{'blnk'}
+ .'</label>'
+ .' '
+ .'<label>'
+ .'<input type="radio" name="firstres" value="syl" checked="checked" />'.$lt{'sllb'}
+ .'</label>'
+ .' '
+ .'<label>'
+ .'<input type="radio" name="firstres" value="nav" />'.$lt{'navi'}
+ .'</label>'
+ .'<br />('.$lt{'stco'}.')'
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+
+ .'<td> </td>'
+
+ # Clone Course:
+ .'<td>'
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title($lt{'cid'})
+ .'<label>'
+ .'<input type="text" size="25" name="clonecourse" value="" />'
+ .'</label>'
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::row_title($lt{'dmn'})
+ .'<label>'
+ .$cloneform
+ .'</label>'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title($lt{'dsh'})
+ .'<label>'
+ .'<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}
+ .'</label><br />'
+ .'<label>'
+ .'<input type="radio" name="datemode" value="preserve" /> '.$lt{'prd'}
+ .'</label><br />'
+ .'<label>'
+ .'<input type="radio" name="datemode" value="shift" checked="checked" /> '.$lt{'shd'}
+ .'</label>'
+ .' <input type="text" size="5" name="dateshift" value="365" />'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_headline()
+ .$lt{'asov'}
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .'</td>'
+ .&Apache::loncommon::end_data_table_row()
+ .&Apache::loncommon::end_data_table()
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+
+ $r->print(&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'dads'}.'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title($lt{'dacc'})
+ .$access_table
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+
+ $r->print(&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'assp'}.'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'oaas'})
+ .'<input type="checkbox" name="openall" />'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'mssg'}.'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'scpf'})
+ .'<input type="checkbox" name="setpolicy" checked="checked" />'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'scfc'})
+ .'<input type="checkbox" name="setcontent" checked="checked" />'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'cmmn'}.'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'dsrd'})
+ .'<input type="checkbox" name="disresdis" />'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'dsuc'})
+ .'<input type="checkbox" name="disablechat" /'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'acco'}.'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'snak'})
+ .'<input type="checkbox" name="setkeys" />'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'kaut'})
+ .'<input type="text" size="30" name="keyauth" />'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'rshm'}.'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'rshm'})
+ .'<input type="text" name="reshome" size="30" value="/res/'.$defdom.'/" />'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'aens'}.'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'aadd'})
+ .'<label><input type="radio" name="autoadds" value="1" />'.$lt{'yes'}.'</label>'
+ .'<label><input type="radio" name="autoadds" value="0" checked="checked" />'.$lt{'no'}.'</label>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'audr'})
+ .'<label><input type="radio" name="autodrops" value="1" />'.$lt{'yes'}.'</label>'
+ .'<label><input type="radio" name="autodrops" value="0" checked="checked" />'.$lt{'no'}.'</label>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'dacu'})
+ .$enroll_table
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'psam'})
+ .$lt{'pcda'}.'<br />'
+ .$krbform.'<br />'
+ .$intform.'<br />'
+ .$locform
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'nech'})
+ .$lt{'nccl'}.'<br/>'
+ .'<label><input type="radio" name="notify_owner" value="1" />'.$lt{'yes'}.'</label>'
+ .'<label><input type="radio" name="notify_owner" value="0" checked="checked" />'.$lt{'no'}.'</label>'
+ .'<br />'
+ .$lt{'ndcl'}.'<br/>'
+ .'<label><input type="radio" name="notify_dc" value="1" />'.$lt{'yes'}.'</label>'
+ .'<label><input type="radio" name="notify_dc" value="0" checked="checked" />'.$lt{'no'}.'</label>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'irsp'})
+ .'<label>'
+ .'<input type="radio" name="showphotos" value="1" />'.$lt{'yes'}
+ .'</label> '
+ .'<label>'
+ .'<input type="radio" name="showphotos" value="0" checked="checked" />'.$lt{'no'}
+ .'</label> '
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'cgrs'}.'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'cgrq'})
+ .'<input type="text" name="crsquota" value="20" size="6" />Mb'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_headline()
+ .'<h3>'.$lt{'cc'}.'</h3>'
+ .&Apache::lonhtmlcommon::row_closure()
+
+ .&Apache::lonhtmlcommon::row_title($lt{'user'})
+ .'<input type="text" size="15" name="ccuname" />'
+ .&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);
-<form action="/adm/createcourse" method="post" name="ccrs">
-<h2>$lt{'cinf'}</h2>
-<p>
-<label><b>$lt{'ctit'}:</b>
-<input type="text" size="50" name="title" /></label>
-</p><p>
-<label>
- <b>$lt{'chsr'}:</b>$course_home
-</label>
-</p><p>
-<label>
- <b>$lt{'cidn'} ($lt{'opt'})</b>
- <input type="text" size="30" name="crsid" />
-</label>
-</p><p>
-<h2>$lt{'iinf'}</h2>
-<p>
-$lt{'stat'}
-</p><p>
-<label>
- <b>$lt{'ccod'}</b>
- <input type="text" size="30" name="crscode" />
-</label>
-<br/>
-($lt{'toin'})
-</p><p>
-<label>
- <b>$lt{'snid'}</b>
- <input type="text" size="30" name="crssections" />
-</label>
-<br/>
-($lt{'csli'})
-</p><p>
-<label>
- <b>$lt{'crcs'}</b>
- <input type="text" size="30" name="crsxlist" />
-</label>
-<br/>
-($lt{'cscs'})
-</p>
-<h2>$lt{'crco'}</h2>
-<table border="2">
-<tr><th>$lt{'cncr'}</th><th>$lt{'cecr'}</th></tr>
-<tr><td>
-<p>
-<label>
- <b>$lt{'map'}:</b>
- <input type="text" size="50" name="topmap" />
-</label>
-<a href="javascript:openbrowser('ccrs','topmap')">$lt{'smap'}</a>
-</p><p>
-<label for="nonstd"><b>$lt{'sacr'}</b></label>
-<br />
-($lt{'ocik'}):
-<input id="nonstd" type="checkbox" name="nonstandard" />
-</p><p>
-<b>$lt{'fres'}</b><br />($lt{'stco'}):
-<label>
- <input type="radio" name="firstres" value="blank" />$lt{'blnk'}
-</label>
-
-<label>
- <input type="radio" name="firstres" value="syl" checked />$lt{'sllb'}
-</label>
-
-<label>
- <input type="radio" name="firstres" value="nav" />$lt{'navi'}
-</label>
-</p>
-</td><td>
-<label>
- $lt{'cid'}: <input type="text" size="25" name="clonecourse" value="" />
-</label>
-<br />
-<label>
- $lt{'dmn'}: $cloneform
-</label>
-<br />
- <br />
-$lt{'asov'}.
-</td></tr>
-</table>
-<h2>$lt{'assp'}</h2>
-<p>
-<label>
- <b>$lt{'oaas'}: </b>
- <input type="checkbox" name="openall" />
-</label>
-</p>
-<h2>$lt{'mssg'}</h2>
-<p>
-<label>
- <b>$lt{'scpf'}: </b>
- <input type="checkbox" name="setpolicy" checked />
-</label>
-<br />
-<label>
- <b>$lt{'scfc'}: </b>
- <input type="checkbox" name="setcontent" checked />
-</label>
-</p>
-<h2>$lt{'cmmn'}</h2>
-<p>
-<label>
- <b>$lt{'dsrd'}: </b>
- <input type="checkbox" name="disresdis" />
-</label>
-<br />
-<label>
- <b>$lt{'dsuc'}: </b>
- <input type="checkbox" name="disablechat" />
-</label>
-</p>
-<h2>$lt{'acco'}</h2>
-<p>
-<label>
- <b>$lt{'snak'}: </b>
- <input type="checkbox" name="setkeys" />
-</label>
-<br />
-<label>
- <b>$lt{'kaut'}: </b>
- <input type="text" size="30" name="keyauth" />
-</label>
-</p>
-<h2>$lt{'rshm'}</h2>
-<p>
-<label>
- <b>$lt{'rshm'}: </b>
- <input type="text" name="reshome" size="30" value="/res/$defdom/" />
-</label>
-</p>
-<p>
-<h2>$lt{'aens'}</h2>
-$lt{'aesc'}
-</p>
-<p>
-<b>$lt{'aadd'}</b>
-<label><input type="radio" name="autoadds" value="1" />$lt{'yes'}</label>
-<label><input type="radio" name="autoadds" value="0" checked="true" />$lt{'no'}
-</label>
-</p><p>
-<b>$lt{'audr'}</b>
-<label><input type="radio" name="autodrops" value="1" />$lt{'yes'}</label>
-<label><input type="radio" name="autodrops" value="0" checked="true" />$lt{'no'}</label>
-</p><p>
-<b>$lt{'dacu'}</b>
-$enroll_table
-</p><p>
-<b>$lt{'dacc'}</b>
-$access_table
-<p></p>
-<b>$lt{'psam'}.</b><br />
-$lt{'pcda'}.
-</p><p>
-$krbform
-<br />
-$intform
-<br />
-$locform
-</p><p>
-<b>$lt{'nech'}</b><br />
-$lt{'nccl'}<br/>
-<label>
- <input type="radio" name="notify_owner" value="1" />$lt{'yes'}
-</label>
-<label>
- <input type="radio" name="notify_owner" value="0" checked="true" />$lt{'no'}
-</label>
-<br />
-$lt{'ndcl'}<br/>
-<label>
- <input type="radio" name="notify_dc" value="1" />$lt{'yes'}
-</label>
-<label>
- <input type="radio" name="notify_dc" value="0" checked="true" />$lt{'no'}
-</label>
-</p><p>
-<b>$lt{'irsp'}</b>
-<label>
- <input type="radio" name="showphotos" value="1" />$lt{'yes'}
-</label>
-<label>
- <input type="radio" name="showphotos" value="0" checked="true" />$lt{'no'}
-</label>
-</p>
-<p>
-<h2>$lt{'cgrs'}</h2>
-$lt{'cgrq'}
-<input type="text" name="crsquota" value="20" size="6" />Mb
-</p>
-<hr />
-<h2>$lt{'cc'}</h2>
-<p>
-<label>
- <b>$lt{'user'}:</b> <input type="text" size="15" name="ccuname" />
-</label>
-</p><p>
-<label>
- <b>$lt{'dmn'}:</b> $domform
-</label>
-</p>
+</div>
<p>
<input type="hidden" name="prevphase" value="courseone" />
<input type="hidden" name="phase" value="coursetwo" />
@@ -644,6 +510,7 @@ $lt{'cgrq'}
</p>
</form>
ENDDOCUMENT
+
} elsif ($crstype eq 'Group') {
$r->print(<<ENDDOCUMENT);
<form action="/adm/createcourse" method="post" name="ccrs">
@@ -683,7 +550,7 @@ ENDDOCUMENT
</label>
<label>
- <input type="radio" name="firstres" value="syl" checked />$lt{'sllb'}
+ <input type="radio" name="firstres" value="syl" checked="checked" />$lt{'sllb'}
</label>
<label>
@@ -699,7 +566,10 @@ ENDDOCUMENT
$lt{'dmn'}: $cloneform
</label>
<br />
- <br />
+ <label><input type="radio" name="datemode" value="delete" /> $lt{'ncd'}</label><br />
+ <label><input type="radio" name="datemode" value="preserve" /> $lt{'prd'}</label><br />
+ <label><input type="radio" name="datemode" value="shift" checked="checked" /> $lt{'shd'}</label>
+ <input type="text" size="5" name="dateshift" value="365" /><br /> <br />
$lt{'asov'}.
</td></tr>
</table>
@@ -709,12 +579,12 @@ $lt{'asov'}.
<p>
<label>
<b>$lt{'sgpf'}: </b>
- <input type="checkbox" name="setpolicy" checked />
+ <input type="checkbox" name="setpolicy" checked="checked" />
</label>
<br />
<label>
<b>$lt{'scfg'}: </b>
- <input type="checkbox" name="setcontent" checked />
+ <input type="checkbox" name="setcontent" checked="checked" />
</label>
</p>
<h2>$lt{'cmmn'}</h2>
@@ -779,10 +649,8 @@ ENDDOCUMENT
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 $ccuname =&LONCAPA::clean_username($env{'form.ccuname'});
+ my $ccdomain=&LONCAPA::clean_domain($env{'form.ccdomain'});
my $crstype = 'Group';
my ($enrollstart,$enrollend,$startaccess,$endaccess);
@@ -790,7 +658,6 @@ sub create_course {
$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');
@@ -832,6 +699,8 @@ sub create_course {
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'}.':'.$env{'user.domain'},
crssections => $env{'form.crssections'},
@@ -865,330 +734,62 @@ sub create_course {
# Check the veracity of the course coordinator
if (&Apache::lonnet::homeserver($ccuname,$ccdomain) eq 'no_host') {
$r->print('<form action="/adm/createuser" method="post" name="crtuser">');
- $r->print(&mt('No such user').' '.$ccuname.' '.&mt('at').' '.$ccdomain.'.<br />');
- $r->print(&mt("Please click Back on your browser and select another user, or "));
- $r->print('
- <input type="hidden" name="phase" value="get_user_info" />
- <input type="hidden" name="ccuname" value="'.$ccuname.'" />
- <input type="hidden" name="ccdomain" value="'.$ccdomain.'" />
- <input name="userrole" type="submit" value="'.
- &mt('Create User').'" />
- </form>'.&Apache::loncommon::end_page());
+ $r->print('<div class="LC_warning">'
+ .&mt('No such user [_1] at domain [_2].','<tt>'.$ccuname.'</tt>','<tt>'.$ccdomain.'</tt>')
+ .'</div>');
+ $r->print(&mt('Please click Back on your browser and select another user, or [_1]Create User[_2]'
+ , '<input type="hidden" name="phase" value="get_user_info" />'
+ .'<input type="hidden" name="ccuname" value="'.$ccuname.'" />'
+ .'<input type="hidden" name="ccdomain" value="'.$ccdomain.'" />'
+ .'<input name="userrole" type="submit" value="'
+ , '" />'
+ )
+ .'</form>'.&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 or group coordinator
-#
- if (($ccdomain) && ($ccuname)) {
- $r->print(&mt('Assigning role of [_1] Coordinator to [_2] at [_3]:',
- $crstype,$ccuname,$ccdomain).
- &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,
- 'cc').'<p>');
- }
- if ($env{'form.setkeys'}) {
- $r->print(
- '<p><a href="/adm/managekeys?cid='.$crsudom.'_'.$crsunum.'">'.&mt('Manage Access Keys').'</a></p>');
- }
-# Flush the course logs so reverse user roles immediately updated
- &Apache::lonnet::flushcourselogs();
- $r->print('<p>'.&mt('Roles will be active at next login').'.</p>'.
- '<p><a href="/adm/createcourse">'.
- &mt('Create Another [_1]',$crstype).'</a></p>'.
- &Apache::loncommon::end_page());
-}
-
-sub construct_course {
- my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_;
- my $outcome;
-
-#
-# Open course
-#
- my $crstype = lc($args->{'crstype'});
- my %cenv=();
- $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'},
- $args->{'cdescr'},
- $args->{'curl'},
- $args->{'course_home'},
- $args->{'nonstandard'},
- $args->{'crscode'},
- $args->{'ccuname'}.':'.
- $args->{'ccdomain'},
- $args->{'crstype'});
-
- # 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 .= &mt('New LON-CAPA [_1] ID: [_2]<br />',$crstype,$$courseid);
-#
-# Check if created correctly
-#
- ($$crsudom,$$crsunum)=($$courseid=~/^\/(\w+)\/(\w+)$/);
- my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
- $outcome .= &mt('Created on').': '.$crsuhome.'<br>';
-#
-# 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 .=
- '<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>';
- } else {
- $outcome .=
- '<br /><font color="green">'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).'</font>';
- 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'});
+ 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]:',
+ ,'<i>'.$ccuname.':'.$ccdomain.'</i>')
+ .&Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,
+ 'cc','','','','','createcourse').'<p>');
}
- }
-#
-# Set environment (will override cloned, if existing)
-#
- my @sections = ();
- my @xlists = ();
- if ($args->{'crstype'}) {
- $cenv{'type'}=$args->{'crstype'};
- }
- if ($args->{'crsid'}) {
- $cenv{'courseid'}=$args->{'crsid'};
- }
- if ($args->{'crscode'}) {
- $cenv{'internal.coursecode'}=$args->{'crscode'};
- }
- if ($args->{'crsquota'} ne '') {
- $cenv{'internal.coursequota'}=$args->{'crsquota'};
- } else {
- $cenv{'internal.coursequota'}=$args->{'crsquota'} = 20;
- }
- if ($args->{'ccuname'}) {
- $cenv{'internal.courseowner'} = $args->{'ccuname'}.
- ':'.$args->{'ccdomain'};
- } else {
- $cenv{'internal.courseowner'} = $args->{'curruser'};
- }
-
- 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/,$//;
- }
- }
- 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 .= '<font color="red">'.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').<br /><ul>'."\n";
- foreach (@badclasses) {
- $outcome .= "<li>$_</li>\n";
- }
- $outcome .= "</ul><br /><br /></font>\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 .= '<font color="red" size="+1">'.
- &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').'</font></p>';
- }
- }
- 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'};
+ if ($env{'form.setkeys'}) {
+ $r->print(
+ '<p><a href="/adm/managekeys?cid='.$crsudom.'_'.$crsunum.'">'.&mt('Manage Access Keys').'</a></p>');
}
+ # Flush the course logs so reverse user roles immediately updated
+ &Apache::lonnet::flushcourselogs();
+ $r->print('<p>'.&mt('Roles will be active at next login').'.</p>');
}
-
- if ($args->{'disresdis'}) {
- $cenv{'pch.roles.denied'}='st';
- }
- if ($args->{'disablechat'}) {
- $cenv{'plc.roles.denied'}='st';
- }
-
- # Record we've not yet viewed the Course Initialization Helper for this
- # course
- $cenv{'course.helper.not.run'} = 1;
- #
- # Use new Randomseed
- #
- $cenv{'rndseed'}=&Apache::lonnet::latest_rnd_algorithm_id();;
- $cenv{'receiptalg'}=&Apache::lonnet::latest_receipt_algorithm_id();;
- #
- # The encryption code and receipt prefix for this course
- #
- $cenv{'internal.encseed'}=$Apache::lonnet::perlvar{'lonReceipt'}.$$.time.int(rand(9999));
- $cenv{'internal.encpref'}=100+int(9*rand(99));
- #
- # By default, use standard grading
- if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; }
-
- $outcome .= ('<br />'.&mt('Setting environment').': '.
- &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'<br>');
-#
-# 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).'<br>';
- }
-#
-# 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';
- }
- $Apache::lonratedt::resources[1]=$title.':'.$url.':false:start:res';
- ($errtext,$fatal)=
- &Apache::londocs::storemap($$crsunum,$$crsudom,'default.sequence');
- $outcome .= ($fatal?$errtext:'write ok').'<br>';
- }
- return $outcome;
+ $r->print('<p><a href="/adm/createcourse?phase='.lc($crstype).'one">'.
+ &mt("Create Another $crstype").'</a></p>'.
+ &Apache::loncommon::end_page());
}
sub print_intro_page {
my $r = shift;
my $start_page =
- &Apache::loncommon::start_page('Create a New Course');
+ &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();
@@ -1199,23 +800,27 @@ sub print_intro_page {
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 => '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'),
+ &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 .=' <h3><a href="/adm/createcourse?phase='.
$choice->{'internal_name'}.'" >'.
- $choice->{'name'}."</a></h3>\n";
- $options .= ' '.(' 'x8).$choice->{'short_description'}.
+ $choice->{'name'}.'</a>';
+ if (exists($choice->{'help'})) {
+ $options .= &Apache::loncommon::help_open_topic($choice->{'help'});
+ }
+ $options .= "</h3>\n".' '.(' 'x8).$choice->{'short_description'}.
"\n";
}
@@ -1231,11 +836,11 @@ sub upload_batchfile {
my $r = shift;
my $start_page =
&Apache::loncommon::start_page('Create a New Course or Group Space');
- my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Upload Course Attributes File','Create_Course',undef,'Create_Courses');
+ my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Upload Course/Group Attributes File','Create_Course',undef,'Create_Courses');
my $end_page =
&Apache::loncommon::end_page();
$r->print($start_page.$crumbs);
- $r->print('<h3>'.&mt('Upload a courses attributes file').'</h3>');
+ $r->print('<h3>'.&mt('Upload a courses or groups attributes file').'</h3>');
$r->print('<form name="batchcreate" method="post" '.
'enctype="multipart/form-data" action="/adm/createcourse">'.
'<input type="file" name="coursecreatorxml" />'.
@@ -1282,7 +887,8 @@ sub process_batchfile {
}
}
}
- $r->print($start_page.$crumbs.$result.$end_page);
+ $r->print($start_page.$crumbs.$logmsg.$result.'<br /><a href="/adm/createcourse">'.
+ &mt('Creation options menu').'</a>'.$end_page);
}