--- loncom/html/adm/helper/newslot.helper 2005/11/02 21:58:14 1.6 +++ loncom/html/adm/helper/newslot.helper 2006/04/24 23:23:18 1.15 @@ -1,5 +1,8 @@ + + OPTIONAL + if (!exists($helper->{'VARS'}{'name'}) || $helper->{'VARS'}{'name'} !~ /\S/) { @@ -7,6 +10,8 @@ if (exists($env{'form.name'}) || $env{'form.name'} =~ /\S/) { $helper->{'VARS'}{'name'}=$env{'form.name'}; + $helper->{VARS}{'origname'}=$env{'form.name'}; + $helper->{DATA}{copy} = 1; } } $helper->{DATA}{origslot} = sub { @@ -17,30 +22,35 @@ } my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $name=$helper->{'VARS'}{'name'}; + my $name=$helper->{VARS}{'origname'}; my %slot=&Apache::lonnet::get('slots', [$name], $cdom, $cnum); if (!ref($slot{$name})) { return $default; } if (!exists($slot{$name}{$which})) { return $default; } return $slot{$name}{$which}; } - - - Name:
    -
+ + Name:
   
if ($val=~/^\s*$/) { return 'Must specify a name'; } - if ($val=~/\s$/) { return 'Must not contain spaces'; } + if ($val=~/\s/) { return 'Must not contain spaces'; } + if ($val=~/\W/) { return 'Must contain only letters, numbers and _'; } return undef; return $helper->{'VARS'}{'name'}; + + $helper->{DATA}{copy} + +

Changing the Name will create a new slot with the new name, and not rename the existing slot.

+
+
-
Start time:
   
+
Start time:
   
@@ -48,15 +58,21 @@ -
End time:
   
+
End time:
   
return &{$helper->{DATA}{origslot}}('endtime'); + + if ($val < $helper->{'VARS'}{'starttime'}) { + return 'End time must be later than the start time.'; + } + return undef; + -
Type:
+
Type:
Instructor asssignable. @@ -67,45 +83,82 @@
+ - -

Description:
    - +

Description:
    return &{$helper->{DATA}{origslot}}('description'); + + $helper->{'VARS'}{'type'} eq 'schedulable_student' + +

Time students can start reserving:
    + + + + return &{$helper->{DATA}{origslot}}('startreserve','anytime'); + + + if (defined($val) && $val > $helper->{'VARS'}{'starttime'}) { + return 'Reservation time must come before the slot has started.'; + } + return undef; + + + +

Maxium number of students allowed in this slot:
    + + + + if ($val ne '' && $val=~/\D/) { return 'Must be numeric.'; } + return undef; + + + return &{$helper->{DATA}{origslot}}('maxspace'); + + + +

Period of time in which this slot is can only be uniquely chosen:
   Start: + + + + my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime'); + if ($default eq 'anytime') { return 'anytime' }; + if (ref($default)) { return $default->[0]; } + return 'anytime'; + + +
   End:
+ + + my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime'); + if ($default eq 'anytime') { return 'anytime' }; + if (ref($default)) { return $default->[1]; } + return 'anytime'; + + + if (defined($val) && $val < $helper->{'VARS'}{'startunique'}) { + return 'End time must be later than the start time.'; + } + return undef; + + + + + $helper->{'VARS'}{'type'} eq 'preassigned' + + delete($helper->{'VARS'}{'startreserve'}); + delete($helper->{'VARS'}{'maxspace'}); + delete($helper->{'VARS'}{'startunique'}); + delete($helper->{'VARS'}{'endunique'}); + + - -

Time students can start reserving:
    - - - - - return &{$helper->{DATA}{origslot}}('startreserve','anytime'); - - - - -

Maxium number of students allowed in this slot:
    - - - - - if ($val ne '' && $val=~/\D/) { return 'Must be numeric.'; } - return undef; - - - return &{$helper->{DATA}{origslot}}('maxspace'); - - - - -

Secret word proctors use to checkin users:
    - +

Secret word proctors use to checkin users:
    @@ -116,31 +169,7 @@ - -

