--- loncom/interface/loncreatecourse.pm 2004/08/17 21:26:06 1.65 +++ loncom/interface/loncreatecourse.pm 2004/12/03 22:29:17 1.72 @@ -1,7 +1,7 @@ # The LearningOnline Network # Create a course # -# $Id: loncreatecourse.pm,v 1.65 2004/08/17 21:26:06 raeburn Exp $ +# $Id: loncreatecourse.pm,v 1.72 2004/12/03 22:29:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,7 +38,6 @@ use Apache::londocs; use Apache::lonlocal; use Apache::londropadd; use lib '/home/httpd/lib/perl'; -use localenroll; # ================================================ Get course directory listing @@ -123,7 +122,9 @@ sub copyfile { &readfile($origcrsid,$which), ( '/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/' - => '/uploaded/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/' + => '/uploaded/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/', + '/public/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/' + => '/public/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/' ))); } } @@ -137,6 +138,9 @@ sub copydb { 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'}); } @@ -202,7 +206,9 @@ sub copyresourcedb { sub copyuserfiles { my ($origcrsid,$newcrsid)=@_; foreach (&crsdirlist($origcrsid,'userfiles')) { - ©file($origcrsid,$newcrsid,$_); + if ($_ !~m|^scantron_|) { + ©file($origcrsid,$newcrsid,$_); + } } } # ========================================================== Copy all userfiles @@ -250,7 +256,7 @@ sub print_course_creation_page { ($ENV{'request.role.domain'},'clonedomain'). &Apache::loncommon::selectcourse_link ('ccrs','clonecourse','clonedomain'); - my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript(); + 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'); @@ -356,28 +362,41 @@ $helplink

$lt{'cinf'}

-$lt{'ctit'}: - +

-$lt{'chsr'}:$course_home -

-$lt{'cidn'} ($lt{'opt'}) - + +

+

$lt{'iinf'}

$lt{'stat'}

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

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

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

$lt{'crco'}

@@ -385,61 +404,92 @@ $lt{'stat'} $lt{'cncr'}$lt{'cecr'}

-$lt{'map'}: - + $lt{'smap'}

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

-

+ +

$lt{'fres'}
($lt{'stco'}): -$lt{'blnk'} +   -$lt{'sllb'} +   -$lt{'navi'} +

-$lt{'cid'}: +
-$lt{'dmn'}: -$cloneform
 
+ +
+ 
$lt{'asov'}.

$lt{'assp'}

-$lt{'oaas'}: - +

$lt{'mssg'}

-$lt{'scpf'}: - +
-$lt{'scfc'}: - +

$lt{'cmmn'}

-$lt{'dsrd'}: -
-$lt{'dsuc'}: - + +
+

$lt{'acco'}

-$lt{'snak'}: -
-$lt{'kaut'}: - + +
+

$lt{'rshm'}

-$lt{'rshm'}: - +

$lt{'aens'}

@@ -447,10 +497,13 @@ $lt{'aesc'}

$lt{'aadd'} -$lt{'yes'} $lt{'no'} + +

$lt{'audr'} -$lt{'yes'} $lt{'no'} + +

$lt{'dacu'} $enroll_table @@ -469,24 +522,40 @@ $locform

$lt{'nech'}
$lt{'nccl'}
-$lt{'yes'} $lt{'no'} -

-$lt{'irsp'} $lt{'yes'} $lt{'no'} + + +

+$lt{'irsp'} + +

$lt{'cc'}

-$lt{'user'}: -

-$lt{'dmn'}: $domform -

-$lt{'ierc'}: - + +

+ +

+

- +

@@ -547,7 +616,8 @@ ENDENHEAD $cdescr,$curl, $ENV{'form.course_home'}, $ENV{'form.nonstandard'}, - $ENV{'form.crscode'}); + $ENV{'form.crscode'}, + $ENV{'form.ccuname'}); # Note: The testing routines depend on this being output; see # Utils::Course. This needs to at least be output as a comment @@ -581,6 +651,10 @@ ENDENHEAD $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'}); @@ -756,7 +830,7 @@ ENDENHEAD $cenv{'internal.encpref'}=100+int(9*rand(99)); # # By default, use standard grading - $cenv{'grading'} = 'standard'; + if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; } $r->print('
'.&mt('Setting environment').': '. &Apache::lonnet::put('environment',\%cenv,$crsudom,$crsunum).'
');