--- loncom/interface/lonstatistics.pm 2004/02/19 20:17:01 1.97 +++ loncom/interface/lonstatistics.pm 2004/06/04 21:42:18 1.103 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.97 2004/02/19 20:17:01 matthew Exp $ +# $Id: lonstatistics.pm,v 1.103 2004/06/04 21:42:18 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -471,13 +471,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 +905,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 +921,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 +987,10 @@ sub DisplayClasslist { $Str .= '
'."\n"; $Str .= ''."\n"; foreach my $field (@Fields) { - $Str .= ''; } $Str .= ''."\n"; @@ -1052,7 +1071,7 @@ sub CreateMainMenu { # # Create the menu my $Str; - $Str .= '

'.&mt('Please select a report to generate').'

'; + $Str .= '

'.&mt('Please select a report to generate').'

'; foreach my $reportdata (@reports) { $Str .='

'. @@ -1106,15 +1125,21 @@ sub handler { $r->print(''. &mt('Course Statistics and Charts'). "\n". - &Apache::loncommon::bodytag('Course Statistics and Charts')."\n". - &Apache::loncommon::help_open_faq(139). - &Apache::loncommon::help_open_bug('Statistics and Charts')); + &Apache::loncommon::bodytag('Course Statistics and Charts')); $r->rflush(); # # Either print out a menu for them or send them to a report + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/statistics', + title=>'Statistics', + text =>'Statistics', + faq=>139, + bug=>'Statistics and Charts'}); if (! exists($ENV{'form.reportSelected'}) || $ENV{'form.reportSelected'} eq '') { - $r->print(&CreateMainMenu()); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + (undef,&mt('Statistics Main Page')). + &CreateMainMenu()); } else { # if (! &Apache::lonmysql::verify_sql_connection()) { @@ -1154,21 +1179,38 @@ sub handler { if($GoToPage eq 'activitylog') { # &Apache::lonproblemstatistics::Activity(); } elsif($GoToPage eq 'problem_statistics') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/statistics?reportselected=problem_statistics', + text=>'Overall Problem Statistics'}); &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c); } elsif($GoToPage eq 'problem_analysis') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/statistics?reportselected=problem_analysis', + text=>'Detailed Problem Analysis'}); &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c); } elsif($GoToPage eq 'submissiontime_analysis') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=> + '/adm/statistics?reportselected=submissiontime_analysis', + text=>'Submission Time Plots'}); &Apache::lonsubmissiontimeanalysis::BuildSubmissionTimePage($r,$c); } elsif($GoToPage eq 'student_submission_reports') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=> + '/adm/statistics?reportselected=student_submission_reports', + text=>'Student Submission Reports'}); &Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c); } elsif($GoToPage eq 'correct_problems_plot') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/statistics?reportselected=correct_problems_plot', + text=>'Correct Problems Plot'}); &Apache::loncorrectproblemplot::BuildCorrectProblemsPage($r,$c); } elsif($GoToPage eq 'student_assessment') { + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/statistics?reportselected=student_assessment', + text=>'Chart'}); &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c); - } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') { -# &Apache::lonproblemstatistics::BuildGraphicChart($r,$c); - } elsif($GoToPage eq 'Correct-problems Plot') { - # &Apache::lonpercentage::BuildPercentageGraph($r,$c); } # $r->print("\n");

'.$field. + $Str .= ''.$field. '