";
$r->print($Str);
$r->rflush();
+ #
+ # Let the user know what we are doing
+ my $studentcount = scalar(@Apache::lonstatistics::Students);
+ if ($env{'form.SelectedStudent'}) {
+ $studentcount = '1';
+ }
+ #
+ # Initialize progress window
+ %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+ ($r,'HTML Chart Status',
+ 'HTML Chart Progress', $studentcount,
+ 'inline',undef,'Statistics','stats_status');
+ #
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+ 'Processing first student');
return;
}
@@ -744,7 +756,7 @@ sub html_outputstudent {
my %StudentsData;
my @tmp = &Apache::loncoursedata::get_current_state
($student->{'username'},$student->{'domain'},undef,
- $ENV{'request.course.id'});
+ $env{'request.course.id'});
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
%StudentsData = @tmp;
}
@@ -829,6 +841,7 @@ sub html_outputstudent {
$r->print($Str);
#
$r->rflush();
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
return;
}
@@ -846,7 +859,8 @@ sub html_finish {
}
}
$r->rflush();
- undef($navmap);
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ &html_cleanup();
return;
}
@@ -953,8 +967,7 @@ my %formula_data;
my $navmap;
my @sequences;
-sub excel_initialize {
- my ($r) = @_;
+sub excel_cleanup {
#
undef ($excel_sheet);
undef ($excel_workbook);
@@ -970,6 +983,12 @@ sub excel_initialize {
#
undef($navmap);
undef(@sequences);
+}
+
+sub excel_initialize {
+ my ($r) = @_;
+
+ &excel_cleanup();
($navmap,@sequences) =
&Apache::lonstatistics::selected_sequences_with_assessments();
if (! ref($navmap)) {
@@ -1036,36 +1055,22 @@ sub excel_initialize {
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'};
$sheetname = &Apache::loncommon::clean_excel_name($sheetname);
$excel_sheet = $excel_workbook->addworksheet($sheetname);
#
# Put the course description in the header
$excel_sheet->write($header_row,$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 = '';
- my @Sections = @Apache::lonstatistics::SelectedSections;
- if (scalar(@Sections) > 1) {
- if (scalar(@Sections) > 2) {
- my $last = pop(@Sections);
- $sectionstring = "Sections ".join(', ',@Sections).', and '.$last;
- } else {
- $sectionstring = "Sections ".join(' and ',@Sections);
- }
- } else {
- if ($Sections[0] eq 'all') {
- $sectionstring = "All sections";
- } else {
- $sectionstring = "Section ".$Sections[0];
- }
- }
- $excel_sheet->write($header_row,$cols_output++,$sectionstring,
+ my @Sections = &Apache::lonstatistics::get_selected_sections();
+ $excel_sheet->write($header_row,$cols_output++,
+ &Apache::lonstatistics::section_and_enrollment_description('plaintext'),
$format->{'h3'});
- $cols_output += scalar(@Sections);
#
# Put the date in there too
$excel_sheet->write($header_row,$cols_output++,
@@ -1139,9 +1144,11 @@ sub excel_initialize {
! defined($formula_data{$symb}->{'Excel:endcell'})) {
$formula_data{$symb}->{'Excel:endcell'} = $formula_data{$symb}->{'Excel:startcell'};
}
+
+ my $start = $formula_data{$symb}->{'Excel:startcell'};
+ my $end = $formula_data{$symb}->{'Excel:endcell'};
$formula_data{$symb}->{'Excel:sum'}= $excel_sheet->store_formula
- ('=SUM('.$formula_data{$symb}->{'Excel:startcell'}.
- ':'.$formula_data{$symb}->{'Excel:endcell'}.')');
+ ("=IF(COUNT($start\:$end),SUM($start\:$end),\"\")");
# Determine cell the score is held in
$formula_data{$symb}->{'Excel:scorecell'} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
@@ -1226,7 +1233,7 @@ sub excel_initialize {
$weight = 1;
if ($chosen_output->{'scores'}) {
$weight = &Apache::lonnet::EXT
- ('resource.'.$part.'.weight',$resource->{'symb'},
+ ('resource.'.$part.'.weight',$resource->symb,
undef,undef,undef);
if (!defined($weight) || ($weight eq '')) {
$weight=1;
@@ -1250,7 +1257,7 @@ sub excel_initialize {
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$formula_data{$symb}->{'Excel:endcol'}));
$excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
$formula_data{$symb}->{'Excel:sum'},undef,
- %replaceCells);
+ %replaceCells, %replaceCells);
} elsif ($chosen_output->{'sequence_sum'}) {
$excel_sheet->write($maximum_data_row,$cols_output++,$max);
@@ -1325,7 +1332,7 @@ sub excel_initialize {
#
# Let the user know what we are doing
my $studentcount = scalar(@Apache::lonstatistics::Students);
- if ($ENV{'form.SelectedStudent'}) {
+ if ($env{'form.SelectedStudent'}) {
$studentcount = '1';
}
if ($studentcount > 1) {
@@ -1372,7 +1379,7 @@ sub excel_outputstudent {
my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'},
$student->{'domain'},
undef,
- $ENV{'request.course.id'});
+ $env{'request.course.id'});
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
%StudentsData = @tmp;
}
@@ -1406,8 +1413,9 @@ sub excel_outputstudent {
if ($chosen_output->{'correct'}) {
# only indiciate if each item is correct or not
foreach my $value (@$rawdata) {
- # nonzero means correct
- $value = 1 if ($value > 0);
+ # positive means correct, 0 or negative means
+ # incorrect
+ $value = $value > 0 ? 1 : 0;
$excel_sheet->write($rows_output,$cols_output++,$value);
}
} else {
@@ -1433,7 +1441,7 @@ sub excel_outputstudent {
# The undef is for the format
$excel_sheet->repeat_formula($rows_output,$cols_output++,
$formula_data{$symb}->{'Excel:sum'},undef,
- %replaceCells);
+ %replaceCells, %replaceCells);
} elsif ($chosen_output->{'sequence_sum'}) {
if ($score eq ' ') {
$cols_output++;
@@ -1469,14 +1477,12 @@ sub excel_outputstudent {
sub excel_finish {
my ($r) = @_;
if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) {
+ &excel_cleanup();
return;
}
#
# Write the excel file
$excel_workbook->close();
- my $c = $r->connection();
- #
- return if($c->aborted());
#
# Close the progress window
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
@@ -1485,6 +1491,7 @@ sub excel_finish {
$r->print('
'.
'Your Excel spreadsheet.'."\n");
$r->rflush();
+ &excel_cleanup();
return;
}
@@ -1515,10 +1522,7 @@ my %prog_state; # progress window state
my $navmap;
my @sequences;
-sub csv_initialize{
- my ($r) = @_;
- #
- # Clean up
+sub csv_cleanup {
undef($outputfile);
undef($filename);
undef($request_aborted);
@@ -1526,6 +1530,12 @@ sub csv_initialize{
#
undef($navmap);
undef(@sequences);
+}
+
+sub csv_initialize{
+ my ($r) = @_;
+
+ &csv_cleanup();
($navmap,@sequences) =
&Apache::lonstatistics::selected_sequences_with_assessments();
if (! ref($navmap)) {
@@ -1556,22 +1566,18 @@ END
'inline',undef,'Statistics','stats_status');
#
# Open a file
- $filename = '/prtspool/'.
- $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
- time.'_'.rand(1000000000).'.csv';
- unless ($outputfile = Apache::File->new('>/home/httpd'.$filename)) {
- $r->log_error("Couldn't open $filename for output $!");
- $r->print("Problems occured in writing the csv file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator.");
- $outputfile = undef;
- }
+ ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv');
+ if (! defined($outputfile)) { return ''; }
#
# Datestamp
- my $description = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ my $description = $env{'course.'.$env{'request.course.id'}.'.description'};
print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'.
'"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'.
"\n";
+ print $outputfile '"'.
+ &Apache::loncommon::csv_translate
+ (&Apache::lonstatistics::section_and_enrollment_description()).
+ '"'."\n";
foreach my $item ('shortdesc','non_html_notes') {
next if (! exists($chosen_output->{$item}));
print $outputfile
@@ -1654,7 +1660,7 @@ sub csv_outputstudent {
my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'},
$student->{'domain'},
undef,
- $ENV{'request.course.id'});
+ $env{'request.course.id'});
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
%StudentsData = @tmp;
}
@@ -1715,13 +1721,11 @@ sub csv_outputstudent {
sub csv_finish {
my ($r) = @_;
if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) {
+ &csv_cleanup();
return;
}
close($outputfile);
#
- my $c = $r->connection();
- return if ($c->aborted());
- #
# Close the progress window
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
#
@@ -1729,6 +1733,7 @@ sub csv_finish {
$r->print('
'.
''.&mt('Your csv file.').''."\n");
$r->rflush();
+ &csv_cleanup();
return;
}
@@ -1822,7 +1827,7 @@ sub student_tries_on_sequence {
} elsif ($status eq 'incorrect_by_override') {
$symbol = '-';
} elsif ($status eq 'ungraded_attempted') {
- $symbol = '#';
+ $symbol = 'u';
} elsif ($status eq 'incorrect_attempted' ||
$tries > 0) {
$symbol = '.';
@@ -1939,13 +1944,19 @@ sub student_performance_on_sequence {
if (length($symbol) > 1) {
$symbol = '*';
}
- if (exists($resource_data->{'resource.'.$part.'.solved'})) {
+ if (exists($resource_data->{'resource.'.$part.'.solved'}) &&
+ $resource_data->{'resource.'.$part.'.solved'} ne '') {
my $status = $resource_data->{'resource.'.$part.'.solved'};
if ($status eq 'excused') {
$symbol = 'x';
$max -= $weight; # Do not count 'excused' problems.
+ } elsif ($status eq 'ungraded_attempted') {
+ $symbol = 'u';
}
$hasdata = 1;
+ } elsif ($resource_data->{'resource.'.$part.'.award'} eq 'DRAFT') {
+ $symbol = 'd';
+ $hasdata = 1;
} elsif (!exists($resource_data->{'resource.'.$part.'.awarded'})){
# Unsolved. Did they try?
if (exists($resource_data->{'resource.'.$part.'.tries'})){
@@ -1994,13 +2005,13 @@ problems.
#######################################################
sub CreateLegend {
my $Str = "".
- " 1 correct by student in 1 try\n".
- " 7 correct by student in 7 tries\n".
+ " digit score or number of tries to get correct ".
" * correct by student in more than 9 tries\n".
" + correct by hand grading or override\n".
" - incorrect by override\n".
" . incorrect attempted\n".
- " # ungraded attempted\n".
+ " u ungraded attempted\n".
+ " d draft answer saved but not submitted\n".
" not attempted (blank field)\n".
" x excused".
"";