version 1.115, 2005/02/25 23:32:23
|
version 1.125, 2005/08/26 21:53:23
|
Line 153 sub BuildStudentAssessmentPage {
|
Line 153 sub BuildStudentAssessmentPage {
|
&Apache::lonstatistics::PrepareClasslist(); |
&Apache::lonstatistics::PrepareClasslist(); |
# |
# |
$single_student_mode = 0; |
$single_student_mode = 0; |
$single_student_mode = 1 if ($ENV{'form.SelectedStudent'}); |
$single_student_mode = 1 if ($env{'form.SelectedStudent'}); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['selectstudent']); |
['selectstudent']); |
if ($ENV{'form.selectstudent'}) { |
if ($env{'form.selectstudent'}) { |
&Apache::lonstatistics::DisplayClasslist($r); |
&Apache::lonstatistics::DisplayClasslist($r); |
return; |
return; |
} |
} |
Line 167 sub BuildStudentAssessmentPage {
|
Line 167 sub BuildStudentAssessmentPage {
|
$r->print(&CreateInterface()); |
$r->print(&CreateInterface()); |
$r->print('<input type="hidden" name="notfirstrun" value="true" />'); |
$r->print('<input type="hidden" name="notfirstrun" value="true" />'); |
$r->print('<input type="hidden" name="sort" value="'. |
$r->print('<input type="hidden" name="sort" value="'. |
$ENV{'form.sort'}.'" />'); |
$env{'form.sort'}.'" />'); |
$r->rflush(); |
$r->rflush(); |
# |
# |
if (! exists($ENV{'form.notfirstrun'}) && ! $single_student_mode) { |
if (! exists($env{'form.notfirstrun'}) && ! $single_student_mode) { |
return; |
return; |
} |
} |
|
$r->print('<h4>'. |
|
&Apache::lonstatistics::section_and_enrollment_description(). |
|
'</h4>'); |
# |
# |
my $initialize = \&html_initialize; |
my $initialize = \&html_initialize; |
my $output_student = \&html_outputstudent; |
my $output_student = \&html_outputstudent; |
my $finish = \&html_finish; |
my $finish = \&html_finish; |
&Apache::lonnet::logthis('got here! 1'); |
|
# |
# |
if ($output_mode eq 'excel') { |
if ($output_mode eq 'excel') { |
$initialize = \&excel_initialize; |
$initialize = \&excel_initialize; |
Line 189 sub BuildStudentAssessmentPage {
|
Line 191 sub BuildStudentAssessmentPage {
|
$finish = \&csv_finish; |
$finish = \&csv_finish; |
} |
} |
# |
# |
&Apache::lonnet::logthis('got here! 2'); |
|
if($c->aborted()) { return ; } |
if($c->aborted()) { return ; } |
# |
# |
# Determine which students we want to look at |
# Determine which students we want to look at |
Line 214 sub BuildStudentAssessmentPage {
|
Line 215 sub BuildStudentAssessmentPage {
|
# |
# |
# Call the initialize routine selected above |
# Call the initialize routine selected above |
$initialize->($r); |
$initialize->($r); |
&Apache::lonnet::logthis('got here! 3'); |
|
foreach my $student (@Students) { |
foreach my $student (@Students) { |
if($c->aborted()) { |
if($c->aborted()) { |
$finish->($r); |
$finish->($r); |
Line 234 sub BuildStudentAssessmentPage {
|
Line 234 sub BuildStudentAssessmentPage {
|
sub next_and_previous_buttons { |
sub next_and_previous_buttons { |
my $Str = ''; |
my $Str = ''; |
$Str .= '<input type="hidden" name="SelectedStudent" value="'. |
$Str .= '<input type="hidden" name="SelectedStudent" value="'. |
$ENV{'form.SelectedStudent'}.'" />'; |
$env{'form.SelectedStudent'}.'" />'; |
# |
# |
# Build the previous student link |
# Build the previous student link |
my $previous = &Apache::lonstatistics::previous_student(); |
my $previous = &Apache::lonstatistics::previous_student(); |
Line 353 sub CreateInterface {
|
Line 353 sub CreateInterface {
|
&mt('Clear Caches').'" />'; |
&mt('Clear Caches').'" />'; |
$Str .= ' 'x5; |
$Str .= ' 'x5; |
$Str .= |
$Str .= |
&mt('Status[_1]', |
&mt('Status [_1]', |
'<input type="text" name="stats_status" size="60" value="" />'); |
'<input type="text" name="stats_status" size="60" value="" />'); |
$Str .= '<br />'; |
$Str .= '<br />'; |
return $Str; |
return $Str; |
Line 430 sub CreateAndParseOutputSelector {
|
Line 430 sub CreateAndParseOutputSelector {
|
[$elementname]); |
[$elementname]); |
# |
# |
# Format for output options is 'mode, restrictions'; |
# Format for output options is 'mode, restrictions'; |
my $selected = 'html, without links'; |
my $selected = (&Apache::loncommon::get_env_multiple('form.'.$elementname))[0]; |
if (exists($ENV{'form.'.$elementname})) { |
$selected = 'html, without links' if (!$selected); |
if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) { |
|
$selected = $ENV{'form.'.$elementname}->[0]; |
|
} else { |
|
$selected = $ENV{'form.'.$elementname}; |
|
} |
|
} |
|
# |
# |
# Set package variables describing output mode |
# Set package variables describing output mode |
$show_links = 'no'; |
$show_links = 'no'; |
Line 551 sub CreateAndParseOutputDataSelector {
|
Line 546 sub CreateAndParseOutputDataSelector {
|
my $Str = ''; |
my $Str = ''; |
my $elementname = 'chartoutputdata'; |
my $elementname = 'chartoutputdata'; |
# |
# |
my $selected = 'scores'; |
my $selected = (&Apache::loncommon::get_env_multiple('form.'.$elementname))[0]; |
if (exists($ENV{'form.'.$elementname})) { |
$selected = 'scores' if (!$selected); |
if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) { |
|
$selected = $ENV{'form.'.$elementname}->[0]; |
|
} else { |
|
$selected = $ENV{'form.'.$elementname}; |
|
} |
|
} |
|
# |
# |
$chosen_output = $OutputDataOptions[0]; |
$chosen_output = $OutputDataOptions[0]; |
foreach my $option (@OutputDataOptions) { |
foreach my $option (@OutputDataOptions) { |
Line 632 Return a line of the chart for a student
|
Line 622 Return a line of the chart for a student
|
my @sequences; |
my @sequences; |
my $navmap; # Have to keep this around since weakref is a bit zealous |
my $navmap; # Have to keep this around since weakref is a bit zealous |
|
|
|
sub html_cleanup { |
|
undef(%prog_state); |
|
undef(%width); |
|
# |
|
undef($navmap); |
|
undef(@sequences); |
|
} |
|
|
sub html_initialize { |
sub html_initialize { |
my ($r) = @_; |
my ($r) = @_; |
# |
# |
$padding = ' 'x3; |
$padding = ' 'x3; |
$count = 0; |
$count = 0; |
$nodata_count = 0; |
$nodata_count = 0; |
undef(%prog_state); |
&html_cleanup(); |
undef(%width); |
|
# |
|
undef($navmap); |
|
undef(@sequences); |
|
($navmap,@sequences) = |
($navmap,@sequences) = |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
if (! ref($navmap)) { |
if (! ref($navmap)) { |
Line 652 sub html_initialize {
|
Line 646 sub html_initialize {
|
'</h3>'); |
'</h3>'); |
} |
} |
# |
# |
$r->print("<h3>".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}. |
$r->print("<h3>".$env{'course.'.$env{'request.course.id'}.'.description'}. |
" ".localtime(time)."</h3>"); |
" ".localtime(time)."</h3>"); |
# |
# |
if ($chosen_output->{'base'} !~ /^final table/) { |
if ($chosen_output->{'base'} !~ /^final table/) { |
Line 683 sub html_initialize {
|
Line 677 sub html_initialize {
|
# Use 1 digit for a space |
# Use 1 digit for a space |
$width{$symb}->{'width_sum'} += 1; |
$width{$symb}->{'width_sum'} += 1; |
} |
} |
$total_count += $width{$symb}->{'num_assess_parts'}; |
$total_count += &count_parts($navmap,$seq); |
# Use 3 digits for the sum |
# Use 3 digits for the sum |
$width{$symb}->{'width_sum'} += 3; |
$width{$symb}->{'width_sum'} += 3; |
} |
} |
Line 720 sub html_initialize {
|
Line 714 sub html_initialize {
|
$Str .= "<pre>"; |
$Str .= "<pre>"; |
$r->print($Str); |
$r->print($Str); |
$r->rflush(); |
$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; |
return; |
} |
} |
|
|
Line 747 sub html_outputstudent {
|
Line 756 sub html_outputstudent {
|
my %StudentsData; |
my %StudentsData; |
my @tmp = &Apache::loncoursedata::get_current_state |
my @tmp = &Apache::loncoursedata::get_current_state |
($student->{'username'},$student->{'domain'},undef, |
($student->{'username'},$student->{'domain'},undef, |
$ENV{'request.course.id'}); |
$env{'request.course.id'}); |
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { |
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { |
%StudentsData = @tmp; |
%StudentsData = @tmp; |
} |
} |
Line 763 sub html_outputstudent {
|
Line 772 sub html_outputstudent {
|
my $studentstats; |
my $studentstats; |
my $PerformanceStr = ''; |
my $PerformanceStr = ''; |
foreach my $seq (@sequences) { |
foreach my $seq (@sequences) { |
&Apache::lonnet::logthis('computing student data for '.$seq->compTitle); |
my $symb = $seq->symb; |
my ($performance,$performance_length,$score,$seq_max,$rawdata); |
my ($performance,$performance_length,$score,$seq_max,$rawdata); |
if ($chosen_output->{'tries'}) { |
if ($chosen_output->{'tries'}) { |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
Line 775 sub html_outputstudent {
|
Line 784 sub html_outputstudent {
|
$navmap,$seq,$show_links); |
$navmap,$seq,$show_links); |
} |
} |
my $ratio=''; |
my $ratio=''; |
if ($chosen_output->{'every_problem'}) { |
if ($chosen_output->{'every_problem'} && |
|
$chosen_output->{'sequence_sum'}) { |
$ratio .= ' '; |
$ratio .= ' '; |
} |
} |
if ($chosen_output->{'sequence_sum'} && $score ne ' ') { |
if ($chosen_output->{'sequence_sum'} && $score ne ' ') { |
Line 795 sub html_outputstudent {
|
Line 805 sub html_outputstudent {
|
$performance = ''; |
$performance = ''; |
$performance_length=0; |
$performance_length=0; |
} |
} |
$performance .= ' 'x($width{$seq->symb}->{'width_total'} - |
$performance .= ' 'x($width{$symb}->{'width_total'} - |
$performance_length - |
$performance_length - |
$width{$seq->symb}->{'width_sum'}). |
$width{$symb}->{'width_sum'}). |
$ratio; |
$ratio; |
# |
# |
$Str .= $performance.$padding; |
$Str .= $performance.$padding; |
# |
# |
$studentstats->{$seq->symb}->{'score'}= $score; |
$studentstats->{$symb}->{'score'}= $score; |
$studentstats->{$seq->symb}->{'max'} = $seq_max; |
$studentstats->{$symb}->{'max'} = $seq_max; |
} |
} |
# |
# |
# Total it up and store the statistics info. |
# Total it up and store the statistics info. |
Line 831 sub html_outputstudent {
|
Line 841 sub html_outputstudent {
|
$r->print($Str); |
$r->print($Str); |
# |
# |
$r->rflush(); |
$r->rflush(); |
|
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); |
return; |
return; |
} |
} |
|
|
Line 848 sub html_finish {
|
Line 859 sub html_finish {
|
} |
} |
} |
} |
$r->rflush(); |
$r->rflush(); |
undef($navmap); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
&html_cleanup(); |
return; |
return; |
} |
} |
|
|
Line 939 sub SingleStudentTotal {
|
Line 951 sub SingleStudentTotal {
|
|
|
my $excel_sheet; |
my $excel_sheet; |
my $excel_workbook; |
my $excel_workbook; |
|
my $format; |
|
|
my $filename; |
my $filename; |
my $rows_output; |
my $rows_output; |
Line 954 my %formula_data;
|
Line 967 my %formula_data;
|
my $navmap; |
my $navmap; |
my @sequences; |
my @sequences; |
|
|
sub excel_initialize { |
sub excel_cleanup { |
my ($r) = @_; |
|
# |
# |
undef ($excel_sheet); |
undef ($excel_sheet); |
undef ($excel_workbook); |
undef ($excel_workbook); |
Line 971 sub excel_initialize {
|
Line 983 sub excel_initialize {
|
# |
# |
undef($navmap); |
undef($navmap); |
undef(@sequences); |
undef(@sequences); |
|
} |
|
|
|
sub excel_initialize { |
|
my ($r) = @_; |
|
|
|
&excel_cleanup(); |
($navmap,@sequences) = |
($navmap,@sequences) = |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
if (! ref($navmap)) { |
if (! ref($navmap)) { |
Line 1005 sub excel_initialize {
|
Line 1023 sub excel_initialize {
|
} |
} |
return if ($request_aborted); |
return if ($request_aborted); |
# |
# |
$filename = '/prtspool/'. |
|
$ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. |
|
time.'_'.rand(1000000000).'.xls'; |
|
# |
# |
$excel_workbook = undef; |
$excel_workbook = undef; |
$excel_sheet = undef; |
$excel_sheet = undef; |
Line 1035 sub excel_initialize {
|
Line 1050 sub excel_initialize {
|
my $first_data_row = $rows_output++; |
my $first_data_row = $rows_output++; |
# |
# |
# Create sheet |
# Create sheet |
$excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename); |
($excel_workbook,$filename,$format)= |
# |
&Apache::loncommon::create_workbook($r); |
# Check for errors |
return if (! defined($excel_workbook)); |
if (! defined($excel_workbook)) { |
|
$r->log_error("Error creating excel spreadsheet $filename: $!"); |
|
$r->print("Problems creating new Excel file. ". |
|
"This error has been logged. ". |
|
"Please alert your LON-CAPA administrator"); |
|
return ; |
|
} |
|
# |
|
# 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 $format = &Apache::loncommon::define_excel_formats($excel_workbook); |
|
# |
# |
# Add a worksheet |
# 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); |
$sheetname = &Apache::loncommon::clean_excel_name($sheetname); |
$excel_sheet = $excel_workbook->addworksheet($sheetname); |
$excel_sheet = $excel_workbook->addworksheet($sheetname); |
# |
# |
# Put the course description in the header |
# Put the course description in the header |
$excel_sheet->write($header_row,$cols_output++, |
$excel_sheet->write($header_row,$cols_output++, |
$ENV{'course.'.$ENV{'request.course.id'}.'.description'}, |
$env{'course.'.$env{'request.course.id'}.'.description'}, |
$format->{'h1'}); |
$format->{'h1'}); |
$cols_output += 3; |
$cols_output += 3; |
# |
# |
# Put a description of the sections listed |
# Put a description of the sections listed |
my $sectionstring = ''; |
my $sectionstring = ''; |
my @Sections = @Apache::lonstatistics::SelectedSections; |
my @Sections = &Apache::lonstatistics::get_selected_sections(); |
if (scalar(@Sections) > 1) { |
$excel_sheet->write($header_row,$cols_output++, |
if (scalar(@Sections) > 2) { |
&Apache::lonstatistics::section_and_enrollment_description('plaintext'), |
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, |
|
$format->{'h3'}); |
$format->{'h3'}); |
$cols_output += scalar(@Sections); |
|
# |
# |
# Put the date in there too |
# Put the date in there too |
$excel_sheet->write($header_row,$cols_output++, |
$excel_sheet->write($header_row,$cols_output++, |
Line 1344 sub excel_initialize {
|
Line 1330 sub excel_initialize {
|
# |
# |
# Let the user know what we are doing |
# Let the user know what we are doing |
my $studentcount = scalar(@Apache::lonstatistics::Students); |
my $studentcount = scalar(@Apache::lonstatistics::Students); |
if ($ENV{'form.SelectedStudent'}) { |
if ($env{'form.SelectedStudent'}) { |
$studentcount = '1'; |
$studentcount = '1'; |
} |
} |
if ($studentcount > 1) { |
if ($studentcount > 1) { |
Line 1391 sub excel_outputstudent {
|
Line 1377 sub excel_outputstudent {
|
my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'}, |
my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'}, |
$student->{'domain'}, |
$student->{'domain'}, |
undef, |
undef, |
$ENV{'request.course.id'}); |
$env{'request.course.id'}); |
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { |
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { |
%StudentsData = @tmp; |
%StudentsData = @tmp; |
} |
} |
Line 1488 sub excel_outputstudent {
|
Line 1474 sub excel_outputstudent {
|
sub excel_finish { |
sub excel_finish { |
my ($r) = @_; |
my ($r) = @_; |
if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) { |
if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) { |
|
&excel_cleanup(); |
return; |
return; |
} |
} |
# |
# |
# Write the excel file |
# Write the excel file |
$excel_workbook->close(); |
$excel_workbook->close(); |
my $c = $r->connection(); |
|
# |
|
return if($c->aborted()); |
|
# |
# |
# Close the progress window |
# Close the progress window |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
Line 1504 sub excel_finish {
|
Line 1488 sub excel_finish {
|
$r->print('<br />'. |
$r->print('<br />'. |
'<a href="'.$filename.'">Your Excel spreadsheet.</a>'."\n"); |
'<a href="'.$filename.'">Your Excel spreadsheet.</a>'."\n"); |
$r->rflush(); |
$r->rflush(); |
|
&excel_cleanup(); |
return; |
return; |
} |
} |
|
|
Line 1534 my %prog_state; # progress window state
|
Line 1519 my %prog_state; # progress window state
|
my $navmap; |
my $navmap; |
my @sequences; |
my @sequences; |
|
|
sub csv_initialize{ |
sub csv_cleanup { |
my ($r) = @_; |
|
# |
|
# Clean up |
|
undef($outputfile); |
undef($outputfile); |
undef($filename); |
undef($filename); |
undef($request_aborted); |
undef($request_aborted); |
Line 1545 sub csv_initialize{
|
Line 1527 sub csv_initialize{
|
# |
# |
undef($navmap); |
undef($navmap); |
undef(@sequences); |
undef(@sequences); |
|
} |
|
|
|
sub csv_initialize{ |
|
my ($r) = @_; |
|
|
|
&csv_cleanup(); |
($navmap,@sequences) = |
($navmap,@sequences) = |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
if (! ref($navmap)) { |
if (! ref($navmap)) { |
Line 1575 END
|
Line 1563 END
|
'inline',undef,'Statistics','stats_status'); |
'inline',undef,'Statistics','stats_status'); |
# |
# |
# Open a file |
# Open a file |
$filename = '/prtspool/'. |
($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv'); |
$ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. |
if (! defined($outputfile)) { return ''; } |
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; |
|
} |
|
# |
# |
# Datestamp |
# 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).'",'. |
print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'. |
'"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'. |
'"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'. |
"\n"; |
"\n"; |
|
print $outputfile '"'. |
|
&Apache::loncommon::csv_translate |
|
(&Apache::lonstatistics::section_and_enrollment_description()). |
|
'"'."\n"; |
foreach my $item ('shortdesc','non_html_notes') { |
foreach my $item ('shortdesc','non_html_notes') { |
next if (! exists($chosen_output->{$item})); |
next if (! exists($chosen_output->{$item})); |
print $outputfile |
print $outputfile |
Line 1610 END
|
Line 1594 END
|
&Apache::loncommon::csv_translate($seq->compTitle).'",'; |
&Apache::loncommon::csv_translate($seq->compTitle).'",'; |
my $count = 0; |
my $count = 0; |
if ($chosen_output->{'every_problem'}) { |
if ($chosen_output->{'every_problem'}) { |
foreach my $res (@{$seq->{'contents'}}) { |
foreach my $res (&get_resources($navmap,$seq)) { |
if (scalar(@{$res->parts}) < 1) { |
if (scalar(@{$res->parts}) < 1) { |
next; |
next; |
} |
} |
Line 1673 sub csv_outputstudent {
|
Line 1657 sub csv_outputstudent {
|
my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'}, |
my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'}, |
$student->{'domain'}, |
$student->{'domain'}, |
undef, |
undef, |
$ENV{'request.course.id'}); |
$env{'request.course.id'}); |
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { |
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { |
%StudentsData = @tmp; |
%StudentsData = @tmp; |
} |
} |
Line 1734 sub csv_outputstudent {
|
Line 1718 sub csv_outputstudent {
|
sub csv_finish { |
sub csv_finish { |
my ($r) = @_; |
my ($r) = @_; |
if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) { |
if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) { |
|
&csv_cleanup(); |
return; |
return; |
} |
} |
close($outputfile); |
close($outputfile); |
# |
# |
my $c = $r->connection(); |
|
return if ($c->aborted()); |
|
# |
|
# Close the progress window |
# Close the progress window |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
# |
# |
Line 1748 sub csv_finish {
|
Line 1730 sub csv_finish {
|
$r->print('<br />'. |
$r->print('<br />'. |
'<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n"); |
'<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n"); |
$r->rflush(); |
$r->rflush(); |
|
&csv_cleanup(); |
return; |
return; |
|
|
} |
} |
Line 1841 sub student_tries_on_sequence {
|
Line 1824 sub student_tries_on_sequence {
|
} elsif ($status eq 'incorrect_by_override') { |
} elsif ($status eq 'incorrect_by_override') { |
$symbol = '-'; |
$symbol = '-'; |
} elsif ($status eq 'ungraded_attempted') { |
} elsif ($status eq 'ungraded_attempted') { |
$symbol = '#'; |
$symbol = 'u'; |
} elsif ($status eq 'incorrect_attempted' || |
} elsif ($status eq 'incorrect_attempted' || |
$tries > 0) { |
$tries > 0) { |
$symbol = '.'; |
$symbol = '.'; |
Line 1958 sub student_performance_on_sequence {
|
Line 1941 sub student_performance_on_sequence {
|
if (length($symbol) > 1) { |
if (length($symbol) > 1) { |
$symbol = '*'; |
$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'}; |
my $status = $resource_data->{'resource.'.$part.'.solved'}; |
if ($status eq 'excused') { |
if ($status eq 'excused') { |
$symbol = 'x'; |
$symbol = 'x'; |
$max -= $weight; # Do not count 'excused' problems. |
$max -= $weight; # Do not count 'excused' problems. |
|
} elsif ($status eq 'ungraded_attempted') { |
|
$symbol = 'u'; |
} |
} |
$hasdata = 1; |
$hasdata = 1; |
|
} elsif ($resource_data->{'resource.'.$part.'.award'} eq 'DRAFT') { |
|
$symbol = 'd'; |
|
$hasdata = 1; |
} elsif (!exists($resource_data->{'resource.'.$part.'.awarded'})){ |
} elsif (!exists($resource_data->{'resource.'.$part.'.awarded'})){ |
# Unsolved. Did they try? |
# Unsolved. Did they try? |
if (exists($resource_data->{'resource.'.$part.'.tries'})){ |
if (exists($resource_data->{'resource.'.$part.'.tries'})){ |
Line 2013 problems.
|
Line 2002 problems.
|
####################################################### |
####################################################### |
sub CreateLegend { |
sub CreateLegend { |
my $Str = "<p><pre>". |
my $Str = "<p><pre>". |
" 1 correct by student in 1 try\n". |
" digit score or number of tries to get correct ". |
" 7 correct by student in 7 tries\n". |
|
" * correct by student in more than 9 tries\n". |
" * correct by student in more than 9 tries\n". |
" + correct by hand grading or override\n". |
" + correct by hand grading or override\n". |
" - incorrect by override\n". |
" - incorrect by override\n". |
" . incorrect attempted\n". |
" . incorrect attempted\n". |
" # ungraded attempted\n". |
" u ungraded attempted\n". |
|
" d draft answer saved but not submitted\n". |
" not attempted (blank field)\n". |
" not attempted (blank field)\n". |
" x excused". |
" x excused". |
"</pre><p>"; |
"</pre><p>"; |