[BACK]Return to newslot.helper CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / html / adm / helper

Diff for /loncom/html/adm/helper/newslot.helper between versions 1.27 and 1.28

version 1.27, 2010/10/31 15:32:15 version 1.28, 2011/12/18 17:15:08
Line 112 Line 112
         </validator>          </validator>
       </date>        </date>
       <message>        <message>
           </p><p>Time students can no longer reserve:<br />&nbsp;&nbsp;&nbsp;
         </message>
         <date variable="endreserve" hoursminutes="1" anytime="1">
           <defaultvalue>
             return &{$helper->{DATA}{origslot}}('endreserve','anytime');
           </defaultvalue>
           <validator>
              if (defined($val) && $val > $helper->{'VARS'}{'starttime'}) {
                  return 'Reservation end time must come before the slot has started.';
              }
              return undef;
           </validator>
         </date>
         <message>
          </p><p>Maximum number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;           </p><p>Maximum number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
       </message>        </message>
       <string variable="maxspace" size="4">        <string variable="maxspace" size="4">
Line 168 Line 182
       <clause>$helper->{'VARS'}{'type'} eq 'preassigned'</clause>        <clause>$helper->{'VARS'}{'type'} eq 'preassigned'</clause>
       <exec>        <exec>
         delete($helper->{'VARS'}{'startreserve'});          delete($helper->{'VARS'}{'startreserve'});
           delete($helper->{'VARS'}{'endreserve'});
         delete($helper->{'VARS'}{'maxspace'});          delete($helper->{'VARS'}{'maxspace'});
         delete($helper->{'VARS'}{'startunique'});          delete($helper->{'VARS'}{'startunique'});
         delete($helper->{'VARS'}{'endunique'});          delete($helper->{'VARS'}{'endunique'});
Line 330 Line 345
  $slot{'startreserve'} = $helper->{'VARS'}{'startreserve'};   $slot{'startreserve'} = $helper->{'VARS'}{'startreserve'};
  }   }
   
           if ( $helper->{'VARS'}{'endreserve'} > 0) {
               $slot{'endreserve'} = $helper->{'VARS'}{'endreserve'};
           }
   
  if ( $helper->{'VARS'}{'startunique'} > 0 &&   if ( $helper->{'VARS'}{'startunique'} > 0 &&
      $helper->{'VARS'}{'endunique'} > 0 ) {       $helper->{'VARS'}{'endunique'} > 0 ) {
     $slot{'uniqueperiod'} = [$helper->{'VARS'}{'startunique'},      $slot{'uniqueperiod'} = [$helper->{'VARS'}{'startunique'},
Line 395 Line 414
     &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'</li>';      &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'</li>';
  }   }
   
           if (exists($slot{'endreserve'})) {
               $result.="\n".'<li> '.$labels{'endreserve'}.': '.
                       &Apache::lonlocal::locallocaltime($slot{'endreserve'}).'</li>';
           }
   
         if (exists($slot{'reservationmsg'})) {          if (exists($slot{'reservationmsg'})) {
             my %options = &Apache::slotrequest::slot_reservationmsg_options();              my %options = &Apache::slotrequest::slot_reservationmsg_options();
             $result.="\n".'<li> '.$labels{'reservationmsg'}.': '.              $result.="\n".'<li> '.$labels{'reservationmsg'}.': '.
Removed from v.1.27  
changed lines
  Added in v.1.28

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