--- loncom/interface/loncreatecourse.pm 2009/11/18 19:15:44 1.134 +++ loncom/interface/loncreatecourse.pm 2010/04/13 21:19:15 1.137 @@ -1,7 +1,7 @@ # The LearningOnline Network # Create a course # -# $Id: loncreatecourse.pm,v 1.134 2009/11/18 19:15:44 raeburn Exp $ +# $Id: loncreatecourse.pm,v 1.137 2010/04/13 21:19:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,8 +61,6 @@ described at http://www.lon-capa.org. =item creation_display_filter() -=item course_types() - =item context_names() =item instcode_srchstr() @@ -694,41 +692,52 @@ sub create_course { } sub print_intro_page { - my $r = shift; + my ($r,$show_all_choices) = @_; my $start_page = &Apache::loncommon::start_page('Create a New Course or Community'); 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_Community',&mt('Help on Creating Courses and Communities')); - - 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 community'), - short_description => + my @choices = ({ internal_name => 'courseone', + name => &mt('Create a single course'), + short_description => &mt('Create a new course by completing an online form.'), + }); + if ($show_all_choices) { + push(@choices,{ internal_name => 'groupone', + name => &mt('Create a single community'), + short_description => &mt('Create a new collaborative community by completing an online form.'), - }, - { internal_name => 'batchone', - name => &mt('Create courses/communities by uploading an attributes file'), - short_description => + }, + { internal_name => 'batchone', + name => &mt('Create courses/communities by uploading an attributes file'), + short_description => &mt('Upload an attributes file containing specifications for one or more courses or communities in XML format.'), - help => 'Batch_Creation', - }, - { internal_name => 'requestdisplay', - name => &mt('Approve or reject requests'), - short_description => + help => 'Batch_Creation', + }, + { internal_name => 'requestdisplay', + name => &mt('Approve or reject requests'), + short_description => &mt('Display course and community creation requests submitted by authorized users, held pending approval by a Domain Coordinator.'), - }, - { internal_name => 'creationlog', - name => &mt('View creation log'), - short_description => + }, + { internal_name => 'pendingdisplay', + name => &mt('Display official course requests'), + short_description => + &mt('Display official course requests submitted by authorized users, held pending validation of instructor status.'), + }, + { internal_name => 'creationlog', + name => &mt('View creation log'), + short_description => &mt('Display information about when, how and by whom courses and communities were created in this domain.'), - }, - ); + }); + } else { + push(@choices,{ internal_name => 'batchone', + name => &mt('Create courses by uploading an attributes file'), + short_description => + &mt('Upload an attributes file containing specifications for one or more courses in XML format.'), + help => 'Batch_Creation', + }); + } my $options; foreach my $choice (@choices) { $options .='

\n".' '.(' 'x8).$choice->{'short_description'}. "\n"; } - $r->print(< // ENDREQBRW @@ -850,8 +859,6 @@ sub print_creation_logs { foreach my $item ('show','page','type','context') { $curr{$item} = $env{'form.'.$item}; } - my $createdafter = &Apache::lonhtmlcommon::get_date_from_form('created_after_date'); - my $createdbefore = &Apache::lonhtmlcommon::get_date_from_form('created_before_date'); $curr{'created_after_date'} = &Apache::lonhtmlcommon::get_date_from_form('created_after_date'); $curr{'created_before_date'} = &Apache::lonhtmlcommon::get_date_from_form('created_before_date'); foreach my $key (keys(%defaults)) { @@ -859,9 +866,8 @@ sub print_creation_logs { $curr{$key} = $defaults{$key}; } } - my (%whodunit,$version); - ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/); - $r->print(&creation_display_filter($formname,\%curr,$version)); + my %whodunit; + $r->print(&creation_display_filter($formname,\%curr)); my $showntablehdr = 0; my $tablehdr = &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). @@ -926,6 +932,12 @@ sub print_creation_logs { undef,undef,undef,$curr{'created_before_date'}, $curr{'created_after_date'},$creationcontext); foreach my $cid (sort { $courses{$b}{'created'}<=>$courses{$a}{'created'} } (keys(%courses))) { + if ($curr{'show'} ne &mt('all')) { + if ($count >= $curr{'page'} * $curr{'show'}) { + $more_records = 1; + last; + } + } $count ++; next if ($count < $minshown); if (!$showntablehdr) { @@ -1045,7 +1057,7 @@ ENDSCRIPT } sub creation_display_filter { - my ($formname,$curr,$version) = @_; + my ($formname,$curr) = @_; my $nolink = 1; my ($contexts,$contextnames) = &context_names(); my $output = ''. ''; - my ($types,$typenames) = &course_types(); + my ($types,$typenames) = &Apache::loncommon::course_types(); if (ref($types) eq 'ARRAY') { if (@{$types} > 1) { $output .= '
'. @@ -1061,14 +1073,14 @@ sub creation_display_filter { &Apache::lonhtmlcommon::date_setter($formname,'created_before_date', $curr->{'created_before_date'},undef, undef,undef,undef,undef,undef,undef,$nolink); - $output .= ''.&mt('Window during which course was created:').'
'. + $output .= '		'.&mt('Window during which course/community was created:').'
'. ''. ''. '
'.&mt('After:'). ''.$startform.'
'.&mt('Before:').''.$endform.'
'. '		  '. @@ -1116,28 +1128,10 @@ sub creation_display_filter { # Update Display button $output .= '

'. ''. - '

'; - - # Server version info - $output .= '

