--- loncom/interface/loncommon.pm	2004/12/02 00:01:34	1.238
+++ loncom/interface/loncommon.pm	2004/12/08 00:56:00	1.242
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.238 2004/12/02 00:01:34 raeburn Exp $
+# $Id: loncommon.pm,v 1.242 2004/12/08 00:56:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2325,7 +2325,7 @@ sub get_student_answers {
 
 =item * &submlink()
 
-Inputs: $text $uname $udom $symb
+Inputs: $text $uname $udom $symb $target
 
 Returns: A link to grades.pm such as to see the SUBM view of a student
 
@@ -2333,15 +2333,64 @@ Returns: A link to grades.pm such as to
 
 ###############################################
 sub submlink {
-    my ($text,$uname,$udom,$symb)=@_;
+    my ($text,$uname,$udom,$symb,$target)=@_;
     if (!($uname && $udom)) {
 	(my $cursymb, my $courseid,$udom,$uname)=
 	    &Apache::lonxml::whichuser($symb);
 	if (!$symb) { $symb=$cursymb; }
     }
     if (!$symb) { $symb=&symbread(); }
-    return '<a href="/adm/grades?symb='.$symb.'&student='.$uname.
-	'&userdom='.$udom.'&command=submission">'.$text.'</a>';
+    $symb=&Apache::lonnet::escape($symb);
+    if ($target) { $target="target=\"$target\""; }
+    return '<a href="/adm/grades?&command=submission&'.
+	'symb='.$symb.'&student='.$uname.
+	'&userdom='.$udom.'" '.$target.'>'.$text.'</a>';
+}
+##############################################
+
+=pod
+
+=item * &pgrdlink()
+
+Inputs: $text $uname $udom $symb $target
+
+Returns: A link to grades.pm such as to see the PGRD view of a student
+
+=cut
+
+###############################################
+sub pgrdlink {
+    my $link=&submlink(@_);
+    $link=~s/(&command=submission)/$1&showgrading=yes/;
+    return $link;
+}
+##############################################
+
+=pod
+
+=item * &pprmlink()
+
+Inputs: $text $uname $udom $symb $target
+
+Returns: A link to parmset.pm such as to see the PPRM view of a
+student andn resource
+
+=cut
+
+###############################################
+sub pprmlink {
+    my ($text,$uname,$udom,$symb,$target)=@_;
+    if (!($uname && $udom)) {
+	(my $cursymb, my $courseid,$udom,$uname)=
+	    &Apache::lonxml::whichuser($symb);
+	if (!$symb) { $symb=$cursymb; }
+    }
+    if (!$symb) { $symb=&symbread(); }
+    $symb=&Apache::lonnet::escape($symb);
+    if ($target) { $target="target=\"$target\""; }
+    return '<a href="/adm/parmset?&command=set&'.
+	'symb='.$symb.'&uname='.$uname.
+	'&udom='.$udom.'" '.$target.'>'.$text.'</a>';
 }
 ##############################################
 
