--- loncom/interface/loncreatecourse.pm 2010/03/15 17:27:40 1.135
+++ loncom/interface/loncreatecourse.pm 2010/03/30 16:06:21 1.136
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.135 2010/03/15 17:27:40 raeburn Exp $
+# $Id: loncreatecourse.pm,v 1.136 2010/03/30 16:06:21 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()
@@ -722,12 +720,17 @@ sub print_intro_page {
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 => '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.'),
- },
+ },
);
my $options;
foreach my $choice (@choices) {
@@ -814,15 +817,16 @@ sub courserequestbrowser_javascript {
ENDREQBRW
@@ -850,8 +854,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)) {
@@ -925,6 +927,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) {
@@ -1060,14 +1068,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.' | '.
' | '.
' | ';
- my ($types,$typenames) = &course_types();
+ my ($types,$typenames) = &Apache::loncommon::course_types();
if (ref($types) eq 'ARRAY') {
if (@{$types} > 1) {
$output .= ''.
@@ -1119,16 +1127,6 @@ sub creation_display_filter {
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 =
@@ -1253,19 +1251,51 @@ sub handler {
'domain',$env{'request.role.domain'}).''.
&Apache::loncommon::end_page());
} elsif ($env{'form.phase'} eq 'requestchange') {
+ 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 'pendingdisplay') {
+ &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') {
+ 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') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createcourse?phase=creationlog",
|