--- loncom/interface/loncreatecourse.pm 2007/03/03 01:40:28 1.101
+++ loncom/interface/loncreatecourse.pm 2007/12/23 17:36:56 1.104.2.2
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.101 2007/03/03 01:40:28 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.104.2.2 2007/12/23 17:36:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,7 +35,7 @@ use Apache::lonnet;
use Apache::loncommon;
use Apache::londocs;
use Apache::lonlocal;
-use Apache::londropadd;
+use Apache::lonuserutils;
use Apache::lonclonecourse;
use LONCAPA::batchcreatecourse;
use LONCAPA;
@@ -44,10 +44,11 @@ use LONCAPA;
sub print_course_creation_page {
my $r=shift;
- my $crstype = 'Group';
- if ($env{'form.phase'} eq 'courseone') {
- $crstype = 'Course';
- }
+ my $crstype = 'Course';
+# my $crstype = 'Group';
+# if ($env{'form.phase'} eq 'courseone') {
+# $crstype = 'Course';
+# }
my $defdom=$env{'request.role.domain'};
my %host_servers = &Apache::lonnet::get_servers($defdom,'library');
my $course_home = '<select name="course_home" size="1">'."\n";
@@ -70,13 +71,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,
+ $enroll_table = &Apache::lonuserutils::date_setting_table($starttime,
$endtime,'create_enrolldates');
- $access_table = &Apache::londropadd::date_setting_table($starttime,
+ $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,
@@ -575,7 +576,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');
@@ -670,25 +670,31 @@ sub create_course {
return;
}
my ($courseid,$crsudom,$crsunum);
- $r->print(&Apache::loncommon::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?phase='.lc($crstype).'one">'.
+ 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 [_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>');
+ }
+ $r->print('<p><a href="/adm/createcourse?phase='.lc($crstype).'one">'.
&mt('Create Another [_1]',$crstype).'</a></p>'.
&Apache::loncommon::end_page());
}
@@ -696,7 +702,7 @@ sub create_course {
sub print_intro_page {
my $r = shift;
my $start_page =
- &Apache::loncommon::start_page('Create a New Course or Group Space');
+ &Apache::loncommon::start_page('Create a New Course');
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Options','Create_Course',undef,'Create_Courses');
my $end_page =
&Apache::loncommon::end_page();
@@ -707,11 +713,11 @@ 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 =>
@@ -743,11 +749,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/Group Attributes File','Create_Course',undef,'Create_Courses');
+ my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Upload Course 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('<h3>'.&mt('Upload a courses attributes file').'</h3>');
$r->print('<form name="batchcreate" method="post" '.
'enctype="multipart/form-data" action="/adm/createcourse">'.
'<input type="file" name="coursecreatorxml" />'.
@@ -794,7 +800,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);
}