Diff for /loncom/html/adm/helper/newslot.helper between versions 1.3 and 1.4

version 1.3, 2005/10/14 22:17:33 version 1.4, 2005/10/17 18:21:26
Line 86 Line 86
       </message_text>        </message_text>
     </message>      </message>
     <choices variable="restricttosymb">      <choices variable="restricttosymb">
       <choice nextstate="FINISH" computer='any'>usable for any resource.</choice>        <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
       <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>        <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>
       <defaultvalue>'any'</defaultvalue>        <defaultvalue>'any'</defaultvalue>
     </choices>      </choices>
Line 106 Line 106
     <resource variable="symb">      <resource variable="symb">
       <filterfunc>return $res->is_problem()</filterfunc>        <filterfunc>return $res->is_problem()</filterfunc>
       <valuefunc>return $res->symb()</valuefunc>        <valuefunc>return $res->symb()</valuefunc>
       <nextstate>FINISH</nextstate>        <nextstate>PROCTOR</nextstate>
     </resource>          </resource>    
   </state>    </state>
     <state name="PROCTOR" title="Specify Proctors">
       <student variable="proctor" multichoice="1" coursepersonnel="1"
                nextstate="FINISH" activeonly="1" emptyallowed="1">
       </student>
     </state>
   <state name="FINISH" title="Creating/Modfying Slot">    <state name="FINISH" title="Creating/Modfying Slot">
     <message> <message_text> Created Slot </message_text> </message>      <message> <message_text> Created Slot </message_text> </message>
     <final>      <final>
Line 119 Line 124
  foreach my $which ('type','starttime','endtime') {   foreach my $which ('type','starttime','endtime') {
     $slot{$which} = $helper->{'VARS'}{$which};      $slot{$which} = $helper->{'VARS'}{$which};
  }   }
  foreach my $which ('ip','proctor','description','maxspace',   foreach my $which ('ip','description','maxspace',
    'secret','symb') {     'secret','symb') {
     if ( $helper->{'VARS'}{$which} =~/\S/ ) {      if ( $helper->{'VARS'}{$which} =~/\S/ ) {
  $slot{$which} = $helper->{'VARS'}{$which};   $slot{$which} = $helper->{'VARS'}{$which};
Line 130 Line 135
     $slot{'uniqueperiod'} = [$helper->{'VARS'}{'startunique'},      $slot{'uniqueperiod'} = [$helper->{'VARS'}{'startunique'},
      $helper->{'VARS'}{'endunique'}];       $helper->{'VARS'}{'endunique'}];
  }   }
           if ( $helper->{'VARS'}{'proctor'} =~/\S/ ) {
       my @names;
       foreach my $user (split(/\|\|\|/, $helper->{'VARS'}{'proctor'})) {
    my ($uname,$udomain)=split(/:/,$user);
    push(@names,"$uname\@$udomain");
       }
       $slot{'proctor'}=join(',',@names);
    }
         my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};          my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $cdom  = $env{'course.'.$env{'request.course.id'}.'.domain'};          my $cdom  = $env{'course.'.$env{'request.course.id'}.'.domain'};
   
         my $ret = &Apache::lonnet::cput('slots',          my $ret = &Apache::lonnet::cput('slots',
  {$helper->{'VARS'}{'name'} => \%slot},   {$helper->{'VARS'}{'name'} => \%slot},
  $cdom,$cname);   $cdom,$cname);
         $result.="\n".'<li> Name: '.&HTML::Entities::encode($slot{name}).'</li>'.          $result.="\n$ret ".'Name: '.&HTML::Entities::encode($helper->{'VARS'}{'name'}).'</li>'.
     "\n".'<li> Starts: '.&Apache::lonlocal::locallocaltime($slot{start}).'</li>'.      "\n".'<li> Starts: '.&Apache::lonlocal::locallocaltime($slot{'starttime'}).'</li>'.
                  "\n".'<li> Ends: '.&Apache::lonlocal::locallocaltime($slot{end}).'</li>'.                   "\n".'<li> Ends: '.&Apache::lonlocal::locallocaltime($slot{'endtime'}).'</li>'.
                  "\n".'<li> Type: '.$slot{'type'}.'</li>';                   "\n".'<li> Type: '.$slot{'type'}.'</li>';
         my %labels =          my %labels =
              map {($_->[0],$_->[1])} &Apache::slotrequest::csvupload_fields();               map {($_->[0],$_->[1])} &Apache::slotrequest::csvupload_fields();
Line 159 Line 172
  }   }
         return $result;          return $result;
       </finalcode>        </finalcode>
       <exitpage>/adm/flip?postdata=return:</exitpage>        <exitpage>/adm/slotrequest?command=showslots</exitpage>
     </final>      </final>
   </state>    </state>
 </helper>  </helper>

Removed from v.1.3  
changed lines
  Added in v.1.4


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