'. - &mt('Only courses and communities created from servers running LON-CAPA [_1] or later are displayed.','2.9.0'); - if ($version) { - $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version); - } - $output .= '

'; + '

'; return $output; } -sub course_types { - my @types = qw(official unofficial community); - my %typename = ( - official => 'Official course', - unofficial => 'Unofficial course', - community => 'Community', - ); - return (\@types,\%typename); -} - sub context_names { my @contexts = qw(auto web dc_create requestcourses); my %contextnames = @@ -1204,6 +1198,13 @@ sub handler { return OK; } + my $show_all_choices = 0; + my $primary_rev = &Apache::lonnet::get_server_loncaparev($env{'request.role.domain'}); + if (($primary_rev ne 'refused') && ($primary_rev ne 'error') && + ($primary_rev ne 'unknown_cmd') && ($primary_rev ne 'no_such_host')) { + $show_all_choices = 1; + } + if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -1216,7 +1217,8 @@ sub handler { text=>"Creation Options", faq=>79,bug=>'Dom Coord Interface',}); if (($env{'form.phase'} eq 'coursetwo') || - ($env{'form.phase'} eq 'grouptwo')) { + (($env{'form.phase'} eq 'grouptwo') && + ($show_all_choices))) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/createcourse?phase=$env{'form.prevphase'}", text=>&mt('[_1] Creation Settings',), @@ -1227,7 +1229,8 @@ sub handler { faq=>9,bug=>'Dom Coord Interface',}); &create_course($r); } elsif (($env{'form.phase'} eq 'courseone') || - ($env{'form.phase'} eq 'groupone')) { + (($env{'form.phase'} eq 'groupone') && + ($show_all_choices))) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/createcourse?phase=$env{'form.phase'}", text=>&mt('[_1] Creation Settings',), @@ -1249,7 +1252,7 @@ sub handler { text=>"Creation Outcome", faq=>9,bug=>'Dom Coord Interface',}); &process_batchfile($r); - } elsif ($env{'form.phase'} eq 'requestdisplay') { + } elsif (($env{'form.phase'} eq 'requestdisplay') && ($show_all_choices)) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/createcourse?phase=$env{'form.phase'}", text=>&mt('[_1] Display Request Queue',), @@ -1261,21 +1264,53 @@ sub handler { &Apache::loncoursequeueadmin::display_queued_requests( 'domain',$env{'request.role.domain'}).''. &Apache::loncommon::end_page()); - } elsif ($env{'form.phase'} eq 'requestchange') { + } elsif (($env{'form.phase'} eq 'requestchange') && ($show_all_choices)) { + if ($env{'form.queue'} eq 'pending') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=pendingdisplay", + text=>&mt('Display Pending Queue',), + faq=>9,bug=>'Dom Coord Interface',}); + } else { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=requestdisplay", + text=>&mt('[_1] Display Request Queue',), + faq=>9,bug=>'Dom Coord Interface',}); + } &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/createcourse?phase=requestdisplay", - text=>&mt('[_1] Display Request Queue',), - faq=>9,bug=>'Dom Coord Interface',}, - {href=>"/adm/createcourse?phase=requestchange", - text=>&mt('[_1] Requests Updated',), - faq=>9,bug=>'Dom Coord Interface',},); + ({href=>"/adm/createcourse?phase=requestchange", + text=>&mt('[_1] Requests Updated',), + faq=>9,bug=>'Dom Coord Interface',},); my $start_page=&Apache::loncommon::start_page('Update Requests Result'); my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Requests Updated','Course_Request',undef,'Course_Request'); $r->print($start_page.$crumbs."\n".'
'. &Apache::loncoursequeueadmin::update_request_queue( 'domain',$env{'request.role.domain'}).'
'. &Apache::loncommon::end_page()); - } elsif ($env{'form.phase'} eq 'creationlog') { + } elsif (($env{'form.phase'} eq 'pendingdisplay') && ($show_all_choices)) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.phase'}", + text=>&mt('Display Pending Queue',), + faq=>9,bug=>'Dom Coord Interface',}); + my $js = &courserequestbrowser_javascript(); + my $start_page=&Apache::loncommon::start_page('Display Pending Queue',$js); + my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Display Pending Queue','Course_Request',undef,'Course_Request'); + $r->print($start_page.$crumbs."\n".'
'. + &Apache::loncoursequeueadmin::display_queued_requests( + 'pending',$env{'request.role.domain'}).'
'. + &Apache::loncommon::end_page()); + } elsif (($env{'form.phase'} eq 'requestvalidation') && ($show_all_choices)) { + my $js = &courserequestbrowser_javascript(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=pendingdisplay", + text=>&mt('Display Pending Queue'),}, + {href=>"/adm/createcourse?phase=requestvalidation", + text=>&mt('Validation Attempted'),},); + my $start_page=&Apache::loncommon::start_page('Requests Validation Result',$js); + my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Validation Attempted','Course_Request',undef,'Course_Request'); + $r->print($start_page.$crumbs."\n".'
'. + &Apache::loncoursequeueadmin::process_official_reqs('domain',$env{'request.role.domain'}).'
'. + &Apache::loncommon::end_page()); + } elsif (($env{'form.phase'} eq 'creationlog') && ($show_all_choices)) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/createcourse?phase=creationlog", text=>&mt('[_1] Display Creation History',),}); @@ -1290,7 +1325,7 @@ sub handler { &print_creation_logs($r); $r->print(''.&Apache::loncommon::end_page()); } else { - &print_intro_page($r); + &print_intro_page($r,$show_all_choices); } } else { $env{'user.error.msg'}=