--- loncom/interface/loncreatecourse.pm 2006/05/15 19:11:40 1.88
+++ loncom/interface/loncreatecourse.pm 2006/11/02 21:06:06 1.98
@@ -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.98 2006/11/02 21:06:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,230 +33,21 @@ 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';
-
-# ================================================ Get course directory listing
-
-my @output=();
-
-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;
-}
-
-# ============================================================= Read a userfile
-
-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'}.'/'
- )));
- }
-}
-
-# =============================================================== 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'});
-}
-
-# ========================================================== Copy all userfiles
-
-sub copyuserfiles {
- my ($origcrsid,$newcrsid)=@_;
- foreach (&crsdirlist($origcrsid,'userfiles')) {
- if ($_ !~m|^scantron_|) {
- ©file($origcrsid,$newcrsid,$_);
- }
- }
-}
-# ========================================================== Copy all userfiles
-
-sub copydbfiles {
- my ($origcrsid,$newcrsid)=@_;
-
- 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);
- }
- }
- }
-}
-
-# ======================================================= Copy all course files
-
-sub copycoursefiles {
- my ($origcrsid,$newcrsid)=@_;
- ©userfiles($origcrsid,$newcrsid);
- ©dbfiles($origcrsid,$newcrsid);
- ©resourcedb($origcrsid,$newcrsid);
-}
+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 $course_home = '\n";
my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
- my $helplink=&Apache::loncommon::help_open_topic('Create_Course',&mt('Help on Creating Courses'));
my $cloneform=&Apache::loncommon::select_dom_form
($env{'request.role.domain'},'clonedomain').
&Apache::loncommon::selectcourse_link
- ('ccrs','clonecourse','clonedomain');
+ ('ccrs','clonecourse','clonedomain',undef,undef,undef,$crstype);
my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'});
- my $starttime = time;
- my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
- my $enroll_table = &Apache::londropadd::date_setting_table($starttime,$endtime,'create_enrolldates');
- my $access_table = &Apache::londropadd::date_setting_table($starttime,$endtime,'create_defaultdates');
- my ($krbdef,$krbdefdom) =
- &Apache::loncommon::get_kerberos_defaults($defdom);
- my $javascript_validations=&Apache::londropadd::javascript_validations('createcourse',$krbdefdom);
- my %param = ( formname => 'document.ccrs',
- kerb_def_dom => $krbdefdom,
- kerb_def_auth => $krbdef
- );
- my $krbform = &Apache::loncommon::authform_kerberos(%param);
- my $intform = &Apache::loncommon::authform_internal(%param);
- my $locform = &Apache::loncommon::authform_local(%param);
+ my ($enroll_table,$access_table,$krbdef,$krbdefdom,$krbform,$intform,$locform,
+ $javascript_validations);
+ 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');
+ ($krbdef,$krbdefdom) =
+ &Apache::loncommon::get_kerberos_defaults($defdom);
+ $javascript_validations=&Apache::londropadd::javascript_validations(
+ 'createcourse',$krbdefdom);
+ my %param = ( formname => 'document.ccrs',
+ kerb_def_dom => $krbdefdom,
+ kerb_def_auth => $krbdef
+ );
+ $krbform = &Apache::loncommon::authform_kerberos(%param);
+ $intform = &Apache::loncommon::authform_internal(%param);
+ $locform = &Apache::loncommon::authform_local(%param);
+ } else {
+ $javascript_validations = qq|
+function validate(formname) {
+ if (formname.title == '') {
+ alert("A group title is required");
+ return;
+ }
+ if (formname.ccuname == '') {
+ alert("The username of the group coordinator is required");
+ }
+ formname.submit();
+}
+ |;
+ }
my %lt=&Apache::lonlocal::texthash(
'cinf' => "Course Information",
'ctit' => "Course Title",
@@ -299,10 +109,10 @@ sub print_course_creation_page {
'stat' => "The following entries will be used to identify the course according to the naming scheme adopted by your institution. Your choices will be used to map an internal LON-CAPA course ID to the corresponding course section ID(s) used by the office responsible for providing official class lists for courses at your institution. This mapping is required if you choose to employ automatic population of class lists.",
'ccod' => "Course Code",
'toin' => "to interface with institutional data, e.g., fs03glg231 for Fall 2003 Geology 231",
- 'snid' => "Section Numbers and corresponding LON-CAPA section/group IDs",
- 'csli' => "a comma separated list of institutional section numbers, each separated by a colon from the (optional) corresponding section/group ID to be used in LON-CAPA e.g., 001:1,002:2",
+ 'snid' => "Section Numbers and corresponding LON-CAPA section IDs",
+ 'csli' => "a comma separated list of institutional section numbers, each separated by a colon from the (optional) corresponding section ID to be used in LON-CAPA e.g., 001:1,002:2",
'crcs' => "Crosslisted courses",
- 'cscs' => "a comma separated list of course sections crosslisted with the current course, with each entry including the institutional course section name followed by a colon and then the (optional) groupID to be used in LON-CAPA, e.g., fs03ent231001:ent1,fs03bot231001:bot1,fs03zol231002:zol2",
+ 'cscs' => "a comma separated list of course sections crosslisted with the current course, with each entry including the institutional course section name followed by a colon and then the (optional) sectionID to be used in LON-CAPA, e.g., fs03ent231001:ent1,fs03bot231001:bot1,fs03zol231002:zol2",
'crco' => "Course Content",
'cncr' => "Completely new course",
'cecr' => "Clone an existing course",
@@ -332,7 +142,6 @@ sub print_course_creation_page {
'Key authority (id@domain) if other than course',
'cc' => "Course Coordinator",
'user' => "Username",
- 'ierc' => "Immediately expire own role as Course Coordinator",
'aens' => "Automated enrollment settings",
'aesc' => "The following settings control automatic enrollment of students in this class based on information available for this specific course from your institution's official classlists.",
'aadd' => "Automated adds",
@@ -348,7 +157,31 @@ sub print_course_creation_page {
'ndcl' => "Notification to domain coordinator via LON-CAPA message when enrollment changes occur during the automated update?",
'irsp' => "Include retrieval of student photographs?",
'rshm' => 'Resource Space Home',
- 'opco' => "Open Course"
+ 'cgrs' => "Course Group Settings",
+ '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",
+ 'ghsr' => "Group Home Server",
+ 'gidn' => "Group ID/Number",
+ 'grco' => "Group Content",
+ 'cngr' => "Completely new group",
+ 'cegr' => "Clone an existing group",
+ 'sagr' => "Do NOT generate as standard group",
+ 'stgo' => "standard groups only",
+ '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",
+ 'mnak' => "Members need access key to enter group",
+ 'kaug' =>
+ 'Key authority (id@domain) if other than group',
+ 'gc' => "Group Coordinator",
+ 'gid' => "Group ID",
+ 'crgr' => "Create Group",
+ 'grts' => "Group Teams Settings",
+ 'grtq' => "Set a quota for the total disk space available for storage of group team portfolio files.",
+
);
my $js = <
@@ -568,6 +408,11 @@ $lt{'ndcl'}
+$lt{'cinf'}
$lt{'no'}
$lt{'cgrs'}
+$lt{'cgrq'}
+Mb
+
@@ -580,12 +425,141 @@ $lt{'ndcl'}
- + +
-$end_page ENDDOCUMENT + } elsif ($crstype eq 'Group') { + $r->print(<+ +
+ +
+ +
+$lt{'cngr'} | $lt{'cegr'} |
---|---|
+ + +$lt{'smap'} +
+
+
+$lt{'fres'} |
+
+ + + + +$lt{'asov'}. + |
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
++
+ +
+ +
++ + + +
+ +ENDDOCUMENT + } + $r->print($end_page); } # ====================================================== Phase two: make course @@ -596,11 +570,17 @@ sub create_course { my $ccdomain=$env{'form.ccdomain'}; $ccuname=~s/\W//g; $ccdomain=~s/\W//g; + my $crstype = 'Group'; + my ($enrollstart,$enrollend,$startaccess,$endaccess); - 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'); + 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 +600,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 +616,11 @@ 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'}, 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'}, @@ -689,16 +672,17 @@ sub create_course { return; } my ($courseid,$crsudom,$crsunum); - $r->print(&construct_course($args,\$logmsg,\$courseid,\$crsudom,\$crsunum,$env{'user.domain'},$env{'user.name'})); + $r->print(&Apache::loncommon::construct_course($args,\$logmsg,\$courseid,\$crsudom,\$crsunum,$env{'user.domain'},$env{'user.name'})); # -# Make the requested user a course coordinator +# Make the requested user a course coordinator or group coordinator # - if (($ccdomain) && ($ccuname)) { - $r->print(&mt('Assigning role of course coordinator to').' '. - $ccuname.' at '.$ccdomain.': '. - &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,'cc').''); - } + 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').'
'); + } if ($env{'form.setkeys'}) { $r->print( '
'); @@ -707,273 +691,113 @@ sub create_course { &Apache::lonnet::flushcourselogs(); $r->print(''.&mt('Roles will be active at next login').'.
'. ''. - &mt('Create Another Course').'
'. + &mt('Create Another [_1]',$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.'