[LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm

[www]

www		Mon Jun 24 10:28:11 2002 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  Toward bug 150 - should respect "randomout" in coursemap hash on display.
  Should list notice on how many resources are picked out of a map to
  instructors.
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.35 loncom/interface/lonnavmaps.pm:1.36
--- loncom/interface/lonnavmaps.pm:1.35	Tue Mar 26 18:14:39 2002
+++ loncom/interface/lonnavmaps.pm	Mon Jun 24 10:28:10 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.35 2002/03/26 23:14:39 www Exp $
+# $Id: lonnavmaps.pm,v 1.36 2002/06/24 14:28:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -278,7 +278,8 @@
     }
     my $brepriv=&Apache::lonnet::allowed('bre',$resource);
     if ($hash{'src_'.$rid}) {
-	if (($brepriv eq '2') || ($brepriv eq 'F')) {
+	if ((($brepriv eq '2') && (!$hash{'randomout_'.$rid})) 
+          || ($brepriv eq 'F')) {
 	    my $pprefix='';
 	    if ($resource=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 		$pprefix=&astatus($rid);
@@ -612,6 +613,11 @@
 			my $indent;my $indentstr;
 			my $linkid;
 			my $rid=$colcont[$j];
+                        $rid=~/(\d+)\.(\d+)$/;
+			my $src=
+			   &Apache::lonnet::declutter($hash{'src_'.$1.'.'.$2});
+			my $symb=
+	  &Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.$src;
 			my $add='<td>';
 			my $adde='</td>';
 			my $hwk='<font color="#223322">';
@@ -622,6 +628,12 @@
 			    $rid=$1;
 			    $add='<th bgcolor="#AAFF55"><a name="'.$rid.'">';
 			    $adde='</th>';
+                            if (($ENV{'user.adv'}) && 
+				($parmhash{$symb.'.0.parameter_randompick'})) {
+                               $adde=' (randomly select '.
+				   $parmhash{$symb.'.0.parameter_randompick'}.
+                                   ')</th>';
+                            }
 			}
 			if ($rid=~/^j(.+)/) { $rid=$1; }
 			if ($rid=~/^p(\d)(\d)\"([\w\: \(\)\/\,]*)\"(.+)/) {
@@ -667,11 +679,6 @@
 			    $adde=
 				'<font color=red size=+2><b> &lt;</b></font>'.$adde;
 			}
-			my $src=
-			    &Apache::lonnet::declutter($hash{'src_'.$rid});
-			$rid=~/^(\d+)\.(\d+)$/;
-			my $symb=
-			    &Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.$src;
 			if ($discussiontimes{$symb}>$lastcheck) {
 			    $adde=
 				'<img border=0 src="/adm/lonMisc/chat.gif">'.