loncom/interface/lonstatistics.pm - diff

Return to lonstatistics.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonstatistics.pm between versions 1.119 and 1.122

-version 1.119, 2005/03/14 20:28:21
+version 1.122, 2005/03/21 19:47:53
  Line 359  sub get_selected_sections {
  =item &section_and_enrollment_description
+ Returns a string describing the currenly selected section(s) and
+ enrollment status.
+ Inputs: mode = 'plaintext' or 'localized'  (defaults to 'localized')
+     'plaintext' is used for example in Excel spreadsheets.
+ Returns: scalar description string.
  =cut
  #######################################################
  #######################################################
  sub section_and_enrollment_description {
+     my ($mode) = @_;
+     if (! defined($mode)) { $mode = 'localized'; }
      my @sections = &Apache::lonstatistics::get_selected_sections();
-     my $description = &mt('Unable to determine section and enrollment');
+     my $description;
+     if ($mode eq 'localized') {
+         $description = &mt('Unable to determine section and enrollment');
+     } elsif ($mode eq 'plaintext') {
+         $description = 'Unable to determine section and enrollment';
+     } else {
+         $description = 'Bad parameter passed to lonstatistics::section_and_enrollment_description';
+         &Apache::lonnet::logthis($description);
+     }
      if (scalar(@sections) == 1 && $sections[0] ne 'all') {
-         $description = &mt('Section [_1]. [_2] enrollment status',
+         if ($mode eq 'localized') {
-                            $sections[0],$ENV{'form.Status'});
+             $description = &mt('Section [_1]. [_2] enrollment status.',
+                                $sections[0],$ENV{'form.Status'});
+         } elsif ($mode eq 'plaintext') {
+             $description = 'Section '.$sections[0].'. '.
+                 $ENV{'form.Status'}.' enrollment status.';
+         }
      } elsif (scalar(@sections) && $sections[0] eq 'all') {
-         $description = &mt('All sections. [_1] enrollment status',
+         if ($mode eq 'localized') {
-                            $ENV{'form.Status'});
+             $description = &mt('All sections. [_1] enrollment status.',
+                                $ENV{'form.Status'});
+         } elsif ($mode eq 'plaintext') {
+             $description = 'All sections. '.
+                 $ENV{'form.Status'}.' enrollment status.';
+         }
      } elsif (scalar(@sections)) {
          my $lastsection = pop(@sections);
-         $description = &mt('Sections [_1] and [_2]. [_3] enrollment status',
+         if ($mode eq 'localized') {
-                            join(', ',@sections),$lastsection,
+             $description = &mt('Sections [_1] and [_2]. [_3] enrollment status.',
-                            $ENV{'form.Status'});
+                                join(', ',@sections),$lastsection,
+                                $ENV{'form.Status'});
+         } elsif ($mode eq 'plaintext') {
+             $description =
+                 'Sections '.join(', ',@sections).' and '.$lastsection.'. '.
+                 $ENV{'form.Status'}.' enrollment status.';
+         }
      }
      return $description;
  }
- Line 587  sub selected_sequences_with_assessments
+ Line 620  sub selected_sequences_with_assessments
                                                 sub { shift->is_map(); },1,0,1);
      my @sequences_with_assessments;
      for my $sequence ($navmap->getById('0.0'), @sequences) {
- 	if ($navmap->hasResource($sequence,sub { shift->is_problem(); }, 0)){
+ 	if ($navmap->hasResource($sequence,sub { shift->is_problem(); },0,1)){
              push(@sequences_with_assessments,$sequence);
          }
      }

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

Removed from v.1.119
changed lines
	Added in v.1.122