'."\n".
''."\n".
''.
@@ -815,7 +839,7 @@ sub output_html_stats {
my ($r)=@_;
&compute_all_statistics($r);
$r->print(&html_preamble());
- &sort_data($ENV{'form.sortby'});
+ &sort_data($env{'form.sortby'});
#
my $count=0;
foreach my $data (@StatsArray) {
@@ -837,7 +861,7 @@ sub output_html_stats {
sub html_preamble {
my $Str='';
$Str .= "".
- $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
+ $env{'course.'.$env{'request.course.id'}.'.description'}.
"\n";
my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
if (defined($starttime) || defined($endtime)) {
@@ -931,7 +955,7 @@ sub sequence_html_header {
sub sequence_html_output {
my ($seq) = @_;
- my $data = $SeqStat{$seq->{'symb'}};
+ my $data = $SeqStat{$seq->symb};
my $row = ' ';
foreach my $field (@SeqFields) {
next if ($field->{'selected'} ne 'yes');
@@ -961,7 +985,7 @@ sub sequence_html_output {
sub make_plot {
my ($r,$plot) = @_;
&compute_all_statistics($r);
- &sort_data($ENV{'form.sortby'});
+ &sort_data($env{'form.sortby'});
if ($plot eq 'degrees') {
°rees_plot($r);
} elsif ($plot eq 'tries statistics') {
@@ -1215,8 +1239,8 @@ END
sub plot_dropdown {
my $current = '';
#
- if (defined($ENV{'form.plot'})) {
- $current = $ENV{'form.plot'};
+ if (defined($env{'form.plot'})) {
+ $current = $env{'form.plot'};
}
#
my @Additional_Plots = (
@@ -1260,40 +1284,21 @@ sub Excel_output {
&compute_all_statistics($r);
my $c = $r->connection;
return if ($c->aborted());
+ #
+ my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
##
## Create the excel workbook
- my $filename = '/prtspool/'.
- $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
- time.'_'.rand(1000000000).'.xls';
- my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
- #
- # Create sheet
- my $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
- #
- # Check for errors
- if (! defined($excel_workbook)) {
- $r->log_error("Error creating excel spreadsheet $filename: $!");
- $r->print(&mt("Problems creating new Excel file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator."));
- return 0;
- }
- #
- # The excel spreadsheet stores temporary data in files, then put them
- # together. If needed we should be able to disable this (memory only).
- # The temporary directory must be specified before calling 'addworksheet'.
- # File::Temp is used to determine the temporary directory.
- $excel_workbook->set_tempdir($Apache::lonnet::tmpdir);
+ my ($excel_workbook,$filename,$format) =
+ &Apache::loncommon::create_workbook($r);
+ return if (! defined($excel_workbook));
#
# Add a worksheet
- my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ my $sheetname = $env{'course.'.$env{'request.course.id'}.'.description'};
if (length($sheetname) > 31) {
$sheetname = substr($sheetname,0,31);
}
my $excel_sheet = $excel_workbook->addworksheet(
&Apache::loncommon::clean_excel_name($sheetname));
- #
- my $format = &Apache::loncommon::define_excel_formats($excel_workbook);
##
## Begin creating excel sheet
##
@@ -1301,17 +1306,17 @@ sub Excel_output {
#
# Put the course description in the header
$excel_sheet->write($rows_output,$cols_output++,
- $ENV{'course.'.$ENV{'request.course.id'}.'.description'},
+ $env{'course.'.$env{'request.course.id'}.'.description'},
$format->{'h1'});
$cols_output += 3;
#
# Put a description of the sections listed
my $sectionstring = '';
$excel_sheet->write($rows_output,$cols_output++,
- &Apache::lonstathelpers::sections_description
- (@Apache::lonstatistics::SelectedSections),
+ &Apache::lonstatistics::section_and_enrollment_description('plaintext'),
$format->{'h3'});
- $cols_output += scalar(@Apache::lonstatistics::SelectedSections);
+ $cols_output += scalar(&Apache::lonstatistics::get_selected_sections());
+ $cols_output += scalar(&Apache::lonstatistics::get_selected_groups());
#
# Time restrictions
my $time_string;
@@ -1343,9 +1348,8 @@ sub Excel_output {
##
&write_headers($excel_sheet,$format,\$rows_output,\$cols_output,
\@SeqFields);
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- next if ($seq->{'num_assess'} < 1);
- my $data = $SeqStat{$seq->{'symb'}};
+ foreach my $seq (@sequences) {
+ my $data = $SeqStat{$seq->symb};
$cols_output=0;
foreach my $field (@SeqFields) {
next if ($field->{'selected'} ne 'yes');
@@ -1441,10 +1445,9 @@ sub write_headers {
sub compute_statistics_on_sequence {
my ($seq) = @_;
my @Data;
- foreach my $res (@{$seq->{'contents'}}) {
- next if ($res->{'type'} ne 'assessment');
- foreach my $part (@{$res->{'parts'}}) {
- next if ($res->{'partdata'}->{$part}->{'Survey'});
+ foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+ foreach my $part (@{$res->parts}) {
+ next if ($res->is_survey($part));
#
# This is where all the work happens
my $data = &get_statistics($seq,$res,$part,scalar(@StatsArray)+1);
@@ -1462,9 +1465,8 @@ sub compute_all_statistics {
return;
}
my $c = $r->connection;
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ foreach my $seq (@sequences) {
last if ($c->aborted);
- next if ($seq->{'num_assess'} < 1);
&compute_sequence_statistics($seq);
&compute_statistics_on_sequence($seq);
}
@@ -1551,20 +1553,21 @@ 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 $symb = $resource->symb;
+ my $courseid = $env{'request.course.id'};
#
my $data = &Apache::loncoursedata::get_problem_statistics
- (\@Apache::lonstatistics::SelectedSections,
+ ([&Apache::lonstatistics::get_selected_sections()],
+ [&Apache::lonstatistics::get_selected_groups()],
$Apache::lonstatistics::enrollment_status,
$symb,$part,$courseid,$starttime,$endtime);
$data->{'symb'} = $symb;
$data->{'part'} = $part;
$data->{'problem_num'} = $problem_num;
- $data->{'container'} = $sequence->{'title'};
- $data->{'title'} = $resource->{'title'};
- $data->{'title.link'} = $resource->{'src'}.'?symb='.
- &Apache::lonnet::escape($resource->{'symb'});
+ $data->{'container'} = $sequence->compTitle;
+ $data->{'title'} = $resource->compTitle;
+ $data->{'title.link'} = $resource->src.'?symb='.
+ &escape($resource->symb);
#
if ($SelectedFields{'deg_of_disc'}) {
$data->{'deg_of_disc'} =
@@ -1573,16 +1576,16 @@ sub get_statistics {
#
# Store in metadata if computations were done for all students
if ($data->{'num_students'} > 1) {
- my @Sections = @Apache::lonstatistics::SelectedSections;
+ my @Sections = &Apache::lonstatistics::get_selected_sections();
my $sections = '"'.join(' ',@Sections).'"';
$sections =~ s/&+/_/g; # Ensure no special characters
$data->{'sections'}=$sections;
- $data->{'course'} = $ENV{'request.course.id'};
- my $urlres=(&Apache::lonnet::decode_symb($resource->{'symb'}))[2];
+ $data->{'course'} = $env{'request.course.id'};
+ my $urlres=(&Apache::lonnet::decode_symb($resource->symb))[2];
$data->{'urlres'}=$urlres;
my %storestats =
&LONCAPA::lonmetadata::dynamic_metadata_storage($data);
- my ($dom,$user) = $urlres=~/^(\w+)\/(\w+)/;
+ my ($dom,$user) = ($urlres=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)});
&Apache::lonnet::put('nohist_resevaldata',\%storestats,$dom,$user);
}
#
@@ -1590,16 +1593,16 @@ sub get_statistics {
($data->{'num_solved'}+0.1);
#
# Get the due date for research purposes (commented out most of the time)
-# $data->{'duedate'} =
-# &Apache::lonnet::EXT('resource.'.$part.'.duedate',$symb);
-# $data->{'opendate'} =
-# &Apache::lonnet::EXT('resource.'.$part.'.opendate',$symb);
-# $data->{'maxtries'} =
-# &Apache::lonnet::EXT('resource.'.$part.'.maxtries',$symb);
-# $data->{'hinttries'} =
-# &Apache::lonnet::EXT('resource.'.$part.'.hinttries',$symb);
-# $data->{'weight'} =
-# &Apache::lonnet::EXT('resource.'.$part.'.weight',$symb);
+# my $duedate = &Apache::lonnet::EXT('resource.'.$part.'.duedate',$symb);;
+# my $opendate = &Apache::lonnet::EXT('resource.'.$part.'.opendate',$symb);
+# my $maxtries = &Apache::lonnet::EXT('resource.'.$part.'.maxtries',$symb);
+# my $hinttries = &Apache::lonnet::EXT('resource.'.$part.'.hinttries',$symb);
+ my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',$symb);
+ $data->{'weight'} = $weight;
+# $data->{'duedate'} = $duedate;
+# $data->{'opendate'} = $opendate;
+# $data->{'maxtries'} = $maxtries;
+# $data->{'hinttries'} = $hinttries;
# $data->{'resptypes'} = join(',',@{$resource->{'partdata'}->{$part}->{'ResponseTypes'}});
return $data;
}
@@ -1620,11 +1623,12 @@ Returns: integer between -1 and 1
###############################################
###############################################
sub compute_discrimination_factor {
- my ($resource,$part,$sequence) = @_;
+ my ($resource,$part,$seq) = @_;
+ my $symb = $resource->symb;
my @Resources;
- foreach my $res (@{$sequence->{'contents'}}) {
- next if ($res->{'symb'} eq $resource->{'symb'});
- push (@Resources,$res->{'symb'});
+ foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)){
+ next if ($res->symb eq $symb);
+ push (@Resources,$res->symb);
}
#
# rank
@@ -1632,9 +1636,10 @@ sub compute_discrimination_factor {
my $ranking =
&Apache::loncoursedata::rank_students_by_scores_on_resources
(\@Resources,
- \@Apache::lonstatistics::SelectedSections,
+ [&Apache::lonstatistics::get_selected_sections()],
+ [&Apache::lonstatistics::get_selected_groups()],
$Apache::lonstatistics::enrollment_status,undef,
- $starttime,$endtime);
+ $starttime,$endtime, $symb);
#
# compute their percent scores on the problems in the sequence,
my $number_to_grab = int(scalar(@{$ranking})/4);
@@ -1644,16 +1649,16 @@ sub compute_discrimination_factor {
my @TopSet =
map {
$_->[&Apache::loncoursedata::RNK_student()];
- } @{$ranking}[($num_students-$number_to_grab)..($num_students-1)];
+ } @{$ranking}[-$number_to_grab..0];
if (! @BottomSet || (@BottomSet == 1 && $BottomSet[0] eq '') ||
! @TopSet || (@TopSet == 1 && $TopSet[0] eq '')) {
return 'nan';
}
my ($bottom_sum,$bottom_max) =
- &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@BottomSet,
+ &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@BottomSet,
undef,$starttime,$endtime);
my ($top_sum,$top_max) =
- &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@TopSet,
+ &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@TopSet,
undef,$starttime,$endtime);
my $deg_of_disc;
if ($top_max == 0 || $bottom_max==0) {
@@ -1685,21 +1690,23 @@ sub compute_discrimination_factor {
###############################################
sub compute_sequence_statistics {
my ($seq) = @_;
- my $symb = $seq->{'symb'};
+ my $symb = $seq->symb;
my @Resources;
- foreach my $res (@{$seq->{'contents'}}) {
- next if ($res->{'type'} ne 'assessment');
- push (@Resources,$res->{'symb'});
+ my $part_count;
+ foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+ push (@Resources,$res->symb);
+ $part_count += scalar(@{$res->parts});
}
my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
#
# First compute statistics based on student scores
my ($smin,$smax,$sMean,$sSTD,$scount,$sMAX) =
&Apache::loncoursedata::score_stats
- (\@Apache::lonstatistics::SelectedSections,
+ ([&Apache::lonstatistics::get_selected_sections()],
+ [&Apache::lonstatistics::get_selected_groups()],
$Apache::lonstatistics::enrollment_status,
\@Resources,$starttime,$endtime,undef);
- $SeqStat{$symb}->{'title'} = $seq->{'title'};
+ $SeqStat{$symb}->{'title'} = $seq->compTitle;
$SeqStat{$symb}->{'scoremax'} = $smax;
$SeqStat{$symb}->{'scoremin'} = $smin;
$SeqStat{$symb}->{'scoremean'} = $sMean;
@@ -1711,10 +1718,11 @@ sub compute_sequence_statistics {
# 'correct' is taken to mean
my ($cmin,$cmax,$cMean,$cSTD,$ccount)=
&Apache::loncoursedata::count_stats
- (\@Apache::lonstatistics::SelectedSections,
+ ([&Apache::lonstatistics::get_selected_sections()],
+ [&Apache::lonstatistics::get_selected_groups()],
$Apache::lonstatistics::enrollment_status,
\@Resources,$starttime,$endtime,undef);
- my $K = $seq->{'num_assess_parts'};
+ my $K = $part_count;
my $kr_21;
if ($K > 1 && $cSTD > 0) {
$kr_21 = ($K/($K-1)) * (1 - $cMean*($K-$cMean)/($K*$cSTD**2));
|