--- loncom/interface/lonstatistics.pm 2004/02/02 21:45:12 1.94 +++ loncom/interface/lonstatistics.pm 2004/03/01 16:39:19 1.100 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.94 2004/02/02 21:45:12 matthew Exp $ +# $Id: lonstatistics.pm,v 1.100 2004/03/01 16:39:19 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,15 +65,18 @@ use Apache::lonhomework; use Apache::loncommon; use Apache::loncoursedata; use Apache::lonhtmlcommon; +use Apache::lonmysql; +use Apache::lonlocal; +use Time::HiRes; +# +# Statistics Packages use Apache::lonproblemanalysis(); use Apache::lonsubmissiontimeanalysis(); use Apache::loncorrectproblemplot(); use Apache::lonproblemstatistics(); use Apache::lonstudentassessment(); use Apache::lonpercentage; -use Apache::lonmysql; -use Apache::lonlocal; -use Time::HiRes; +use Apache::lonstudentsubmissions(); ####################################################### ####################################################### @@ -503,20 +506,6 @@ sub PrepareCourseData { $top_map = $top if (ref($top)); @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY'); @Assessments = @{$assessments} if (ref($assessments) eq 'ARRAY'); - # - # Compute column widths - foreach my $seq (@Sequences) { - my $name_length = length($seq->{'title'}); - my $num_parts = $seq->{'num_assess_parts'}; - # - # Use 3 digits for each the sum and total, which means 7 total... - my $num_col = $num_parts+7; - if ($num_col < $name_length) { - $num_col = $name_length; - } - $seq->{'base_width'} = $name_length; - $seq->{'width'} = $num_col; - } return; } @@ -1042,6 +1031,11 @@ sub CreateMainMenu { short_description => &mt('Display and analysis of submission times on assessments.'), }, + { internal_name => 'student_submission_reports', + name => &mt('Student Submission Reports'), + short_description => + &mt('Prepare Excel spreadsheets of student submissions.'), + }, { internal_name => 'correct_problems_plot', name => &mt('Correct Problems Plot'), short_description => @@ -1058,7 +1052,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 .='

'. @@ -1109,15 +1103,24 @@ sub handler { 'SelectedStudent']); # # Give the LON-CAPA page header - $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'). - &Apache::loncommon::help_open_faq(139). - &Apache::loncommon::help_open_bug('Statistics and Charts')); + $r->print(''. + &mt('Course Statistics and Charts'). + "\n". + &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()) { @@ -1157,19 +1160,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");