@@ -2608,14 +2657,18 @@ ENDROLE
 	    $formaction=~s/\/+/\//g;
             unless ($customtitle) {  #this is for resources; directories have customtitle, and crumbs and select recent are created in lonpubdir.pm  
                 my $parentpath = '';
-                if ($thisdisfn =~ m-(.+/)[^/]*$-) {
+                my $lastitem = '';
+                if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
                     $parentpath = $1;
+                    $lastitem = $2;
+                } else {
+                    $lastitem = $thisdisfn;
                 }
 	        $titleinfo = &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
                       '<font face="Arial, Helvetica, sans-serif"><b>Construction Space</b>:</font>&nbsp;'. 
                       '<form name="dirs" method="post" action="'.$formaction
 		    .'" target="_top"><tt><b>'
-		    .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."</b></tt><br />"
+		    .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />"
 		    .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
 		    .'</form>'
 		    .&Apache::lonmenu::constspaceform();
@@ -2719,52 +2772,37 @@ Returns number of sections.
 ###############################################
 sub get_sections {
     my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;
+    if (!($cdom && $cnum)) { return 0; }
     my $cid = $cdom.'_'.$cnum;
     my $numsections = 0;
-    if ($cdom && $cnum) {
-        if (!defined($possible_roles) || (grep/^st$/,@$possible_roles)) {
-            my ($classlist) = &Apache::loncoursedata::get_classlist($cid,$cdom,$cnum);
-            my $sec_index = &Apache::loncoursedata::CL_SECTION();
-            my $status_index = &Apache::loncoursedata::CL_STATUS();
-            while (my ($student,$data) = each %$classlist) {
-                my ($section,$status) = ($data->[$sec_index],
-                                         $data->[$status_index]);
-                unless ($section eq '' || $section =~ /^\s*$/) {
-                    if (!defined($$sectioncount{$section})) {
-                        $$sectioncount{$section} = 1;
-                        $numsections ++;
-                    } else {
-                        $$sectioncount{$section} ++;
-                    }
-                }
-            }
-        }
-        my %courseroles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
-        foreach my $user (sort keys %courseroles) {
-            if ($user =~ /^(\w{2})/) {
-                my $role = $1;
-                if (!defined($possible_roles) || (grep/^$role$/,@$possible_roles)) {
-                    if ($role eq 'cr') {
-                        if ($user =~ m-^$role/[^/]*/[^/]*/[^/]*:[^:]*:[^:]*:(\w+)-) {
-                            if (!defined($$sectioncount{$1})) {
-                                $$sectioncount{$1} = 1;
-                                $numsections ++;
-                            } else {
-                                $$sectioncount{$1} ++;
-                            }
-                        }
-                    }
-                    if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) {
-                        if (!defined($$sectioncount{$1})) {
-                            $$sectioncount{$1} = 1;
-                            $numsections ++;
-                        } else {
-                            $$sectioncount{$1} ++;
-                        }
-                    }
-                }
-            }
-        }
+
+    if (!defined($possible_roles) || (grep/^st$/,@$possible_roles)) {
+	my ($classlist) = &Apache::loncoursedata::get_classlist($cid,$cdom,$cnum);
+	my $sec_index = &Apache::loncoursedata::CL_SECTION();
+	my $status_index = &Apache::loncoursedata::CL_STATUS();
+	while (my ($student,$data) = each %$classlist) {
+	    my ($section,$status) = ($data->[$sec_index],
+				     $data->[$status_index]);
+	    unless ($section eq '-1' || $section =~ /^\s*$/) {
+		if (!defined($$sectioncount{$section})) { $numsections++; }
+		$$sectioncount{$section}++;
+	    }
+	}
+    }
+    my %courseroles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
+    foreach my $user (sort(keys(%courseroles))) {
+	if ($user !~ /^(\w{2})/) { next; }
+	my ($role) = ($user =~ /^(\w{2})/);
+	if ($possible_roles && !(grep(/^$role$/,@$possible_roles))) { next; }
+	my $section;
+	if ($role eq 'cr' &&
+	    $user =~ m-^$role/[^/]*/[^/]*/[^/]*:[^:]*:[^:]*:(\w+)-) {
+	    $section=$1;
+	}
+	if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) { $section=$1; }
+	if (!defined($section) || $section eq '-1') { next; }
+	if (!defined($$sectioncount{$section})) { $numsections++; } 
+	$$sectioncount{$section}++;
     }
     return $numsections;
 }
@@ -3376,6 +3414,9 @@ they are plotted.  If undefined, default
 =item @Values: An array of array references.  Each array reference holds data
 to be plotted in a stacked bar chart.
 
+=item If the final element of @Values is a hash reference the key/value
+pairs will be added to the graph definition.
+
 =back
 
 Returns: