[LON-CAPA-cvs] cvs: loncom /automation batchcreatecourse.pm /interface loncommon.pm loncreatecourse.pm /lonnet/perl lonnet.pm
raeburn
lon-capa-cvs@mail.lon-capa.org
Tue, 30 May 2006 20:05:27 -0000
This is a MIME encoded message
--raeburn1149019527
Content-Type: text/plain
raeburn Tue May 30 16:05:27 2006 EDT
Modified files:
/loncom/interface loncreatecourse.pm loncommon.pm
/loncom/automation batchcreatecourse.pm
/loncom/lonnet/perl lonnet.pm
Log:
When creating courses can choose to create as a course or as an ANGEL-style Group. Can also upload a file containing XML describing course(s) or group(s) to be created. Additional course environment parameter ('type') is now set to 'Course' or 'Group', and included in value in key=value pairs in nohist_courseids.db
--raeburn1149019527
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20060530160527.txt"
Index: loncom/interface/loncreatecourse.pm
diff -u loncom/interface/loncreatecourse.pm:1.89 loncom/interface/loncreatecourse.pm:1.90
--- loncom/interface/loncreatecourse.pm:1.89 Tue May 30 08:46:09 2006
+++ loncom/interface/loncreatecourse.pm Tue May 30 16:05:05 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.89 2006/05/30 12:46:09 www Exp $
+# $Id: loncreatecourse.pm,v 1.90 2006/05/30 20:05:05 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,6 +37,7 @@
use Apache::londocs;
use Apache::lonlocal;
use Apache::londropadd;
+use LONCAPA::batchcreatecourse;
use lib '/home/httpd/lib/perl';
use LONCAPA;
@@ -258,6 +259,10 @@
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 = '<select name="course_home" size="1">'."\n";
@@ -270,26 +275,45 @@
}
$course_home .= "\n</select>\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",
@@ -300,10 +324,10 @@
'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",
@@ -333,7 +357,6 @@
'Key authority (<tt>id@domain</tt>) 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",
@@ -349,8 +372,28 @@
'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"
+ '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 (<tt>id@domain</tt>) if other than group',
+ 'gc' => "Group Coordinator",
+ 'gid' => "Group ID",
+ 'crgr' => "Create Group",
);
+
my $js = <<END;
<script type="text/javascript">
var editbrowser = null;
@@ -375,14 +418,21 @@
$coursebrowserjs
END
+ my %titles = &Apache::lonlocal::texthash(
+ courseone => 'Create a New Course',
+ groupone => 'Create a New Group',
+ );
my $start_page =
- &Apache::loncommon::start_page('Create a New Course',$js);
+ &Apache::loncommon::start_page($titles{$env{'form.phase'}},$js);
my $end_page =
&Apache::loncommon::end_page();
-
- $r->print(<<ENDDOCUMENT);
-$start_page
-$helplink
+ my $type = $crstype;
+ my $crumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('[_1] Information',
+ $type),'Create_Course',
+ undef,'Create_Courses');
+ $r->print($start_page.$crumbs);
+ if ($crstype eq 'Course') {
+ $r->print(<<ENDDOCUMENT);
<form action="/adm/createcourse" method="post" name="ccrs">
<h2>$lt{'cinf'}</h2>
<p>
@@ -581,12 +631,136 @@
</label>
</p>
<p>
-<input type="hidden" name="phase" value="two" />
+<input type="hidden" name="prevphase" value="courseone" />
+<input type="hidden" name="phase" value="coursetwo" />
<input type="button" onClick="verify_message(this.form)" value="$lt{'opco'}" />
</p>
</form>
-$end_page
ENDDOCUMENT
+ } elsif ($crstype eq 'Group') {
+ $r->print(<<ENDDOCUMENT);
+<form action="/adm/createcourse" method="post" name="ccrs">
+<h2>$lt{'ginf'}</h2>
+<p>
+<label><b>$lt{'gtit'}:</b>
+<input type="text" size="50" name="title" /></label>
+</p><p>
+<label>
+ <b>$lt{'ghsr'}:</b>$course_home
+</label>
+</p><p>
+<label>
+ <b>$lt{'gidn'} ($lt{'opt'})</b>
+ <input type="text" size="30" name="crsid" />
+</label>
+</p>
+<h2>$lt{'grco'}</h2>
+<table border="2">
+<tr><th>$lt{'cngr'}</th><th>$lt{'cegr'}</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{'sagr'}</b></label>
+<br />
+($lt{'ocik'}):
+<input id="nonstd" type="checkbox" name="nonstandard" />
+</p><p>
+<b>$lt{'fres'}</b><br />($lt{'stgo'}):
+<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{'gid'}: <input type="text" size="25" name="clonecourse" value="" />
+</label>
+<br />
+<label>
+ $lt{'dmn'}: $cloneform
+</label>
+<br />
+ <br />
+$lt{'asov'}.
+</td></tr>
+</table>
+</p>
+<p>
+<h2>$lt{'mssg'}</h2>
+<p>
+<label>
+ <b>$lt{'sgpf'}: </b>
+ <input type="checkbox" name="setpolicy" checked />
+</label>
+<br />
+<label>
+ <b>$lt{'scfg'}: </b>
+ <input type="checkbox" name="setcontent" checked />
+</label>
+</p>
+<h2>$lt{'cmmn'}</h2>
+<p>
+<label>
+ <b>$lt{'dmrd'}: </b>
+ <input type="checkbox" name="disresdis" />
+</label>
+<br />
+<label>
+ <b>$lt{'dmuc'}: </b>
+ <input type="checkbox" name="disablechat" />
+</label>
+</p>
+<h2>$lt{'acco'}</h2>
+<p>
+<label>
+ <b>$lt{'mnak'}: </b>
+ <input type="checkbox" name="setkeys" />
+</label>
+<br />
+<label>
+ <b>$lt{'kaug'}: </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>
+<hr />
+<h2>$lt{'gc'}</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>
+<p>
+<input type="hidden" name="prevphase" value="groupone" />
+<input type="hidden" name="phase" value="grouptwo" />
+<input type="button" onClick="validate(this.form)" value="$lt{'crgr'}" />
+</p>
+</form>
+ENDDOCUMENT
+ }
+ $r->print($end_page);
}
# ====================================================== Phase two: make course
@@ -597,11 +771,17 @@
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;
@@ -621,12 +801,14 @@
$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(&mt('Create a New [_1]',$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'},
@@ -693,13 +875,14 @@
$r->print(&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').'<p>');
- }
+ 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>');
@@ -708,7 +891,7 @@
&Apache::lonnet::flushcourselogs();
$r->print('<p>'.&mt('Roles will be active at next login').'.</p>'.
'<p><a href="/adm/createcourse">'.
- &mt('Create Another Course').'</a></p>'.
+ &mt('Create Another [_1]',$crstype).'</a></p>'.
&Apache::loncommon::end_page());
}
@@ -719,6 +902,7 @@
#
# Open course
#
+ my $crstype = lc($args->{'crstype'});
my %cenv=();
$$courseid=&Apache::lonnet::createcourse($args->{'course_domain'},
$args->{'cdescr'},
@@ -726,13 +910,14 @@
$args->{'course_home'},
$args->{'nonstandard'},
$args->{'crscode'},
- $args->{'ccuname'});
+ $args->{'ccuname'},
+ $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 .= 'New LON-CAPA Course ID: '.$$courseid.'<br>';
+ $outcome .= &mt('New LON-CAPA [_1] ID: [_2]<br />',$crstype,$$courseid);
#
# Check if created correctly
#
@@ -749,10 +934,10 @@
my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
if ($clonehome eq 'no_host') {
$outcome .=
- '<br /><font color="red">'.&mt('Attempting to clone non-existing course').' '.$cloneid.'</font>';
+ '<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>';
} else {
$outcome .=
- '<br /><font color="green">'.&mt('Cloning course from').' '.$clonehome.'</font>';
+ '<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);
@@ -775,6 +960,9 @@
#
my @sections = ();
my @xlists = ();
+ if ($args->{'crstype'}) {
+ $cenv{'type'}=$args->{'crstype'};
+ }
if ($args->{'crsid'}) {
$cenv{'courseid'}=$args->{'crsid'};
}
@@ -977,6 +1165,107 @@
return $outcome;
}
+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 @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'),
+ },
+ );
+ 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'}.
+ "\n";
+ }
+
+ $r->print(<<ENDDOCUMENT);
+$start_page
+$crumbs
+$options
+$end_page
+ENDDOCUMENT
+}
+
+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/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 or groups attributes file').'</h3>');
+ $r->print('<form name="batchcreate" method="post" '.
+ 'enctype="multipart/form-data" action="/adm/createcourse">'.
+ '<input type="file" name="coursecreatorxml" />'.
+ '<input type="hidden" name="phase" value="batchtwo"><br /><br />'.
+ '<input type="submit" name="batchsubmit" '.
+ 'value="Create Courses/Groups" /></form>');
+ $r->print($end_page);
+ return;
+}
+
+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 = <FILE>;
+ 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");
+ }
+ }
+ }
+ }
+ }
+ $r->print($start_page.$crumbs.$result.$end_page);
+
+}
+
# ===================================================================== Handler
sub handler {
my $r = shift;
@@ -991,18 +1280,57 @@
&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__
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.376 loncom/interface/loncommon.pm:1.377
--- loncom/interface/loncommon.pm:1.376 Tue May 30 08:46:08 2006
+++ loncom/interface/loncommon.pm Tue May 30 16:05:05 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.376 2006/05/30 12:46:08 www Exp $
+# $Id: loncommon.pm,v 1.377 2006/05/30 20:05:05 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -386,10 +386,11 @@
sub coursebrowser_javascript {
my ($domainfilter)=@_;
+ my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
return (<<ENDSTDBRW);
<script type="text/javascript" language="Javascript" >
var stdeditbrowser;
- function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag) {
+ function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
var url = '/adm/pickcourse?';
var filter;
if (filter != null) {
@@ -415,6 +416,18 @@
if (multflag !=null && multflag != '') {
url += '&multiple='+multflag;
}
+ if (crstype == 'Course/Group') {
+ if (formname == 'cu') {
+ crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
+ if (crstype == "") {
+ alert("$crs_or_grp_alert");
+ return;
+ }
+ }
+ }
+ if (crstype !=null && crstype != '') {
+ url += '&type='+crstype;
+ }
var title = 'Course_Browser';
var options = 'scrollbars=1,resizable=1,menubar=0';
options += ',width=700,height=600';
@@ -426,9 +439,9 @@
}
sub selectcourse_link {
- my ($form,$unameele,$udomele,$desc,$extra_element,$multflag)=@_;
+ my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
- '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'");'."'>".&mt('Select Course')."</a>";
+ '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
}
sub check_uncheck_jscript {
@@ -2817,6 +2830,12 @@
&Apache::lonnet::plaintext((split(/\./,$env{'request.role'}))[0]);
# realm
if ($env{'request.course.id'}) {
+ my $type = $env{'course.'.$env{'request.course.id'}.'.type'};
+ if ($type eq 'Group') {
+ if ($env{'request.role'} !~ /^cr/) { # Change role name if Group
+ $role = &convert_role($role,$type);
+ }
+ }
$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
}
if (!$realm) { $realm=' '; }
@@ -4962,6 +4981,16 @@
############################################################
############################################################
+sub convert_role {
+ my ($rolename,$type) = @_;
+ if ($type eq 'Group') {
+ $rolename =~ s/Course/Group/;
+ $rolename =~ s/Instructor/Leader/;
+ $rolename =~ s/Teaching Assistant/Assistant Leader/;
+ $rolename =~ s/Student/Member/;
+ }
+ return $rolename;
+}
sub icon {
my ($file)=@_;
Index: loncom/automation/batchcreatecourse.pm
diff -u loncom/automation/batchcreatecourse.pm:1.12 loncom/automation/batchcreatecourse.pm:1.13
--- loncom/automation/batchcreatecourse.pm:1.12 Fri May 26 11:37:14 2006
+++ loncom/automation/batchcreatecourse.pm Tue May 30 16:05:10 2006
@@ -1,5 +1,5 @@
#
-# $Id: batchcreatecourse.pm,v 1.12 2006/05/26 15:37:14 albertel Exp $
+# $Id: batchcreatecourse.pm,v 1.13 2006/05/30 20:05:10 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -166,7 +166,7 @@
#
# Directory for retrieval of files listed in @$requests is:
# /home/httpd/perl/tmp/addcourse/$dom/auto/pending if $context = auto
-# /home/httpd/perl/tmp/addcourse/$dom/web/$udom_$uname if $context = web
+# /home/httpd/perl/tmp/addcourse/$dom/web/$uname_$udom/pending if $context = web
#
# inputs (five) - requests - ref to array of filename(s) containing course requests
# courseids - ref to hash to store LON-CAPA course ids of new courses
@@ -201,7 +201,7 @@
$newcoursedir .= '/pending';
} else {
if ($uname && $udom) {
- $newcoursedir .= '/'.$udom.'_'.$uname;
+ $newcoursedir .= '/'.$uname.'_'.$udom.'/pending';
} else {
$logmsg = "batchcreatecourse::create_courses() called without username and/or domain of requesting Domain Coordinator";
}
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.740 loncom/lonnet/perl/lonnet.pm:1.741
--- loncom/lonnet/perl/lonnet.pm:1.740 Tue May 30 08:47:18 2006
+++ loncom/lonnet/perl/lonnet.pm Tue May 30 16:05:23 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.740 2006/05/30 12:47:18 www Exp $
+# $Id: lonnet.pm,v 1.741 2006/05/30 20:05:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,7 +38,7 @@
qw(%perlvar %hostname %badServerCache %iphost %spareid %hostdom
%libserv %pr %prp $memcache %packagetab
%courselogs %accesshash %userrolehash %domainrolehash $processmarker $dumpcount
- %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseownerbuf
+ %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseownerbuf %coursetypebuf
%domaindescription %domain_auth_def %domain_auth_arg_def
%domain_lang_def %domain_city %domain_longi %domain_lati %domain_primary
$tmpdir $_64bit %env);
@@ -1387,7 +1387,22 @@
open(my $fh,'>'.$fullpath.'/'.$fname);
print $fh $env{'form.'.$formname};
close($fh);
- return $fullpath.'/'.$fname;
+ return $fullpath.'/'.$fname;
+ } elsif (($formname eq 'coursecreatorxml') && ($subdir eq 'batchupload')) { #files uploaded to create course page are handled differently
+ my $filepath = 'tmp/addcourse/'.$destudom.'/web/'.$env{'user.name'}.
+ '_'.$env{'user.domain'}.'/pending';
+ my @parts=split(/\//,$filepath);
+ my $fullpath = $perlvar{'lonDaemons'};
+ for (my $i=0;$i<@parts;$i++) {
+ $fullpath .= '/'.$parts[$i];
+ if ((-e $fullpath)!=1) {
+ mkdir($fullpath,0777);
+ }
+ }
+ open(my $fh,'>'.$fullpath.'/'.$fname);
+ print $fh $env{'form.'.$formname};
+ close($fh);
+ return $fullpath.'/'.$fname;
}
# Create the directory if not present
@@ -1651,11 +1666,11 @@
if ($courseidbuffer{$coursehombuf{$crsid}}) {
$courseidbuffer{$coursehombuf{$crsid}}.='&'.
&escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
- ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid});
+ ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid}).':'.&escape($coursetypebuf{$crsid});
} else {
$courseidbuffer{$coursehombuf{$crsid}}=
&escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
- ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid});
+ ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid}).':'.&escape($coursetypebuf{$crsid});
}
}
#
@@ -1758,6 +1773,8 @@
$env{'course.'.$env{'request.course.id'}.'.internal.coursecode'};
$courseownerbuf{$env{'request.course.id'}}=
$env{'course.'.$env{'request.course.id'}.'.internal.courseowner'};
+ $coursetypebuf{$env{'request.course.id'}}=
+ $env{'course.'.$env{'request.course.id'}.'.type'};
if (defined $courselogs{$env{'request.course.id'}}) {
$courselogs{$env{'request.course.id'}}.='&'.$what;
} else {
@@ -1928,7 +1945,7 @@
}
sub courseiddump {
- my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$coursefilter,$hostidflag,$hostidref)=@_;
+ my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$coursefilter,$hostidflag,$hostidref,$typefilter)=@_;
my %returnhash=();
unless ($domfilter) { $domfilter=''; }
foreach my $tryserver (keys %libserv) {
@@ -1937,7 +1954,7 @@
foreach (
split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
$sincefilter.':'.&escape($descfilter).':'.
- &escape($instcodefilter).':'.&escape($ownerfilter).':'.&escape($coursefilter),
+ &escape($instcodefilter).':'.&escape($ownerfilter).':'.&escape($coursefilter).':'.&escape($typefilter),
$tryserver))) {
my ($key,$value)=split(/\=/,$_);
if (($key) && ($value)) {
@@ -2640,6 +2657,9 @@
$returnhash{'home'}= $chome;
$returnhash{'domain'} = $cdomain;
$returnhash{'num'} = $cnum;
+ if (!defined($returnhash{'type'})) {
+ $returnhash{'type'} = 'Course';
+ }
while (my ($name,$value) = each %returnhash) {
$envhash{'course.'.$normalid.'.'.$name}=$value;
}
@@ -4407,7 +4427,8 @@
# ---------------------------------------------------------- Make/modify course
sub createcourse {
- my ($udom,$description,$url,$course_server,$nonstandard,$inst_code,$course_owner)=@_;
+ my ($udom,$description,$url,$course_server,$nonstandard,$inst_code,
+ $course_owner,$crstype)=@_;
$url=&declutter($url);
my $cid='';
unless (&allowed('ccc',$udom)) {
@@ -4444,7 +4465,8 @@
# ----------------------------------------------------------------- Course made
# log existence
&courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description).
- ':'.&escape($inst_code).':'.&escape($course_owner),$uhome);
+ ':'.&escape($inst_code).':'.&escape($course_owner).':'.
+ &escape($crstype),$uhome);
&flushcourselogs();
# set toplevel url
my $topurl=$url;
--raeburn1149019527--