[LON-CAPA-cvs] cvs: loncom /automation batchcreatecourse.pm /interface loncreatecourse.pm
raeburn
lon-capa-cvs@mail.lon-capa.org
Tue, 27 Jun 2006 21:28:21 -0000
raeburn Tue Jun 27 17:28:21 2006 EDT
Modified files:
/loncom/interface loncreatecourse.pm
/loncom/automation batchcreatecourse.pm
Log:
XML used to describe courses can now include course type (Course or Group), and course disk quota (disk quota for all portfolio files in course groups).
Index: loncom/interface/loncreatecourse.pm
diff -u loncom/interface/loncreatecourse.pm:1.92 loncom/interface/loncreatecourse.pm:1.93
--- loncom/interface/loncreatecourse.pm:1.92 Thu Jun 22 07:25:56 2006
+++ loncom/interface/loncreatecourse.pm Tue Jun 27 17:28:13 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.92 2006/06/22 11:25:56 www Exp $
+# $Id: loncreatecourse.pm,v 1.93 2006/06/27 21:28:13 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -369,6 +369,8 @@
'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',
+ '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",
@@ -389,8 +391,10 @@
'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 = <<END;
<script type="text/javascript">
var editbrowser = null;
@@ -616,6 +620,11 @@
<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>
@@ -738,6 +747,11 @@
<input type="text" name="reshome" size="30" value="/res/$defdom/" />
</label>
</p>
+<p>
+<h2>$lt{'grts'}</h2>
+$lt{'grtq'}
+<input type="text" name="crsquota" value="20" />Mb
+</p>
<hr />
<h2>$lt{'gc'}</h2>
<p>
@@ -814,6 +828,7 @@
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'},
@@ -966,6 +981,11 @@
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'};
} else {
Index: loncom/automation/batchcreatecourse.pm
diff -u loncom/automation/batchcreatecourse.pm:1.14 loncom/automation/batchcreatecourse.pm:1.15
--- loncom/automation/batchcreatecourse.pm:1.14 Wed May 31 08:57:26 2006
+++ loncom/automation/batchcreatecourse.pm Tue Jun 27 17:28:21 2006
@@ -1,5 +1,5 @@
#
-# $Id: batchcreatecourse.pm,v 1.14 2006/05/31 12:57:26 raeburn Exp $
+# $Id: batchcreatecourse.pm,v 1.15 2006/06/27 21:28:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -56,6 +56,7 @@
#<!DOCTYPE text>
#<class id="ss05ubw101">
# <title>Underwater Basket Weaving</title>
+# <crstype>Course</coursetype>
# <coursecode>ss05ubw101</coursecode>
# <coursehome>msul1</coursehome>
# <coursedomain>msu</coursedomain>
@@ -74,6 +75,7 @@
# <nonstandard></nonstandard>
# <topmap></topmap>
# <firstres>nav</firstres>
+# <crsquota>20</crsquota>
# <clonecrs>466011437c34194msul1</clonecrs>
# <clonedom>msu</clonedom>
# <showphotos></showphotos>
@@ -154,8 +156,14 @@
# A value of 0 or blank is equivalent to an unchecked box or 'No'
# response. Dates are in format YYYY:MM:DD:HH:MM:SS (:separators required)
#
-# firstres can be nav, syl , or blank for "Navigate Contents", Syllabus, or
+# firstres can be nav, syl, or blank for "Navigate Contents", Syllabus, or
# no entry respectively.
+#
+# crstype can be Course or Group
+#
+# crsquota is the total disk space permitted for course group portfolio files
+# in all course groups.
+#
# For format of other parameters, refer to the interactive CCRS page
# and view how the equivalent parameter is displayed in the web form.
#
@@ -241,7 +249,7 @@
my $xlist = 0;
my $userkey = '';
my $role = '';
- my @items = ('title','optional_id','coursecode','coursehome','reshome','nonstandard','adds','drops','topmap','firstres','clonecrs','clonedom','showphotos','setpolicy','setcontent','setkeys','keyauth','disresdis','disablechat','openall','notify_owner','notify_dc');
+ my @items = ('title','optional_id','coursecode','coursehome','reshome','nonstandard','adds','drops','topmap','firstres','clonecrs','clonedom','showphotos','setpolicy','setcontent','setkeys','keyauth','disresdis','disablechat','openall','notify_owner','notify_dc','crstype','crsquota');
my @dateitems = ('enrollstart','enrollend','accessstart','accessend');
my @useritems = ('autharg','authtype','firstname','generation','lastname','middlename','studentID');
my $p = HTML::Parser->new
@@ -448,11 +456,13 @@
ccuname => $$details{$num}{'owner'},
ccdomain => $$details{$num}{'domain'},
cdescr => $$details{$num}{'title'},
+ crstype => $$details{$num}{'crstype'},
curl => $$details{$num}{'topmap'},
course_domain => $cdom,
course_home => $$details{$num}{'coursehome'},
nonstandard => $$details{$num}{'nonstandard'},
crscode => $$details{$num}{'coursecode'},
+ crsquota => $$details{$num}{'crsquota'},
clonecourse => $$details{$num}{'clonecrs'},
clonedomain => $$details{$num}{'clonedom'},
crsid => $$details{$num}{'optional_id'},