--- loncom/interface/lonstatistics.pm 2004/03/01 16:39:19 1.100
+++ loncom/interface/lonstatistics.pm 2004/06/15 14:22:45 1.104
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.100 2004/03/01 16:39:19 matthew Exp $
+# $Id: lonstatistics.pm,v 1.104 2004/06/15 14:22:45 matthew 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();
#######################################################
#######################################################
@@ -471,13 +472,22 @@ assessments.
#######################################################
#######################################################
sub Sequences_with_Assess {
+ my ($mode) = @_;
+ $mode = 'selected' if (! defined($mode));
my @Sequences_to_Show;
- foreach my $map_symb (@SelectedMaps) {
- foreach my $sequence (@Sequences) {
- next if ($sequence->{'symb'} ne $map_symb && $map_symb ne 'all');
- next if ($sequence->{'num_assess'} < 1);
+ foreach my $sequence (@Sequences) {
+ next if ($sequence->{'num_assess'} < 1);
+ if ($mode eq 'all') {
push (@Sequences_to_Show,$sequence);
+ } elsif ($mode eq 'selected') {
+ foreach my $map_symb (@SelectedMaps) {
+ if ($sequence->{'symb'} eq $map_symb || $map_symb eq 'all'){
+ push (@Sequences_to_Show,$sequence);
+ last; # Only put it in once
+ }
+ }
}
+
}
return @Sequences_to_Show;
}
@@ -896,7 +906,13 @@ Ensures all student data is up to date.
###############################################
###############################################
sub Gather_Full_Student_Data {
- my ($r) = @_;
+ my ($r,$formname,$inputname) = @_;
+ my $status_type;
+ if (defined($formname)) {
+ $status_type = 'inline';
+ } else {
+ $status_type = 'popup';
+ }
my $c = $r->connection();
#
&Apache::loncoursedata::clear_internal_caches();
@@ -906,7 +922,8 @@ sub Gather_Full_Student_Data {
# Open the progress window
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
($r,&mt('Student Data Compilation Status'),
- &mt('Student Data Compilation Progress'), scalar(@Students));
+ &mt('Student Data Compilation Progress'), scalar(@Students),
+ $status_type,undef,$formname,$inputname);
#
while (my $student = shift @Students) {
return if ($c->aborted());
@@ -971,7 +988,10 @@ sub DisplayClasslist {
$Str .= '
'."\n";
$Str .= ''."\n";
foreach my $field (@Fields) {
- $Str .= ''.$field.
+ $Str .= ' | '.$field.
' | ';
}
$Str .= ' '."\n";
@@ -1036,6 +1056,11 @@ sub CreateMainMenu {
short_description =>
&mt('Prepare Excel spreadsheets 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'),
short_description =>
@@ -1181,6 +1206,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',
|