--- loncom/interface/lonstatistics.pm 2004/06/04 17:41:35 1.102
+++ loncom/interface/lonstatistics.pm 2005/02/17 08:29:43 1.114
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.102 2004/06/04 17:41:35 matthew Exp $
+# $Id: lonstatistics.pm,v 1.114 2005/02/17 08:29:43 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -77,6 +77,7 @@ use Apache::lonproblemstatistics();
use Apache::lonstudentassessment();
use Apache::lonpercentage;
use Apache::lonstudentsubmissions();
+use Apache::lonsurveyreports();
#######################################################
#######################################################
@@ -228,10 +229,10 @@ sub PrepareClasslist {
}
#
# Set up %StudentData
- @StudentDataOrder = qw/fullname username domain id section status/;
+ @StudentDataOrder = qw/fullname username domain id section status comments/;
foreach my $field (@StudentDataOrder) {
- $StudentData{$field}->{'title'} = $field;
- $StudentData{$field}->{'base_width'} = length($field);
+ $StudentData{$field}->{'title'} = &mt($field);
+ $StudentData{$field}->{'base_width'} = length(&mt($field));
$StudentData{$field}->{'width'} =
$StudentData{$field}->{'base_width'};
}
@@ -785,191 +786,72 @@ sub SectionSelect {
return $Str;
}
-#######################################################
-#######################################################
-
-=pod
-
-=item &CreateAndParseOutputSelector()
-
-Construct a selection list of options for output and parse output selections.
-
-=cut
-
-#######################################################
-#######################################################
-sub OutputDescriptions {
- my (@OutputOptions) = @_;
- my $Str = '';
- $Str .= "
Output Modes \n";
- $Str .= "\n";
- foreach my $outputmode (@OutputOptions) {
- $Str .=" ".$outputmode->{'name'}." \n";
- $Str .=" ".$outputmode->{'description'}." \n";
- }
- $Str .= " \n";
- return $Str;
-}
-
-sub CreateAndParseOutputSelector {
- my ($elementname,$default,@OutputOptions) = @_;
- my $output_mode;
- my $show;
- my $Str = '';
- #
- # Format for output options is 'mode, restrictions';
- my $selected = $default;
- if (exists($ENV{'form.'.$elementname})) {
- if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) {
- $selected = $ENV{'form.'.$elementname}->[0];
- } else {
- $selected = $ENV{'form.'.$elementname};
- }
- }
- #
- # Set package variables describing output mode
- $output_mode = 'html';
- $show = 'all';
- foreach my $option (@OutputOptions) {
- next if ($option->{'value'} ne $selected);
- $output_mode = $option->{'mode'};
- $show = $option->{'show'};
- }
- #
- # Build the form element
- $Str = qq//;
- foreach my $option (@OutputOptions) {
- if (exists($option->{'special'}) &&
- $option->{'special'} =~ /do not show/) {
- next;
- }
- $Str .= "\n".' {'value'} eq $selected);
- $Str .= ">".&mt($option->{'name'})."<\/option>";
- }
- $Str .= "\n ";
- return ($Str,$output_mode,$show);
-}
-
-###############################################
-###############################################
-
-=pod
-
-=item &Gather_Student_Data()
-
-Ensures all student data is up to date.
-
-=cut
-
-###############################################
-###############################################
-sub Gather_Student_Data {
- my ($r) = @_;
- my $c = $r->connection();
- #
- &Apache::loncoursedata::clear_internal_caches();
- #
- my @Sequences = &Apache::lonstatistics::Sequences_with_Assess();
- #
- my @Students = @Apache::lonstatistics::Students;
- #
- # Open the progress window
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,'Statistics Compilation Status',
- 'Statistics Compilation Progress', scalar(@Students));
- #
- while (my $student = shift @Students) {
- return if ($c->aborted());
- my ($status,undef) = &Apache::loncoursedata::ensure_current_data
- ($student->{'username'},$student->{'domain'},
- $ENV{'request.course.id'});
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- &mt('last student'));
- }
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- $r->rflush();
-}
-
-###############################################
-###############################################
-
-=pod
-
-=item &Gather_Full_Student_Data()
-
-Ensures all student data is up to date.
-
-=cut
-
-###############################################
-###############################################
-sub Gather_Full_Student_Data {
- my ($r) = @_;
- my $c = $r->connection();
- #
- &Apache::loncoursedata::clear_internal_caches();
- #
- my @Students = @Apache::lonstatistics::Students;
- #
- # Open the progress window
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,&mt('Student Data Compilation Status'),
- &mt('Student Data Compilation Progress'), scalar(@Students));
- #
- while (my $student = shift @Students) {
- return if ($c->aborted());
- my ($status,undef) = &Apache::loncoursedata::ensure_current_full_data
- ($student->{'username'},$student->{'domain'},
- $ENV{'request.course.id'});
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- &mt('last student'));
- }
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- $r->rflush();
-}
-
##################################################
##################################################
sub DisplayClasslist {
my ($r)=@_;
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({text=>'Select One Student'});
#
- my @Fields = ('fullname','username','domain','id','section');
+ # Output some of the standard interface components
+ my $Str;
+ $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Select One Student');
+ $Str .= '
'."\n";
+ $Str .= '';
+ $Str .= ''.&mt('Sections').' ';
+ $Str .= ''.&mt('Enrollment Status').' ';
+ $Str .= ' '.$/;
+ $Str .= '';
+ $Str .= ''.
+ &Apache::lonstatistics::SectionSelect('Section','multiple',5).
+ ' ';
+ $Str .= ''.
+ &Apache::lonhtmlcommon::StatusOptions(undef,undef,5).
+ ' ';
+
+ $Str .= ' '.$/;
+ $Str .= '
';
+ $Str .= ' ';
+ $r->print($Str);
+ $r->rflush();
+ #
+ my @Fields = ('fullname','username','domain','id','section','status');
#
- my $Str='';
+ $Str = '';
if (! @Students) {
if ($SelectedSections[0] eq 'all') {
if (lc($ENV{'form.Status'}) eq 'any') {
- $Str .= 'There are no students in the course. ';
+ $Str .= ''.
+ &mt('There are no students in the course.').
+ ' ';
} elsif (lc($ENV{'form.Status'}) eq 'active') {
- $Str .= 'There are no currently enrolled students in '.
- 'the course. ';
+ $Str .= ''.
+ &mt('There are no currently enrolled students in the course.').
+ ' ';
} elsif (lc($ENV{'form.Status'}) eq 'expired') {
- $Str .= 'There are no previously enrolled '.
- 'students in the course. ';
+ $Str .= ''.
+ &mt('There are no previously enrolled students in the course.').
+ ' ';
}
} else {
my $sections;
- if (@SelectedSections == 1) {
- $sections = 'section '.$SelectedSections[0];
- } elsif (@SelectedSections > 2) {
- $sections = 'sections '.join(', ',@SelectedSections);
- $sections =~ s/, ([^,])*$/, and $1/;
- } else {
- $sections = 'sections '.join(' and ',@SelectedSections);
- }
if (lc($ENV{'form.Status'}) eq 'any') {
- $Str .= 'There are no students in '.$sections.'. ';
+ $Str .= ''.
+ &mt('There are no students in the selected sections.').
+ ' ';
} elsif (lc($ENV{'form.Status'}) eq 'active') {
- $Str .= 'There are no currently enrolled students '.
- 'in '.$sections.'. ';
+ $Str .= ''.
+ &mt('There are no currently enrolled students in the selected sections.').
+ ' ';
} elsif (lc($ENV{'form.Status'}) eq 'expired') {
- $Str .= 'There are no previously enrolled students '.
- 'in '.$sections.'. ';
+ $Str .= ''.
+ &mt('There are no previously enrolled students in the selected sections.').
+ ' ';
}
}
$Str.= ''.
- 'Return to the chart. ';
+ &mt('Click here to return to the chart').'';
$r->print($Str);
$r->rflush();
return;
@@ -983,7 +865,7 @@ sub DisplayClasslist {
$Str .= ''.$field.
+ 'sort='.$field.'">'.&mt($field).
' ';
}
$Str .= ''."\n";
@@ -1008,6 +890,8 @@ sub DisplayClasslist {
$Str .= &Apache::lonnet::escape($sname).'">';
$Str .= $student->{$field}.' ';
$Str .= '';
+ } elsif ($field eq 'status') {
+ $Str .= &mt($student->{$field});
} else {
$Str .= $student->{$field};
}
@@ -1046,7 +930,12 @@ sub CreateMainMenu {
{ internal_name => 'student_submission_reports',
name => &mt('Student Submission Reports'),
short_description =>
- &mt('Prepare Excel spreadsheets of student submissions.'),
+ &mt('Prepare reports of student submissions.'),
+ },
+ { internal_name => 'survey_reports',
+ name => &mt('Survey Reports'),
+ short_description =>
+ &mt('Prepare reports on survey results.'),
},
{ internal_name => 'correct_problems_plot',
name => &mt('Correct Problems Plot'),
@@ -1115,9 +1004,19 @@ sub handler {
'SelectedStudent']);
#
# Give the LON-CAPA page header
- $r->print(''.
+ my $style = <
+ ul.sub_studentans { list-style-type: none }
+ ul.sub_correctans { list-style-type: none }
+ tr.even { background-color: \#CCCCCC }
+ td.essay { border: 1px solid gray; }
+
+ENDSTYLE
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print($html.''.
&mt('Course Statistics and Charts').
- " \n".
+ ' '.$style.
+ "\n".
&Apache::loncommon::bodytag('Course Statistics and Charts'));
$r->rflush();
#
@@ -1193,6 +1092,12 @@ sub handler {
'/adm/statistics?reportselected=student_submission_reports',
text=>'Student Submission Reports'});
&Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c);
+ } elsif($GoToPage eq 'survey_reports') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>
+ '/adm/statistics?reportselected=survey_reports',
+ text=>'Survey Reports'});
+ &Apache::lonsurveyreports::BuildSurveyReportsPage($r,$c);
} elsif($GoToPage eq 'correct_problems_plot') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/statistics?reportselected=correct_problems_plot',