--- loncom/interface/lonstatistics.pm 2009/12/11 00:12:21 1.144.2.1
+++ loncom/interface/lonstatistics.pm 2010/04/12 15:55:29 1.149
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.144.2.1 2009/12/11 00:12:21 raeburn Exp $
+# $Id: lonstatistics.pm,v 1.149 2010/04/12 15:55:29 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -400,15 +400,15 @@ sub StudentDataSelect {
my $Str = "\n";
$Str .= '<select name="'.$elementname.'" ';
if ($status ne 'single') {
- $Str .= 'multiple="true" ';
+ $Str .= 'multiple="multiple" ';
}
$Str .= 'size="'.$numvisible.'" >'."\n";
#
# Deal with 'all'
- $Str .= ' <option value="all" ';
+ $Str .= ' <option value="all"';
foreach (@SelectedStudentData) {
if ($_ eq 'all') {
- $Str .= 'selected ';
+ $Str .= ' selected="selected"';
last;
}
}
@@ -416,10 +416,10 @@ sub StudentDataSelect {
#
# Loop through the student data fields
foreach my $item (@StudentDataOrder) {
- $Str .= ' <option value="'.$item.'" ';
+ $Str .= ' <option value="'.$item.'"';
foreach (@SelectedStudentData) {
if ($item eq $_ ) {
- $Str .= 'selected ';
+ $Str .= ' selected="selected"';
last;
}
}
@@ -501,14 +501,14 @@ sub map_select {
my $form = "\n";
$form .= '<select name="'.$elementname.'" ';
if ($status ne 'single') {
- $form .= 'multiple="true" ';
+ $form .= 'multiple="multiple" ';
}
$form .= 'size="'.$numvisible.'" >'."\n";
#
# Put in option for 'all'
- $form .= ' <option value="all" ';
+ $form .= ' <option value="all"';
if ($selected_maps[0] eq 'all') {
- $form .= 'selected ';
+ $form .= ' selected="selected"';
}
$form .= ">all</option>\n";
#
@@ -521,10 +521,10 @@ sub map_select {
$navmap = shift(@sequences);
}
foreach my $seq (@sequences){
- $form .= ' <option value="'.$seq->symb.'" ';
+ $form .= ' <option value="'.$seq->symb.'"';
foreach (@selected_maps) {
if ($seq->symb eq $_) {
- $form .= 'selected ';
+ $form .= ' selected="selected"';
last;
}
}
@@ -550,16 +550,16 @@ sub SectionSelect {
my $Str = "\n";
$Str .= '<select name="'.$elementname.'" ';
if ($status ne 'single') {
- $Str .= 'multiple="true" ';
+ $Str .= 'multiple="multiple" ';
}
$Str .= 'size="'.$numvisible.'" >'."\n";
#
# Loop through the sequences
foreach my $s (@Sections) {
- $Str .= ' <option value="'.$s.'" ';
+ $Str .= ' <option value="'.$s.'"';
foreach (&get_selected_sections()) {
if ($s eq $_) {
- $Str .= 'selected ';
+ $Str .= ' selected="selected"';
last;
}
}
@@ -585,16 +585,16 @@ sub GroupSelect {
my $Str = "\n";
$Str .= '<select name="'.$elementname.'" ';
if ($status ne 'single') {
- $Str .= 'multiple="true" ';
+ $Str .= 'multiple="multiple" ';
}
$Str .= 'size="'.$numvisible.'" >'."\n";
#
# Loop through the groups
foreach my $s (@Groups) {
- $Str .= ' <option value="'.$s.'" ';
+ $Str .= ' <option value="'.$s.'"';
foreach my $group (&get_selected_groups()) {
if ($s eq $group) {
- $Str .= 'selected ';
+ $Str .= ' selected="selected"';
last;
}
}
@@ -738,63 +738,52 @@ sub DisplayClasslist {
sub CreateMainMenu {
#
# Define menu data
- my @reports = ({ internal_name => 'problem_statistics',
- name => &mt('Overall Problem Statistics'),
- short_description =>
- &mt('Student performance statistics on all problems.'),
- },
- { internal_name => 'problem_analysis',
- name => &mt('Detailed Problem Analysis'),
- short_description =>
- &mt('Detailed statistics and graphs of student performance on problems.'),
- },
- { internal_name => 'submissiontime_analysis',
- name => &mt('Submission Time Plots'),
- 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 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'),
- short_description =>
- &mt('Display a histogram of student performance in the course.'),
- },
-# { internal_name => 'grading_analysis',
-# name => &mt('Detailed Grading Analysis'),
-# short_description =>
-# &mt('Display statistics about who graded who.'),
-# },
-# { internal_name => 'student_assessment',
-# name => &mt('Problem Status Chart'),
-# short_description =>
-# &mt('Brief view of each students performance in course.'),
-# },
- # 'percentage' => 'Correct-problems Plot',
- # 'activitylog' => 'Activity Log',
- );
- #
- # Create the menu
- my $Str;
- $Str .= '<h2>'.&mt('Please select a report to generate').'</h2>';
- foreach my $reportdata (@reports) {
- $Str .=' <h3><a href="/adm/statistics?reportSelected='.
- $reportdata->{'internal_name'}.'" >'.
- $reportdata->{'name'}."</a></h3>\n";
- $Str .= ' '.(' 'x8).$reportdata->{'short_description'}.
- "\n";
- }
- $Str .="</dl>\n";
- #
- return $Str;
+ my @reports = (
+ {categorytitle => 'Statistics and Analyses',
+ items => [
+ {url => '/adm/statistics?reportSelected=problem_statistics',
+ permission => 'F',
+ icon => 'document-open.png',
+ linktext => ('Overall Problem Statistics'),
+ linktitle => ('Student performance statistics on all problems.')},
+
+ {url => '/adm/statistics?reportSelected=problem_analysis',
+ permission => 'F',
+ icon => 'edit-find.png',
+ linktext => ('Detailed Problem Analysis'),
+ linktitle => ('Detailed statistics and graphs of student performance on problems.')},
+ ]},
+ {categorytitle => 'Plots',
+ items => [
+ {url => '/adm/statistics?reportSelected=submissiontime_analysis',
+ permission => 'F',
+ icon => 'subtimpl.png',
+ linktext => ('Submission Time Plots'),
+ linktitle => ('Display and analysis of submission times on assessments.')},
+
+ {url => '/adm/statistics?reportSelected=correct_problems_plot',
+ permission => 'F',
+ icon => 'coprplot.png',
+ linktext => ('Correct Problems Plot'),
+ linktitle => ('Display a histogram of student performance in the course.')},
+ ]},
+ {categorytitle => 'Reports',
+ items => [
+ {url => '/adm/statistics?reportSelected=student_submission_reports',
+ permission => 'F',
+ icon => 'edit-copy.png',
+ linktext => ('Student Submission Reports'),
+ linktitle => ('Prepare reports of student submissions.')},
+
+ {url => '/adm/statistics?reportSelected=survey_reports',
+ permission => 'F',
+ icon => 'docs.png',
+ linktext => ('Survey Reports'),
+ linktitle => ('Prepare reports on survey results.')},
+ ]});
+
+return &Apache::lonhtmlcommon::generate_menu(@reports);
+
}
@@ -872,7 +861,7 @@ ENDSTYLE
.'</p>');
$r->print('<p>'.
&mt('Course Statistics and Charts cannot be '.
- 'retrieved until the database is restarted. '.
+ 'retrieved until the database is restarted. '.
'Your data is intact but cannot be displayed '.
'at this time.').'</p>');
$r->print(&Apache::loncommon::end_page());
@@ -892,7 +881,7 @@ ENDSTYLE
my $GoToPage = $env{'form.reportSelected'};
#
$r->print('<input type="hidden" name="reportSelected" value="'.
- $GoToPage.'">');
+ $GoToPage.'" />');
if($GoToPage eq 'activitylog') {
# &Apache::lonproblemstatistics::Activity();
} elsif($GoToPage eq 'problem_statistics') {