Diff for /loncom/interface/slotrequest.pm between versions 1.91 and 1.93

version 1.91, 2009/03/27 06:47:59 version 1.93, 2009/03/29 17:56:43
Line 1351  LOGLINK Line 1351  LOGLINK
   
         my $remove_all=&remove_link($slot,'remove all').'<br />';          my $remove_all=&remove_link($slot,'remove all').'<br />';
   
         if ($ids ne '') { undef($delete); }          if ($ids eq '') {
  if ($slots{$slot}{'type'} ne 'schedulable_student'               undef($remove_all);
     || $ids eq '') {           } else {
               undef($delete);
           }
    if ($slots{$slot}{'type'} ne 'schedulable_student') {
               undef($showlog); 
     undef($remove_all);      undef($remove_all);
  }   }
   
Line 1426  STUFF Line 1430  STUFF
 sub manage_reservations {  sub manage_reservations {
     my ($r,$type) = @_;      my ($r,$type) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
     $r->print('<p>'.&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.').'<br />'.&mt('One example is for management of laboratory space, which is only available at certain times, and has a limited number of seats.').'</p><p>'.&mt('Your reservation status for any such assignments is listed below:').'</p>');      $r->print('<p>'
                .&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.')
                .'<br />'
                .&mt('One example is for management of laboratory space, which is only available at certain times, and has a limited number of seats.')
                .'</p><p>'
                .&mt('Your reservation status for any such assignments is listed below:')
                .'</p>'
       );
     if (!defined($navmap)) {      if (!defined($navmap)) {
         $r->print('<div class="LC_error">'.          $r->print('<div class="LC_error">'.
                   &mt('Unable to retrieve information about course contents').                    &mt('Unable to retrieve information about course contents').
Line 1723  function chgPage(caller) { Line 1734  function chgPage(caller) {
 ENDSCRIPT  ENDSCRIPT
         }          }
     } else {      } else {
         $r->print(&mt('There are no trasactions to display'));          $r->print('<span class="LC_info">'
                    .&mt('There are no transactions to display')
                    .'</span>'
           );
     }      }
     $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'."\n".      $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'."\n".
               '<input type="hidden" name="command" value="showresv" />'."\n");                '<input type="hidden" name="command" value="showresv" />'."\n");
Line 1738  ENDSCRIPT Line 1752  ENDSCRIPT
   
 sub show_reservations_log {  sub show_reservations_log {
     my ($r) = @_;      my ($r) = @_;
       my $badslot;
       if ($env{'form.slotname'} eq '') {
           $r->print('<div class="LC_warning">'.&mt('No slot name provided').'</div>');
           $badslot = 1;
       } else {
           my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
           if (keys(%slot) == 0) {
               $r->print('<div class="LC_warning">'.&mt('Invalid slot name: [_1]',$env{'form.slotname'}).'</div>');
               $badslot = 1;
           } elsif ($slot{type} ne 'schedulable_student') {
               my $description = &get_description($env{'form.slotname'},\%slot);
               $r->print('<div class="LC_warning">'.&mt('Reservation history unavailable for non-student-schedulable slot: [_1].',$description).'</div>');
               $badslot = 1;
           }
       }
       if ($badslot) {
           $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
                     &mt('Return to slot list').'</a></p>');
           return;
       }
     my $formname = 'reservationslog';      my $formname = 'reservationslog';
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
Line 1800  sub show_reservations_log { Line 1834  sub show_reservations_log {
   
     my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});      my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
     my $description = $slot{'description'};      my $description = $slot{'description'};
     $r->print('<div class="LC_fontsize_large">'.      $r->print('<span class="LC_fontsize_large">'.
               &mt('Reservation changes for slot: [_1]',$description).'</div>');                &mt('Reservation changes for student-schedulable slot: [_1]',$description).'</span><br />');
   
     $r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version,\@allsymbs));      $r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version,\@allsymbs));
     my $showntablehdr = 0;      my $showntablehdr = 0;
Line 1902  ENDSCRIPT Line 1936  ENDSCRIPT
     }      }
     $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.      $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
               '<input type="hidden" name="slotname" value="'.$env{'form.slotname'}.'" />'.                '<input type="hidden" name="slotname" value="'.$env{'form.slotname'}.'" />'.
               '<input type="hidden" name="command" value="slotlog" /></form>');                '<input type="hidden" name="command" value="slotlog" /></form>'.
                 '<p><a href="/adm/slotrequest?command=showslots">'.
                 &mt('Return to slot list').'</a></p>');
     return;      return;
 }  }
   
Line 1954  sub display_filter { Line 1990  sub display_filter {
     my ($formname,$cdom,$cnum,$curr,$version,$allsymbs) = @_;      my ($formname,$cdom,$cnum,$curr,$version,$allsymbs) = @_;
     my $nolink = 1;      my $nolink = 1;
     my (%titles,%maptitles);      my (%titles,%maptitles);
     my $output = '<table><tr><td valign="top">'.      my $output = '<br /><table><tr><td valign="top">'.
                  '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'.                   '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'.
                  &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,                   &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
                                               (&mt('all'),5,10,20,50,100,1000,10000)).                                                (&mt('all'),5,10,20,50,100,1000,10000)).

Removed from v.1.91  
changed lines
  Added in v.1.93


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>