[LON-CAPA-cvs] cvs: loncom /interface selfenroll.pm

raeburn raeburn@source.lon-capa.org
Fri, 15 Jan 2010 03:37:13 -0000


raeburn		Fri Jan 15 03:37:14 2010 EDT

  Modified files:              
    /loncom/interface	selfenroll.pm 
  Log:
  - Display queued self-enrollment requests in a table.
  
  
Index: loncom/interface/selfenroll.pm
diff -u loncom/interface/selfenroll.pm:1.23 loncom/interface/selfenroll.pm:1.24
--- loncom/interface/selfenroll.pm:1.23	Sat Sep  5 01:14:32 2009
+++ loncom/interface/selfenroll.pm	Fri Jan 15 03:37:13 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow users to self-enroll in a course
 #
-# $Id: selfenroll.pm,v 1.23 2009/09/05 01:14:32 raeburn Exp $
+# $Id: selfenroll.pm,v 1.24 2010/01/15 03:37:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -543,8 +543,8 @@
     my %existing = 
         &Apache::lonnet::get($namespace,[$uname.':'.$udom],$cdom,$cnum);
     if ($existing{$uname.':'.$udom}) {
-        my ($timestamp,$sec) = split(/:/,$existing{$uname.':'.$udom});
-        $output = &mt('A self-enrollment request already exists for you for this course.').'<br />'.&mt('Your earlier request was submitted: [_1] and remains in a queue awaiting action by a Course Coordinator.',&Apache::lonlocal::locallocaltime($timestamp));
+        $output = &mt('A self-enrollment request already exists for you for this course.').'<br />'.&mt('Your earlier request is in a queue awaiting action by a Course Coordinator.').
+                  '<br /><br />'.&Apache::loncoursequeueadmin::queued_selfenrollment();
     } else {
         my %selfenroll = (
                             $uname.':'.$udom => $now.':'.$usec,
@@ -576,7 +576,9 @@
             if ($warning) { 
                 $output .= '<span class="LC_warning">'.$warning.'</span><br />';
             }
-  
+
+            $output .= &Apache::loncommon::queued_selfenrollment();
+
             if ($selfenroll_notifylist) {
                 my $fullname = &Apache::loncommon::plainname($uname,$udom);
                 my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);