Period of time in which this slot is can only be uniquely chosen:
   Start: - - - - - my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime'); - if ($default eq 'anytime') { return 'anytime' }; - if (ref($default)) { return $default->[0]; } - return 'anytime'; - - -
   End:
- - - my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime'); - if ($default eq 'anytime') { return 'anytime' }; - if (ref($default)) { return $default->[1]; } - return 'anytime'; - - - - -

Slot is: - +

Slot is: usable for any resource. @@ -152,9 +181,7 @@ - -

IP restrictions:
    - +

IP restrictions:
    @@ -164,21 +191,35 @@ return &{$helper->{DATA}{origslot}}('ip'); -

+

+ + + + PROCTOR + return $res->is_problem() return $res->symb() - PROCTOR return &{$helper->{DATA}{origslot}}('symb'); + + + + FINISH + + + $helper->{'VARS'}{'type'} eq 'schedulable_student' + RESTRICTUSER + + + activeonly="1" emptyallowed="1"> my @defaults; my $default=&{$helper->{DATA}{origslot}}('proctor'); @@ -190,35 +231,94 @@ + + + + FINISH + +

Slots are by default available to all users in a course, if you would like this slot to be restricted to a subset of users you can specify restrictions.

+
+ + + Select sections to limit slot availability to:
    +
+
+ + return join('|||', + split(',',&{$helper->{DATA}{origslot}}('allowedsections'))); + +
+ + Select users to limit slot availability to:
    +
+ + + return split(',',&{$helper->{DATA}{origslot}}('allowedusers')); + + +
+ + - Created Slot + Created Slot my $result; if ($helper->{'STATE'} ne 'FINISH') { return; } my %slot; + foreach my $which ('type','starttime','endtime') { $slot{$which} = $helper->{'VARS'}{$which}; } - foreach my $which ('ip','description','maxspace', - 'secret','symb') { + + foreach my $which ('ip','description','maxspace','secret','symb') { if ( $helper->{'VARS'}{$which} =~/\S/ ) { $slot{$which} = $helper->{'VARS'}{$which}; } } + + if ( $helper->{'VARS'}{'startreserve'} > 0) { + $slot{'startreserve'} = $helper->{'VARS'}{'startreserve'}; + } + if ( $helper->{'VARS'}{'startunique'} > 0 && $helper->{'VARS'}{'endunique'} > 0 ) { $slot{'uniqueperiod'} = [$helper->{'VARS'}{'startunique'}, $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); + # make sure the usenrmaes are unique + my %proctors = map { ($_,1) } @names; + $slot{'proctor'}=join(',',sort(keys(%proctors))); + } + + if ( $helper->{'VARS'}{'allowedsections'} =~/\S/ ) { + $slot{'allowedsections'}= + join(',',sort(split(/\|\|\|/, + $helper->{'VARS'}{'allowedsections'}))); + } + + if ( $helper->{'VARS'}{'allowedusers'} =~/\S/ ) { + + my @names; + foreach my $item (split(/\|\|\|/, + $helper->{'VARS'}{'allowedusers'})) { + my ($uname,$udomain)=split(/:/,$item); + push(@names,"$uname:$udomain"); + } + + # make sure the choices are unique + my %users = map { ($_,1) } @names; + $slot{'allowedusers'}=join(',',sort(keys(%users))); } + my $cname = $env{'course.'.$env{'request.course.id'}.'.num'}; my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; @@ -231,12 +331,17 @@ "\n".'
  • Type: '.$slot{'type'}.'
  • '; my %labels = map {($_->[0],$_->[1])} &Apache::slotrequest::csvupload_fields(); - foreach my $which ('ip','description','maxspace','secret','symb') { + foreach my $which ('ip','description','maxspace','secret','symb', + 'allowedsections','allowedusers') { if (exists($slot{$which})) { $result.="\n".'
  • '.$labels{$which}.': '. &HTML::Entities::encode($slot{$which}).'
  • '; } } + if (exists($slot{'startreserve'})) { + $result.="\n".'
  • '.$labels{'startreserve'}.': '. + &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'
  • '; + } if (exists($slot{'proctor'})) { my $proctors = $slot{'proctor'}; $proctors =~ s/,/, /g;