--- loncom/html/adm/helper/newslot.helper 2006/04/24 23:23:18 1.15
+++ loncom/html/adm/helper/newslot.helper 2010/10/31 15:32:15 1.27
@@ -1,5 +1,6 @@
-
+
OPTIONAL
@@ -30,7 +31,7 @@
}
- Name:
+
Name:
@@ -75,7 +76,7 @@
Type:
- Instructor asssignable.
+ Instructor assignable.
Student selectable.
return &{$helper->{DATA}{origslot}}('type','preassigned');
@@ -84,7 +85,8 @@
-
+
Description:
@@ -110,7 +112,7 @@
-
Maxium number of students allowed in this slot:
+
Maximum number of students allowed in this slot:
@@ -122,7 +124,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:
@@ -147,6 +149,20 @@
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'
@@ -157,6 +173,20 @@
delete($helper->{'VARS'}{'endunique'});
+
+
+
Proctored access:
+
+
+ No proctor checkin required for access.
+ Require proctored checkin for access.
+
+ my $default=&{$helper->{DATA}{origslot}}('proctor');
+ if ($default) { return 'yes'; }
+ return 'no';
+
+
+
Secret word proctors use to checkin users:
@@ -171,6 +201,8 @@
Slot is:
+
+
usable for any resource.
restricted to a specific resource.
@@ -180,6 +212,7 @@
return 'any';
+
IP restrictions:
@@ -209,22 +242,22 @@
-
+
- FINISH
+
+ $helper->{'VARS'}{'useproctor'} eq 'no'
+ RESTRICTUSER
+
-
- $helper->{'VARS'}{'type'} eq 'schedulable_student'
- RESTRICTUSER
-
+ RESTRICTUSER
+ activeonly="1" emptyallowed="0">
my @defaults;
my $default=&{$helper->{DATA}{origslot}}('proctor');
if ($default) {
- $default=~ tr/@/:/;
@defaults=(split(',',$default));
}
return @defaults;
@@ -233,7 +266,13 @@
-
+
+
+ $helper->{'VARS'}{'type'} ne 'schedulable_student'
+ FINISH
+
+
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.
@@ -278,6 +317,15 @@
}
}
+ 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'};
}
@@ -288,13 +336,16 @@
$helper->{'VARS'}{'endunique'}];
}
- if ( $helper->{'VARS'}{'proctor'} =~/\S/ ) {
+ if ( $helper->{'VARS'}{'useproctor'} eq 'yes'
+ && $helper->{'VARS'}{'proctor'} =~/\S/ ) {
my @names;
+ # just need the username/domain throw away the other data
+ # that returns
foreach my $user (split(/\|\|\|/, $helper->{'VARS'}{'proctor'})) {
my ($uname,$udomain)=split(/:/,$user);
- push(@names,"$uname\@$udomain");
+ push(@names,"$uname:$udomain");
}
- # make sure the usenrmaes are unique
+ # make sure the usernmaes are unique
my %proctors = map { ($_,1) } @names;
$slot{'proctor'}=join(',',sort(keys(%proctors)));
}
@@ -306,8 +357,9 @@
}
if ( $helper->{'VARS'}{'allowedusers'} =~/\S/ ) {
-
my @names;
+ # just need the username/domain throw away the other data
+ # that returns
foreach my $item (split(/\|\|\|/,
$helper->{'VARS'}{'allowedusers'})) {
my ($uname,$udomain)=split(/:/,$item);
@@ -342,6 +394,13 @@
$result.="\n".' '.$labels{'startreserve'}.': '.
&Apache::lonlocal::locallocaltime($slot{'startreserve'}).'';
}
+
+ 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;