--- loncom/interface/lonstatistics.pm 2010/09/12 17:40:33 1.148.2.5
+++ 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.148.2.5 2010/09/12 17:40:33 raeburn Exp $
+# $Id: lonstatistics.pm,v 1.149 2010/04/12 15:55:29 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -405,10 +405,10 @@ sub StudentDataSelect {
$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;
}
}
@@ -456,20 +456,11 @@ sub selected_sequences_with_assessments
return ('Can not open Coursemap');
}
#
- my $mapurl;
- if (&Apache::loncommon::needs_gci_custom()) {
- my $cid = $env{'request.course.id'};
- if ($cid) {
- $mapurl = '/uploaded/'.$env{'course.'.$cid.'.domain'}.'/'.$env{'course.'.$cid.'.num'}.'/default_1261144274.sequence';
- }
- }
- my @sequences = $navmap->retrieveResources($mapurl,
+ my @sequences = $navmap->retrieveResources(undef,
sub { shift->is_map(); },1,0,1);
- unless (&Apache::loncommon::needs_gci_custom()) {
- my $toplevelseq = $navmap->getById('0.0');
- if (!grep(/^\Q$toplevelseq\E$/,@sequences)) {
- unshift(@sequences,$toplevelseq);
- }
+ my $toplevelseq = $navmap->getById('0.0');
+ if (!grep(/^\Q$toplevelseq\E$/,@sequences)) {
+ unshift(@sequences,$toplevelseq);
}
my @sequences_with_assessments;
@@ -513,15 +504,13 @@ sub map_select {
$form .= 'multiple="multiple" ';
}
$form .= 'size="'.$numvisible.'" >'."\n";
- unless (&Apache::loncommon::needs_gci_custom()) {
- #
- # Put in option for 'all'
- $form .= ' <option value="all" ';
- if ($selected_maps[0] eq 'all') {
- $form .= 'selected ';
- }
- $form .= ">all</option>\n";
+ #
+ # Put in option for 'all'
+ $form .= ' <option value="all"';
+ if ($selected_maps[0] eq 'all') {
+ $form .= ' selected="selected"';
}
+ $form .= ">all</option>\n";
#
# Loop through the sequences
my @sequences = &selected_sequences_with_assessments('all');
@@ -532,15 +521,11 @@ sub map_select {
$navmap = shift(@sequences);
}
foreach my $seq (@sequences){
- $form .= ' <option value="'.$seq->symb.'" ';
- if ((&Apache::loncommon::needs_gci_custom()) && (@selected_maps == 1)) {
- $form .= 'selected ';
- } else {
- foreach (@selected_maps) {
- if ($seq->symb eq $_) {
- $form .= 'selected ';
- last;
- }
+ $form .= ' <option value="'.$seq->symb.'"';
+ foreach (@selected_maps) {
+ if ($seq->symb eq $_) {
+ $form .= ' selected="selected"';
+ last;
}
}
$form .= '>'.$seq->compTitle."</option>\n";
@@ -571,10 +556,10 @@ sub SectionSelect {
#
# 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;
}
}
@@ -606,10 +591,10 @@ sub GroupSelect {
#
# 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;
}
}
@@ -781,19 +766,7 @@ sub CreateMainMenu {
icon => 'coprplot.png',
linktext => ('Correct Problems Plot'),
linktitle => ('Display a histogram of student performance in the course.')},
- ]});
- if (&Apache::loncommon::needs_gci_custom()) {
- push(@reports,
- {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.')},
- ]});
- } else {
- push(@reports,
+ ]},
{categorytitle => 'Reports',
items => [
{url => '/adm/statistics?reportSelected=student_submission_reports',
@@ -808,7 +781,6 @@ sub CreateMainMenu {
linktext => ('Survey Reports'),
linktitle => ('Prepare reports on survey results.')},
]});
- }
return &Apache::lonhtmlcommon::generate_menu(@reports);
@@ -845,28 +817,6 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
if ($r->header_only) { return OK; }
- my $gcicustom = &Apache::loncommon::needs_gci_custom();
- if ($gcicustom) {
- my $now = time;
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
- my $duedate = $courseopt->{$env{'request.course.id'}.'.0.duedate'};
- if ((!$duedate) || ($duedate > $now)) {
- $r->print(&Apache::loncommon::start_page("Course Statistics"));
- $r->print('<h3>'.&mt('Display of statistics').'</h3>');
- if ($duedate > $now) {
- $r->print('<p>'.&mt('Aggregate test performance data will be available after the Concept Test end date: [_1].',
- &Apache::lonlocal::locallocaltime($duedate)).'</p>');
- } else {
- $r->print('<p>'.
- &mt('Aggregate test performance data unavailable without definition of an end date for the Concept Test.').'</p>');
- }
- $r->print(&Apache::loncommon::end_page());
- return OK;
- }
- }
-
#
# Extract form elements from query string
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
@@ -931,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') {
@@ -952,9 +902,9 @@ ENDSTYLE
&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'});
+ ({href=>
+ '/adm/statistics?reportselected=student_submission_reports',
+ text=>'Student Submission Reports'});
&Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c);
} elsif($GoToPage eq 'survey_reports') {
&Apache::lonhtmlcommon::add_breadcrumb
@@ -972,11 +922,7 @@ ENDSTYLE
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/statistics?reportselected=student_assessment',
text=>'Chart'});
- if ($gcicustom) {
- $r->print(&mt('Only aggregate performance data are available for Concept Tests.'));
- } else {
- &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
- }
+ &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
} elsif($GoToPage eq 'grading_analysis') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/statistics?reportselected=grading_anaylsis',