Diff for /loncom/interface/lonstatistics.pm between versions 1.132 and 1.137

version 1.132, 2006/05/01 19:37:34 version 1.137, 2006/08/18 15:15:38
Line 63  use Apache::loncoursedata; Line 63  use Apache::loncoursedata;
 use Apache::lonhtmlcommon;  use Apache::lonhtmlcommon;
 use Apache::lonmysql;  use Apache::lonmysql;
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::longroup;
 use Time::HiRes;  use Time::HiRes;
 #  #
 # Statistics Packages  # Statistics Packages
Line 75  use Apache::lonpercentage; Line 76  use Apache::lonpercentage;
 use Apache::lonstudentsubmissions();  use Apache::lonstudentsubmissions();
 use Apache::lonsurveyreports();  use Apache::lonsurveyreports();
 use Apache::longradinganalysis();  use Apache::longradinganalysis();
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
   
 #######################################################  #######################################################
 #######################################################  #######################################################
Line 230  sub PrepareClasslist { Line 233  sub PrepareClasslist {
     $enrollment_status = $env{'form.Status'} if (exists($env{'form.Status'}));      $enrollment_status = $env{'form.Status'} if (exists($env{'form.Status'}));
     #      #
     # Get groupmembership      # Get groupmembership
     my (%curr_groups,$classgroups,$studentgroups);      my ($classgroups,$studentgroups);
     my $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum);      my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
     if ($numgroups) {      if (%curr_groups) {
         ($classgroups,$studentgroups) =           ($classgroups,$studentgroups) = 
                      &Apache::loncoursedata::get_group_memberships($classlist,      &Apache::loncoursedata::get_group_memberships($classlist,
                                                                    $cdom,$cnum);                                                            $field_names,
     $cdom,$cnum);
     }      }
     my $now = time;      my $now = time;
   
Line 428  sub get_selected_groups { Line 432  sub get_selected_groups {
 =item &section_and_enrollment_description  =item &section_and_enrollment_description
   
 Returns a string describing the currently selected section(s), group(s) and   Returns a string describing the currently selected section(s), group(s) and 
 enrollment status.    access status.  
   
 Inputs: mode = 'plaintext' or 'localized'  (defaults to 'localized')  Inputs: mode = 'plaintext' or 'localized'  (defaults to 'localized')
     'plaintext' is used for example in Excel spreadsheets.      'plaintext' is used for example in Excel spreadsheets.
Line 445  sub section_and_enrollment_description { Line 449  sub section_and_enrollment_description {
     my @groups = &Apache::lonstatistics::get_selected_groups();      my @groups = &Apache::lonstatistics::get_selected_groups();
     my $description;      my $description;
     if ($mode eq 'localized') {      if ($mode eq 'localized') {
         $description = &mt('Unable to determine section, groups and enrollment');          $description = &mt('Unable to determine section, groups and access status');
     } elsif ($mode eq 'plaintext') {      } elsif ($mode eq 'plaintext') {
         $description = 'Unable to determine section, groups and enrollment';          $description = 'Unable to determine section, groups and access status';
     } else {      } else {
         $description = 'Bad parameter passed to lonstatistics::section_and_enrollment_description';          $description = 'Bad parameter passed to lonstatistics::section_and_enrollment_description';
         &Apache::lonnet::logthis($description);          &Apache::lonnet::logthis($description);
Line 455  sub section_and_enrollment_description { Line 459  sub section_and_enrollment_description {
     $description = &section_or_group_text($mode,'section',@sections).      $description = &section_or_group_text($mode,'section',@sections).
  ' '.&section_or_group_text($mode,'group',@groups);   ' '.&section_or_group_text($mode,'group',@groups);
     if ($mode eq 'localized') {      if ($mode eq 'localized') {
         $description .= &mt(' [_1] enrollment status.',$env{'form.Status'});          $description .= &mt(' [_1] access status.',$env{'form.Status'});
     } elsif ($mode eq 'plaintext') {      } elsif ($mode eq 'plaintext') {
         $description .= ' '.$env{'form.Status'}.' enrollment status.';          $description .= ' '.$env{'form.Status'}.' access status.';
     }      }
     return $description;      return $description;
 }  }
Line 927  sub DisplayClasslist { Line 931  sub DisplayClasslist {
     $Str .= '<tr>';      $Str .= '<tr>';
     $Str .= '<th align="center"><b>'.&mt('Sections').'</b></th>';      $Str .= '<th align="center"><b>'.&mt('Sections').'</b></th>';
     $Str .= '<th align="center"><b>'.&mt('Groups').'</b></th>';      $Str .= '<th align="center"><b>'.&mt('Groups').'</b></th>';
     $Str .= '<th align="center"><b>'.&mt('Enrollment Status').'</b></th>';      $Str .= '<th align="center"><b>'.&mt('Access Status').'</b></th>';
     $Str .= '</tr>'.$/;      $Str .= '</tr>'.$/;
     $Str .= '<tr>';      $Str .= '<tr>';
     $Str .= '<td>'.      $Str .= '<td>'.
Line 1016  sub DisplayClasslist { Line 1020  sub DisplayClasslist {
             $Str .= '<td>';              $Str .= '<td>';
             if ($field eq 'fullname' || $field eq 'username') {              if ($field eq 'fullname' || $field eq 'username') {
                 $Str .= '<a href="/adm/statistics?reportSelected=';                  $Str .= '<a href="/adm/statistics?reportSelected=';
                 $Str .= &Apache::lonnet::escape('student_assessment');                  $Str .= &escape('student_assessment');
                 $Str .= '&sort='.&Apache::lonnet::escape($env{'form.sort'});                  $Str .= '&sort='.&escape($env{'form.sort'});
                 $Str .= '&SelectedStudent=';                  $Str .= '&SelectedStudent=';
                 $Str .= &Apache::lonnet::escape($sname).'">';                  $Str .= &escape($sname).'">';
                 $Str .= $student->{$field}.'&nbsp';                  $Str .= $student->{$field}.'&nbsp';
                 $Str .= '</a>';                  $Str .= '</a>';
             } elsif ($field eq 'status') {              } elsif ($field eq 'status') {

Removed from v.1.132  
changed lines
  Added in v.1.137


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