[BACK]Return to loncommon.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.237 and 1.241

version 1.237, 2004/12/01 23:18:23 version 1.241, 2004/12/04 02:05:23
Line 2608  ENDROLE Line 2608  ENDROLE
     $formaction=~s/\/+/\//g;      $formaction=~s/\/+/\//g;
             unless ($customtitle) {  #this is for resources; directories have customtitle, and crumbs and select recent are created in lonpubdir.pm                unless ($customtitle) {  #this is for resources; directories have customtitle, and crumbs and select recent are created in lonpubdir.pm  
                 my $parentpath = '';                  my $parentpath = '';
                 if ($thisdisfn =~ m-(.+/)[^/]*$-) {                  my $lastitem = '';
                   if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
                     $parentpath = $1;                      $parentpath = $1;
                       $lastitem = $2;
                   } else {
                       $lastitem = $thisdisfn;
                 }                  }
         $titleinfo = &Apache::loncommon::help_open_menu('','','','',3,'Authoring').          $titleinfo = &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
                       '<font face="Arial, Helvetica, sans-serif"><b>Construction Space</b>:</font>&nbsp;'.                         '<font face="Arial, Helvetica, sans-serif"><b>Construction Space</b>:</font>&nbsp;'. 
                       '<form name="dirs" method="post" action="'.$formaction                        '<form name="dirs" method="post" action="'.$formaction
     .'" target="_top"><tt><b>'      .'" 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()')      .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
     .'</form>'      .'</form>'
     .&Apache::lonmenu::constspaceform();      .&Apache::lonmenu::constspaceform();
Line 2719  Returns number of sections. Line 2723  Returns number of sections.
 ###############################################  ###############################################
 sub get_sections {  sub get_sections {
     my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;      my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;
       if (!($cdom && $cnum)) { return 0; }
     my $cid = $cdom.'_'.$cnum;      my $cid = $cdom.'_'.$cnum;
     my $numsections = 0;      my $numsections = 0;
     if ($cdom && $cnum) {  
         if (!defined($possible_roles) || (grep/^st$/,@$possible_roles)) {      if (!defined($possible_roles) || (grep/^st$/,@$possible_roles)) {
             my ($classlist) = &Apache::loncoursedata::get_classlist($cid,$cdom,$cnum);   my ($classlist) = &Apache::loncoursedata::get_classlist($cid,$cdom,$cnum);
             my $sec_index = &Apache::loncoursedata::CL_SECTION();   my $sec_index = &Apache::loncoursedata::CL_SECTION();
             my $status_index = &Apache::loncoursedata::CL_STATUS();   my $status_index = &Apache::loncoursedata::CL_STATUS();
             while (my ($student,$data) = each %$classlist) {   while (my ($student,$data) = each %$classlist) {
                 my ($section,$status) = ($data->[$sec_index],      my ($section,$status) = ($data->[$sec_index],
                                          $data->[$status_index]);       $data->[$status_index]);
                 unless ($section eq '' || $section =~ /^\s*$/) {      unless ($section eq '-1' || $section =~ /^\s*$/) {
                     if (!defined($$sectioncount{$section})) {   if (!defined($$sectioncount{$section})) { $numsections++; }
                         $$sectioncount{$section} = 1;   $$sectioncount{$section}++;
                         $numsections ++;      }
                     } else {   }
                         $$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})/);
         my %courseroles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);   if ($possible_roles && !(grep(/^$role$/,@$possible_roles))) { next; }
         foreach my $user (sort keys %courseroles) {   my $section;
             if ($user =~ /^(\w{2})/) {   if ($role eq 'cr' &&
                 my $role = $1;      $user =~ m-^$role/[^/]*/[^/]*/[^/]*:[^:]*:[^:]*:(\w+)-) {
                 if (!defined($possible_roles) || (grep/^$role$/,@$possible_roles)) {      $section=$1;
                     if ($role eq 'cr') {   }
                         if ($user =~ m-^$role/[^/]*/[^/]*/[^/]*:[^:]*:[^:]*:(\w+)-) {   if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) { $section=$1; }
                             if (!defined($$sectioncount{$1})) {   if (!defined($section) || $section eq '-1') { next; }
                                 $$sectioncount{$1} = 1;   if (!defined($$sectioncount{$section})) { $numsections++; } 
                                 $numsections ++;   $$sectioncount{$section}++;
                             } else {  
                                 $$sectioncount{$1} ++;  
                             }  
                         }  
                     }  
                     if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) {  
                         if (!defined($$sectioncount{$1})) {  
                             $$sectioncount{$1} = 1;  
                             $numsections ++;  
                         } else {  
                             $$sectioncount{$1} ++;  
                         }  
                     }  
                 }  
             }  
         }  
     }      }
     return $numsections;      return $numsections;
 }  }
Line 3376  they are plotted.  If undefined, default Line 3365  they are plotted.  If undefined, default
 =item @Values: An array of array references.  Each array reference holds data  =item @Values: An array of array references.  Each array reference holds data
 to be plotted in a stacked bar chart.  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  =back
   
 Returns:  Returns:
Line 3887  sub escape_double { Line 3879  sub escape_double {
 #   Escapes the last element of a full URL.  #   Escapes the last element of a full URL.
 sub escape_url {  sub escape_url {
     my ($url)   = @_;      my ($url)   = @_;
     my @urlslices = split(/\//, $url);      my @urlslices = split(/\//, $url,-1);
     my $lastitem = &Apache::lonnet::escape(pop(@urlslices));      my $lastitem = &Apache::lonnet::escape(pop(@urlslices));
     return join('/',@urlslices).'/'.$lastitem;      return join('/',@urlslices).'/'.$lastitem;
 }  }
Removed from v.1.237  
changed lines
  Added in v.1.241

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>