--- loncom/html/adm/helper/newslot.helper 2006/12/18 15:14:37 1.21 +++ loncom/html/adm/helper/newslot.helper 2011/12/18 17:15:08 1.28 @@ -1,5 +1,6 @@ - + OPTIONAL @@ -29,12 +30,6 @@ return $slot{$name}{$which}; } - - Help on required attributes - - - Required Attributes -
Name:
   
@@ -81,7 +76,7 @@
Type: - Instructor asssignable. + Instructor assignable. Student selectable. return &{$helper->{DATA}{origslot}}('type','preassigned'); @@ -90,14 +85,8 @@
- - - Help on optional attributes - - - Optional Attributes - - +

Description:
    @@ -123,7 +112,21 @@ -

Maxium number of students allowed in this slot:
    +

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

Maximum number of students allowed in this slot:
    @@ -135,7 +138,7 @@ -

Period of time in which this slot is can only be uniquely chosen:
   Start: +

Period of time when this slot can only be uniquely chosen:
   Start: @@ -160,11 +163,26 @@ return undef; + +

Message(s) triggered by reservation change by student + + + Sent to student + Sent to student and added to user notes + None sent and no record in user notes + + 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'; + + $helper->{'VARS'}{'type'} eq 'preassigned' delete($helper->{'VARS'}{'startreserve'}); + delete($helper->{'VARS'}{'endreserve'}); delete($helper->{'VARS'}{'maxspace'}); delete($helper->{'VARS'}{'startunique'}); delete($helper->{'VARS'}{'endunique'}); @@ -198,9 +216,7 @@

Slot is: - - Resource Restriction - + usable for any resource. @@ -241,7 +257,8 @@ - + $helper->{'VARS'}{'useproctor'} eq 'no' @@ -249,15 +266,9 @@ RESTRICTUSER - - Specifying Proctors - - - Specifying Proctors - + activeonly="1" emptyallowed="0"> my @defaults; my $default=&{$helper->{DATA}{origslot}}('proctor'); @@ -270,7 +281,8 @@ - + $helper->{'VARS'}{'type'} ne 'schedulable_student' FINISH @@ -280,9 +292,6 @@

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.

- - Restrict Availibility - Select sections to limit slot availability to:
    @@ -323,10 +332,23 @@ } } + 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) { $slot{'startreserve'} = $helper->{'VARS'}{'startreserve'}; } + if ( $helper->{'VARS'}{'endreserve'} > 0) { + $slot{'endreserve'} = $helper->{'VARS'}{'endreserve'}; + } + if ( $helper->{'VARS'}{'startunique'} > 0 && $helper->{'VARS'}{'endunique'} > 0 ) { $slot{'uniqueperiod'} = [$helper->{'VARS'}{'startunique'}, @@ -391,6 +413,18 @@ $result.="\n".'
  • '.$labels{'startreserve'}.': '. &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'
  • '; } + + if (exists($slot{'endreserve'})) { + $result.="\n".'
  • '.$labels{'endreserve'}.': '. + &Apache::lonlocal::locallocaltime($slot{'endreserve'}).'
  • '; + } + + if (exists($slot{'reservationmsg'})) { + my %options = &Apache::slotrequest::slot_reservationmsg_options(); + $result.="\n".'
  • '.$labels{'reservationmsg'}.': '. + $options{$slot{'reservationmsg'}}.'
  • '; + } + if (exists($slot{'proctor'})) { my $proctors = $slot{'proctor'}; $proctors =~ s/,/, /g;