". $ENV{'course.'.$ENV{'request.course.id'}.'.description'}. "
\n"); - $r->print("".localtime(time)."
"); + my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits(); + if (defined($starttime) || defined($endtime)) { + # Inform the user what the time limits on the data are. + $r->print(''.&mt('Statistics on submissions from [_1] to [_2]', + &Apache::lonlocal::locallocaltime($starttime), + &Apache::lonlocal::locallocaltime($endtime)). + '
'); + } + $r->print("".&mt('Compiled on [_1]', + &Apache::lonlocal::locallocaltime(time))."
"); $r->rflush(); if ($show eq 'grouped') { &output_html_grouped_by_sequence($r); @@ -385,10 +328,10 @@ ENDMSG &output_html_ungrouped($r); } } elsif ($output_mode eq 'excel') { - $r->print("Preparing Excel Spreadsheet
"); + $r->print(''.&mt('Preparing Excel Spreadsheet').'
'); &output_excel($r); } else { - $r->print("Not implemented
"); + $r->print(''.&mt('Not implemented').'
'); } return; } @@ -583,6 +526,8 @@ sub output_excel { $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. time.'_'.rand(1000000000).'.xls'; # + my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits(); + # my $excel_workbook = undef; my $excel_sheet = undef; # @@ -595,9 +540,9 @@ sub output_excel { # Check for errors if (! defined($excel_workbook)) { $r->log_error("Error creating excel spreadsheet $filename: $!"); - $r->print("Problems creating new Excel file. ". + $r->print(&mt("Problems creating new Excel file. ". "This error has been logged. ". - "Please alert your LON-CAPA administrator"); + "Please alert your LON-CAPA administrator.")); return ; } # @@ -612,7 +557,9 @@ sub output_excel { if (length($sheetname) > 31) { $sheetname = substr($sheetname,0,31); } - $excel_sheet = $excel_workbook->addworksheet($sheetname); + $excel_sheet = $excel_workbook->addworksheet( + &Apache::loncommon::clean_excel_name($sheetname) + ); # # Put the course description in the header $excel_sheet->write($rows_output,$cols_output++, @@ -639,6 +586,22 @@ sub output_excel { $excel_sheet->write($rows_output,$cols_output++,$sectionstring); $cols_output += scalar(@Sections); # + # Time restrictions + my $time_string; + if (defined($starttime)) { + # call localtime but not lonlocal:locallocaltime because excel probably + # cannot handle localized text. Probably. + $time_string .= 'Data collected from '.localtime($time_string); + if (defined($endtime)) { + $time_string .= ' to '.localtime($endtime); + } + $time_string .= '.'; + } elsif (defined($endtime)) { + # See note above about lonlocal:locallocaltime + $time_string .= 'Data collected before '.localtime($endtime).'.'; + } + + # # Put the date in there too $excel_sheet->write($rows_output,$cols_output++, 'Compiled on '.localtime(time)); @@ -646,9 +609,23 @@ sub output_excel { $rows_output++; $cols_output=0; # - # Add the headers + # Long Headersheaders foreach my $field (@Fields) { next if ($field->{'name'} eq 'problem_num'); + if (exists($field->{'long_title'})) { + $excel_sheet->write($rows_output,$cols_output++, + $field->{'long_title'}); + } else { + $excel_sheet->write($rows_output,$cols_output++,''); + } + } + $rows_output++; + $cols_output=0; + # Brief headers + foreach my $field (@Fields) { + next if ($field->{'name'} eq 'problem_num'); + # Use english for excel as I am not sure how well excel handles + # other character sets.... $excel_sheet->write($rows_output,$cols_output++,$field->{'title'}); } $rows_output++; @@ -682,7 +659,8 @@ sub output_excel { $excel_workbook->close(); # Tell the user where to get their excel file $r->print(''. - 'Your Excel spreadsheet.'."\n"); + ''. + &mt('Your Excel Spreadsheet').''."\n"); $r->rflush(); return; } @@ -711,8 +689,7 @@ sub statistics_html_table_data { } $row .= '>'; if (exists($field->{'special'}) && $field->{'special'} eq 'link') { - $row .= ''; + $row .= ''; } if (exists($field->{'format'})) { $row .= sprintf($field->{'format'},$data->{$field->{'name'}}); @@ -739,7 +716,7 @@ sub statistics_table_header { 'document.Statistics.sortby.value='."'".$field->{'name'}."'". ';document.Statistics.submit();">'; } - $header_row .= $field->{'title'}; + $header_row .= &mt($field->{'title'}); if ($options =~ /sortable/) { $header_row.= ''; } @@ -750,7 +727,7 @@ sub statistics_table_header { $header_row .= ''; - $header_row .= 'plot)'; + $header_row .= &mt('plot').')'; } $header_row .= ''; } @@ -783,7 +760,6 @@ sub plot_statistics { } } return if (! defined($sortfield) || $sortfield eq ''); - &Apache::lonnet::logthis('data field = '.$datafield); # my $Max = 0; my $problem_num = 0; @@ -833,8 +809,13 @@ sub plot_statistics { } } - $r->print("
".&DrawGraph(\@Data,$title,'Problem Number',$yaxis, - $Max)."
\n"); + $r->print("".&Apache::loncommon::DrawBarGraph($title, + 'Problem Number', + $yaxis, + $Max, + undef, # colors + undef, # labels + \@Data)."
\n"); # # Print out the data $ENV{'form.sortby'} = 'Contents'; @@ -842,56 +823,102 @@ sub plot_statistics { return; } -############################################### -############################################### +######################################################## +######################################################## -=pod +=pod -=item &DrawGraph() +=item &get_statistics() -=cut +Wrapper routine from the call to loncoursedata::get_problem_statistics. +Calls lonstathelpers::get_time_limits() to limit the data set by time. -############################################### -############################################### -sub DrawGraph { - my ($values,$title,$xaxis,$yaxis,$Max)=@_; - $title = '' if (! defined($title)); - $xaxis = '' if (! defined($xaxis)); - $yaxis = '' if (! defined($yaxis)); - # - my $sendValues = join(',', @$values); - my $sendCount = scalar(@$values); - $Max =1 if ($Max < 1); - if ( int($Max) < $Max ) { - $Max++; - $Max = int($Max); - } - my @GData = ($title,$xaxis,$yaxis,$Max,$sendCount,$sendValues); - return ').')
';
-}
+Inputs: $sequence, $resource, $part, $problem_num
+
+Returns: Hash reference with statistics data from
+loncoursedata::get_problem_statistics.
+=cut
+
+########################################################
+########################################################
sub get_statistics {
my ($sequence,$resource,$part,$problem_num) = @_;
#
+ my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
my $symb = $resource->{'symb'};
my $courseid = $ENV{'request.course.id'};
#
- my $students = \@Apache::lonstatistics::Students;
- if ($Apache::lonstatistics::SelectedSections[0] eq 'all') {
- $students = undef;
- }
my $data = &Apache::loncoursedata::get_problem_statistics
- ($students,$symb,$part,$courseid);
+ (\@Apache::lonstatistics::SelectedSections,
+ $Apache::lonstatistics::enrollment_status,
+ $symb,$part,$courseid,$starttime,$endtime);
$data->{'part'} = $part;
$data->{'problem_num'} = $problem_num;
$data->{'container'} = $sequence->{'title'};
$data->{'title'} = $resource->{'title'};
- $data->{'title.link'} = $resource->{'src'};
+ $data->{'title.link'} = $resource->{'src'}.'?symb='.
+ &Apache::lonnet::escape($resource->{'symb'});
#
+ $data->{'deg_of_disc'} = &compute_discrimination_factor($resource,$part,$sequence);
return $data;
}
+
+###############################################
+###############################################
+
+=pod
+
+=item &compute_discrimination_factor()
+
+Inputs: $Resource, $Sequence
+
+Returns: integer between -1 and 1
+
+=cut
+
+###############################################
+###############################################
+sub compute_discrimination_factor {
+ my ($resource,$part,$sequence) = @_;
+ my @Resources;
+ foreach my $res (@{$sequence->{'contents'}}) {
+ next if ($res->{'symb'} eq $resource->{'symb'});
+ push (@Resources,$res->{'symb'});
+ }
+ #
+ # rank
+ my $ranking =
+ &Apache::loncoursedata::rank_students_by_scores_on_resources
+ (\@Resources,
+ \@Apache::lonstatistics::SelectedSections,
+ $Apache::lonstatistics::enrollment_status,undef);
+ #
+ # compute their percent scores on the problems in the sequence,
+ my $number_to_grab = int(scalar(@{$ranking})/4);
+ my $num_students = scalar(@{$ranking});
+ my @BottomSet = map { $_->[&Apache::loncoursedata::RNK_student()];
+ } @{$ranking}[0..$number_to_grab];
+ my @TopSet =
+ map {
+ $_->[&Apache::loncoursedata::RNK_student()];
+ } @{$ranking}[($num_students-$number_to_grab)..($num_students-1)];
+ my ($bottom_sum,$bottom_max) =
+ &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@BottomSet);
+ my ($top_sum,$top_max) =
+ &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@TopSet);
+ my $deg_of_disc;
+ if ($top_max == 0 || $bottom_max==0) {
+ $deg_of_disc = 'nan';
+ } else {
+ $deg_of_disc = ($top_sum/$top_max) - ($bottom_sum/$bottom_max);
+ }
+ #&Apache::lonnet::logthis(' '.$top_sum.'/'.$top_max.
+ # ' - '.$bottom_sum.'/'.$bottom_max);
+ return $deg_of_disc;
+}
+
###############################################
###############################################
@@ -899,6 +926,8 @@ sub get_statistics {
=item &ProblemStatisticsLegend()
+HELP This needs to be localized, or at least generated automatically.
+
=cut
###############################################