--- loncom/html/adm/helper/newslot.helper 2019/03/02 16:25:52 1.30.6.1
+++ loncom/html/adm/helper/newslot.helper 2018/06/24 04:11:12 1.35
@@ -50,7 +50,7 @@
return join(',',@allows);
}
} else {
- return $slot{$name}{$which};
+ return $slot{$name}{$which};
}
}
@@ -208,11 +208,34 @@
delete($helper->{'VARS'}{'startreserve'});
delete($helper->{'VARS'}{'endreserve'});
delete($helper->{'VARS'}{'maxspace'});
- delete($helper->{'VARS'}{'startunique'});
- delete($helper->{'VARS'}{'endunique'});
+
+ Period of time when this slot can only be uniquely assigned:
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;
+
+
-
Proctored access:
@@ -244,16 +267,30 @@
usable for any resource.
- restricted to a specific resource.
+ restricted to resources in specific folder(s)/composite page(s).
+ restricted to specific resource(s).
my $default=&{$helper->{DATA}{origslot}}('symb');
- if ($default) { return 'resource'; }
- return 'any';
+ if ($default) {
+ my @symbs;
+ if ($default =~ /,/) {
+ @symbs = split(/\s*,\s*/,$default);
+ } else {
+ @symbs = ($default);
+ }
+ if (grep(/\.(page|sequence)$/,@symbs)) {
+ return 'map';
+ } else {
+ return 'resource';
+ }
+ } else {
+ return 'any';
+ }
-
+
- IP restrictions -- allow from all except:
+
IP restrictions -- allow from all except:
@@ -264,9 +301,9 @@
return &{$helper->{DATA}{origslot}}('ipdeny');
-
+
- IP restrictions -- deny from all except:
+
IP restrictions -- deny from all except:
@@ -277,6 +314,21 @@
return &{$helper->{DATA}{origslot}}('ipallow');
+
+
+ Does each student need to use a unique IP address to access a resource with this slot?
+
+
+ No. The student's IP address is not tied for later access to the same resource.
+ Yes. The IP address on a student's first access to a resource is tied for later access.
+ Yes. The IP address on a student's first access to a resource is tied for later access (including post-answer date).
+
+ my $default=&{$helper->{DATA}{origslot}}('iptied');
+ if ($default eq 'yes') { return 'yes'; }
+ if ($default eq 'answer') { return 'answer'; }
+ return 'no';
+
+
@@ -285,15 +337,38 @@
PROCTOR
-
- return $res->is_problem()
+
+ return $res->is_map() || $res->is_problem()
+ return $res->is_problem()
return $res->symb()
- return &{$helper->{DATA}{origslot}}('symb');
+ my @defaults;
+ my $default=&{$helper->{DATA}{origslot}}('symb');
+ if ($default) {
+ @defaults=(split(/\s*,\s*/,$default));
+ }
+ return @defaults;
+
+
+ PROCTOR
+
+
+ return $res->is_map()
+ return $res->symb()
+
+ my @defaults;
+ my $default=&{$helper->{DATA}{origslot}}('symb');
+ if ($default) {
+ @defaults=(split(/\s*,\s*/,$default));
+ }
+ return @defaults;
+
+
+
@@ -332,16 +407,16 @@
- Select sections to limit slot availability to:
+ Select sections to limit slot availability to:
- return join('|||',
+ return join('|||',
split(',',&{$helper->{DATA}{origslot}}('allowedsections')));
- Select users to limit slot availability to:
+
Select users to limit slot availability to:
@@ -364,7 +439,7 @@
$slot{$which} = $helper->{'VARS'}{$which};
}
- foreach my $which ('description','maxspace','secret','symb') {
+ foreach my $which ('description','maxspace','secret') {
if ( $helper->{'VARS'}{$which} =~/\S/ ) {
$slot{$which} = $helper->{'VARS'}{$which};
}
@@ -385,7 +460,7 @@
$slot{'ip'} .= $item.',';
}
}
-
+
if ($slot{'ip'} ne '') {
$slot{'ip'} =~s /,$//;
}
@@ -399,6 +474,17 @@
}
}
+ if (($helper->{'VARS'}{'restricttosymb'} =~ /^(map|resource)$/) &&
+ ($helper->{'VARS'}{'symb'} =~ /\S/)) {
+ my @symbs;
+ foreach my $symb (split(/\|\|\|/, $helper->{'VARS'}{'symb'})) {
+ push(@symbs,$symb);
+ }
+ # make sure the symbs are unique
+ my %symbs = map { ($_,1) } @symbs;
+ $slot{'symb'}=join(',',sort(keys(%symbs)));
+ }
+
if ( $helper->{'VARS'}{'startreserve'} > 0) {
$slot{'startreserve'} = $helper->{'VARS'}{'startreserve'};
}
@@ -413,6 +499,10 @@
$helper->{'VARS'}{'endunique'}];
}
+ if ( $helper->{'VARS'}{'iptied'} =~ /^(yes|answer)$/ ) {
+ $slot{'iptied'} = lc($helper->{'VARS'}{'iptied'});
+ }
+
if ( $helper->{'VARS'}{'useproctor'} eq 'yes'
&& $helper->{'VARS'}{'proctor'} =~/\S/ ) {
my @names;
@@ -422,7 +512,7 @@
my ($uname,$udomain)=split(/:/,$user);
push(@names,"$uname:$udomain");
}
- # make sure the usernmaes are unique
+ # make sure the usernames are unique
my %proctors = map { ($_,1) } @names;
$slot{'proctor'}=join(',',sort(keys(%proctors)));
}
@@ -463,13 +553,35 @@
"\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',
'allowedsections','allowedusers') {
if (exists($slot{$which})) {
$result.="\n".' '.$labels{$which}.': '.
&HTML::Entities::encode($slot{$which}).'';
}
}
+ if (exists($slot{'iptied'})) {
+ $result.="\n".' '.$labels{'iptied'}.': ';
+ if ($slot{'iptied'} eq 'yes') {
+ $result.=&Apache::lonlocal::mt('yes');
+ } elsif ($slot{'iptied'} eq 'answer') {
+ $result.=&Apache::lonlocal::mt('yes, including post-answer date');
+ }
+ $result.='';
+ }
+ if (exists($slot{'symb'})) {
+ $result.="\n".' '.$labels{'symb'}.': ';
+ if ($slot{'symb'} =~ /,/) {
+ $result.='';
+ foreach my $symb (split(/\s*,\s*/,$slot{'symb'})) {
+ $result.='- '.&HTML::Entities::encode($symb).'
';
+ }
+ $result.='
';
+ } else {
+ $result.=&HTML::Entities::encode($slot{'symb'});
+ }
+ $result.='';
+ }
if (exists($slot{'startreserve'})) {
$result.="\n".' '.$labels{'startreserve'}.': '.
&Apache::lonlocal::locallocaltime($slot{'startreserve'}).'';