--- loncom/interface/courseprefs.pm 2014/06/07 19:13:41 1.66 +++ loncom/interface/courseprefs.pm 2014/08/03 01:47:49 1.68 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set configuration settings for a course # -# $Id: courseprefs.pm,v 1.66 2014/06/07 19:13:41 raeburn Exp $ +# $Id: courseprefs.pm,v 1.68 2014/08/03 01:47:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2319,6 +2319,7 @@ sub display_loncaparev_constraints { my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps, %byresponsetype,%bysubmission,%fromblocks); @scopeorder = ('all','section/group','user'); + my $now = time; my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom); if (ref($resourcedata) eq 'HASH') { foreach my $key (keys(%{$resourcedata})) { @@ -2332,6 +2333,18 @@ sub display_loncaparev_constraints { } else { $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); if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) { @@ -2611,9 +2624,9 @@ sub display_loncaparev_constraints { } foreach my $map (keys(%allmaps)) { my $mapres = $navmap->getResourceByUrl($map); - my $mapsymb = $mapres->symb(); - $toshow{$mapsymb} = 1; if (ref($mapres)) { + my $mapsymb = $mapres->symb(); + $toshow{$mapsymb} = 1; my $pcslist = $mapres->map_hierarchy(); if ($pcslist ne '') { foreach my $pc (split(/,/,$pcslist)) {