version 1.66, 2014/06/07 19:13:41
|
version 1.68, 2014/08/03 01:47:49
|
Line 2319 sub display_loncaparev_constraints {
|
Line 2319 sub display_loncaparev_constraints {
|
my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps, |
my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps, |
%byresponsetype,%bysubmission,%fromblocks); |
%byresponsetype,%bysubmission,%fromblocks); |
@scopeorder = ('all','section/group','user'); |
@scopeorder = ('all','section/group','user'); |
|
my $now = time; |
my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom); |
my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom); |
if (ref($resourcedata) eq 'HASH') { |
if (ref($resourcedata) eq 'HASH') { |
foreach my $key (keys(%{$resourcedata})) { |
foreach my $key (keys(%{$resourcedata})) { |
Line 2332 sub display_loncaparev_constraints {
|
Line 2333 sub display_loncaparev_constraints {
|
} else { |
} else { |
$value = ''; |
$value = ''; |
} |
} |
|
} elsif ($item eq 'printstartdate') { |
|
if ($value =~ /^\d+$/) { |
|
if ($value > $now) { |
|
$value = 'future'; |
|
} |
|
} |
|
} elsif ($item eq 'printenddate') { |
|
if ($value =~ /^\d+$/) { |
|
if ($value < $now) { |
|
$value = 'past'; |
|
} |
|
} |
} |
} |
my ($middle,$scope,$which,$level,$map,$resource); |
my ($middle,$scope,$which,$level,$map,$resource); |
if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) { |
if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) { |
Line 2611 sub display_loncaparev_constraints {
|
Line 2624 sub display_loncaparev_constraints {
|
} |
} |
foreach my $map (keys(%allmaps)) { |
foreach my $map (keys(%allmaps)) { |
my $mapres = $navmap->getResourceByUrl($map); |
my $mapres = $navmap->getResourceByUrl($map); |
my $mapsymb = $mapres->symb(); |
|
$toshow{$mapsymb} = 1; |
|
if (ref($mapres)) { |
if (ref($mapres)) { |
|
my $mapsymb = $mapres->symb(); |
|
$toshow{$mapsymb} = 1; |
my $pcslist = $mapres->map_hierarchy(); |
my $pcslist = $mapres->map_hierarchy(); |
if ($pcslist ne '') { |
if ($pcslist ne '') { |
foreach my $pc (split(/,/,$pcslist)) { |
foreach my $pc (split(/,/,$pcslist)) { |