[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.26 and 1.27

version 1.26, 2009/03/30 12:46:22 version 1.27, 2010/10/31 15:32:15
Line 149 Line 149
    return undef;     return undef;
         </validator>          </validator>
       </date>        </date>
         <message>
           </p><p>Message(s) triggered by reservation change by student 
         </message>
       <choices variable="reservationmsg">
         <choice computer='only_student'>Sent to student</choice>
         <choice computer='student_and_user_notes_screen'>Sent to student and added to user notes</choice>
         <choice computer='none'>None sent and no record in user notes</choice>
         <defaultvalue>
           my $default=&{$helper->{DATA}{origslot}}('reservationmsg');
           if ($default eq 'only_student') { return $default; }
           if ($default eq 'student_and_user_notes_screen') { return $default; }
           return 'none';
         </defaultvalue>
       </choices>
     </condition>      </condition>
     <condition>      <condition>
       <clause>$helper->{'VARS'}{'type'} eq 'preassigned'</clause>        <clause>$helper->{'VARS'}{'type'} eq 'preassigned'</clause>
Line 303 Line 317
     }      }
  }   }
   
           if ($helper->{'VARS'}{'type'} eq 'schedulable_student') {
               if (($helper->{'VARS'}{'reservationmsg'} eq 'only_student') ||
                  ($helper->{'VARS'}{'reservationmsg'} eq 'student_and_user_notes_screen')) {
                   $slot{'reservationmsg'} = $helper->{'VARS'}{'reservationmsg'}; 
               } else {
                   $slot{'reservationmsg'} = 'none';
               }
           }
   
  if ( $helper->{'VARS'}{'startreserve'} > 0) {   if ( $helper->{'VARS'}{'startreserve'} > 0) {
  $slot{'startreserve'} = $helper->{'VARS'}{'startreserve'};   $slot{'startreserve'} = $helper->{'VARS'}{'startreserve'};
  }   }
Line 371 Line 394
     $result.="\n".'<li> '.$labels{'startreserve'}.': '.      $result.="\n".'<li> '.$labels{'startreserve'}.': '.
     &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'</li>';      &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'</li>';
  }   }
   
           if (exists($slot{'reservationmsg'})) {
               my %options = &Apache::slotrequest::slot_reservationmsg_options();
               $result.="\n".'<li> '.$labels{'reservationmsg'}.': '.
                             $options{$slot{'reservationmsg'}}.'</li>';
           }
   
         if (exists($slot{'proctor'})) {          if (exists($slot{'proctor'})) {
     my $proctors = $slot{'proctor'};      my $proctors = $slot{'proctor'};
     $proctors =~ s/,/, /g;      $proctors =~ s/,/, /g;
Removed from v.1.26  
changed lines
  Added in v.1.27

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