--- loncom/interface/loncommon.pm	2004/11/08 22:50:37	1.227
+++ loncom/interface/loncommon.pm	2004/11/23 07:29:24	1.234
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.227 2004/11/08 22:50:37 albertel Exp $
+# $Id: loncommon.pm,v 1.234 2004/11/23 07:29:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -379,7 +379,7 @@ sub coursebrowser_javascript {
    return (<<ENDSTDBRW);
 <script type="text/javascript" language="Javascript" >
     var stdeditbrowser;
-    function opencrsbrowser(formname,uname,udom,desc) {
+    function opencrsbrowser(formname,uname,udom,desc,extra_element) {
         var url = '/adm/pickcourse?';
         var filter;
         if (filter != null) {
@@ -396,6 +396,12 @@ sub coursebrowser_javascript {
         url += 'form=' + formname + '&cnumelement='+uname+
 	                            '&cdomelement='+udom+
                                     '&cnameelement='+desc;
+        if (extra_element !=null && extra_element != '' && formname == 'rolechoice') {
+            url += '&roleelement='+extra_element;
+            if (domainfilter == null || domainfilter == '') {
+                url += '&domainfilter='+extra_element;
+            }
+        }
         var title = 'Course_Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
         options += ',width=700,height=600';
@@ -407,9 +413,9 @@ ENDSTDBRW
 }
 
 sub selectcourse_link {
-   my ($form,$unameele,$udomele,$desc)=@_;
+   my ($form,$unameele,$udomele,$desc,$extra_element)=@_;
     return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'","'.$desc.'");'."'>".&mt('Select Course')."</a>";
+        '","'.$udomele.'","'.$desc.'","'.$extra_element.'");'."'>".&mt('Select Course')."</a>";
 }
 
 =pod
@@ -2556,7 +2562,7 @@ sub bodytag {
     if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
 # construct main body tag
     my $bodytag = <<END;
-<style>
+<style type="text/css">
 h1, h2, h3, th { font-family: Arial, Helvetica, sans-serif }
 a:focus { color: red; background: yellow } 
 </style>
@@ -2577,7 +2583,6 @@ END
 # No Remote
 	my $roleinfo=(<<ENDROLE);
 <td bgcolor="$tabbg" align="right">
-<p>
 <font size="2" face="Arial, Helvetica, sans-serif">
     $ENV{'environment.firstname'}
     $ENV{'environment.middlename'}
@@ -2588,14 +2593,29 @@ END
 <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
 <br />
 <font size="2" face="Arial, Helvetica, sans-serif">$realm</font>&nbsp;
-</p>
 </td>
 ENDROLE
         my $titleinfo = '<font face="Arial, Helvetica, sans-serif" size="+3" color="'.
-                        $font.'"><b>'.$title.'</b></font>';
+		$font.'"><b>'.$title.'</b></font>';
         if ($customtitle) {
             $titleinfo = $customtitle;
         } 
+	if ($ENV{'request.state'} eq 'construct') {
+	    my ($uname,$thisdisfn)=
+		($ENV{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
+	    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
+	    $formaction=~s/\/+/\//g;
+	    $titleinfo = '<form name="dirs" method="post" action="'.$formaction
+		.'" target="_top">'
+		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'_top','/priv','',-1,1)."<br />"
+		.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
+		.'</form>'
+		.&Apache::lonmenu::constspaceform();
+
+	    &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
+	    if ($thisdisfn!~m|/$|) {  $forcereg=1; }
+	}
+
         return $bodytag.&Apache::lonmenu::menubuttons($forcereg,'web',
                                                       $forcereg).
       '<table bgcolor="'.$pgbg.'" width="100%" border="0" cellspacing="3" cellpadding="3"><tr><td rowspan="3" bgcolor="'.$tabbg.'">'.$titleinfo.'</td>'.$roleinfo.'</tr></table>';
@@ -2665,6 +2685,76 @@ sub get_users_function {
 
 ###############################################
 
+=pod
+
+=item get_sections
+
+Determines all the sections for a course including
+sections with students and sections containing other roles.
+Incoming parameters: domain, course number, reference to 
+section hash (keys to be section/group IDs), reference to 
+array containing roles for which sections should be gathered
+(optional). If the fourth argument is undefined, sections
+are gathered for any role.
+ 
+Returns number of sections.
+
+=cut
+
+###############################################
+sub get_sections {
+    my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;
+    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} ++;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return $numsections;
+}
+
+
 sub get_posted_cgi {
     my $r=shift;
 
@@ -3291,6 +3381,10 @@ sub DrawBarGraph {
                   '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
                   ]; 
     }
+    my $extra_settings = {};
+    if (ref($Values[-1]) eq 'HASH') {
+        $extra_settings = pop(@Values);
+    }
     #
     my $identifier = &get_cgi_id();
     my $id = 'cgi.'.$identifier;        
@@ -3366,6 +3460,11 @@ sub DrawBarGraph {
     $ValuesHash{$id.'.bar_width'} = $bar_width;
     $ValuesHash{$id.'.labels'} = join(',',@Labels);
     #
+    # Deal with other parameters
+    while (my ($key,$value) = each(%$extra_settings)) {
+        $ValuesHash{$id.'.'.$key} = $value;
+    }
+    #
     &Apache::lonnet::appenv(%ValuesHash);
     return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
 }