--- loncom/interface/loncreatecourse.pm 2006/05/30 12:46:09 1.89 +++ loncom/interface/loncreatecourse.pm 2006/05/30 20:05:05 1.90 @@ -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::lonratedt; 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 copycoursefiles { 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", @@ -300,10 +324,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", @@ -333,7 +357,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", @@ -349,8 +372,28 @@ 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" + '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", ); + my $js = < var editbrowser = null; @@ -375,14 +418,21 @@ $javascript_validations $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(<print($start_page.$crumbs); + if ($crstype eq 'Course') { + $r->print(<

$lt{'cinf'}

@@ -581,12 +631,136 @@ $lt{'ndcl'}

- + +

-$end_page ENDDOCUMENT + } elsif ($crstype eq 'Group') { + $r->print(< +

$lt{'ginf'}

+

+ +

+ +

+ +

+

$lt{'grco'}

+ + + +
$lt{'cngr'}$lt{'cegr'}
+

+ +$lt{'smap'} +

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

+$lt{'fres'}
($lt{'stgo'}): + +  + +  + +

+		 + +
+ +
+ 
+$lt{'asov'}. +
+

+

+

$lt{'mssg'}

+

+ +
+ +

+

$lt{'cmmn'}

+

+ +
+ +

+

$lt{'acco'}

+

+ +
+ +

+

$lt{'rshm'}

+

+ +

+
+

$lt{'gc'}

+

+ +

+ +

+

+ + + +

+ +ENDDOCUMENT + } + $r->print($end_page); } # ====================================================== Phase two: make course @@ -597,11 +771,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; @@ -621,12 +801,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(&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 @@ sub create_course { $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').'

'); - } + 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( '

'.&mt('Manage Access Keys').'

'); @@ -708,7 +891,7 @@ 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()); } @@ -719,6 +902,7 @@ sub construct_course { # # Open course # + my $crstype = lc($args->{'crstype'}); my %cenv=(); $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'}, $args->{'cdescr'}, @@ -726,13 +910,14 @@ sub construct_course { $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.'
'; + $outcome .= &mt('New LON-CAPA [_1] ID: [_2]
',$crstype,$$courseid); # # Check if created correctly # @@ -749,10 +934,10 @@ sub construct_course { my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); if ($clonehome eq 'no_host') { $outcome .= - '
'.&mt('Attempting to clone non-existing course').' '.$cloneid.''; + '
'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.''; } else { $outcome .= - '
'.&mt('Cloning course from').' '.$clonehome.''; + '
'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).''; my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); # Copy all files ©coursefiles($cloneid,$$courseid); @@ -775,6 +960,9 @@ sub construct_course { # my @sections = (); my @xlists = (); + if ($args->{'crstype'}) { + $cenv{'type'}=$args->{'crstype'}; + } if ($args->{'crsid'}) { $cenv{'courseid'}=$args->{'crsid'}; } @@ -977,6 +1165,107 @@ sub construct_course { 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 .='

'. + $choice->{'name'}."

\n"; + $options .= ' '.(' 'x8).$choice->{'short_description'}. + "\n"; + } + + $r->print(<print($start_page.$crumbs); + $r->print('

'.&mt('Upload a courses or groups attributes file').'

'); + $r->print('
'. + ''. + '

'. + '
'); + $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 = ; + 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 @@ sub handler { &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__