version 1.60, 2003/06/17 17:47:54
|
version 1.80, 2004/01/27 16:04:27
|
Line 52 package Apache::lonstudentassessment;
|
Line 52 package Apache::lonstudentassessment;
|
use strict; |
use strict; |
use Apache::lonstatistics; |
use Apache::lonstatistics; |
use Apache::lonhtmlcommon; |
use Apache::lonhtmlcommon; |
|
use Apache::loncommon(); |
use Apache::loncoursedata; |
use Apache::loncoursedata; |
use Apache::lonnet; # for logging porpoises |
use Apache::lonnet; # for logging porpoises |
|
use Apache::lonlocal; |
use Spreadsheet::WriteExcel; |
use Spreadsheet::WriteExcel; |
|
use Spreadsheet::WriteExcel::Utility(); |
|
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
Line 138 Inputs:
|
Line 141 Inputs:
|
####################################################### |
####################################################### |
sub BuildStudentAssessmentPage { |
sub BuildStudentAssessmentPage { |
my ($r,$c)=@_; |
my ($r,$c)=@_; |
|
# |
undef($Statistics); |
undef($Statistics); |
|
undef($show_links); |
|
undef($output_mode); |
|
undef($data); |
|
undef($base); |
|
undef($datadescription); |
|
undef($single_student_mode); |
|
# |
|
my %Saveable_Parameters = ('Status' => 'scalar', |
|
'chartoutputmode' => 'scalar', |
|
'chartoutputdata' => 'scalar', |
|
'Section' => 'array', |
|
'StudentData' => 'array', |
|
'Maps' => 'array'); |
|
&Apache::loncommon::store_course_settings('chart',\%Saveable_Parameters); |
|
&Apache::loncommon::restore_course_settings('chart',\%Saveable_Parameters); |
|
# |
|
&Apache::lonstatistics::PrepareClasslist(); |
|
# |
|
$single_student_mode = 0; |
$single_student_mode = 1 if ($ENV{'form.SelectedStudent'}); |
$single_student_mode = 1 if ($ENV{'form.SelectedStudent'}); |
if ($ENV{'form.selectstudent'}) { |
if ($ENV{'form.selectstudent'}) { |
&Apache::lonstatistics::DisplayClasslist($r); |
&Apache::lonstatistics::DisplayClasslist($r); |
Line 191 sub BuildStudentAssessmentPage {
|
Line 214 sub BuildStudentAssessmentPage {
|
# are immediately reflected in the chart. |
# are immediately reflected in the chart. |
&Apache::lonnet::clear_EXT_cache_status(); |
&Apache::lonnet::clear_EXT_cache_status(); |
# |
# |
|
# Clean out loncoursedata's package data, just to be safe. |
|
&Apache::loncoursedata::clear_internal_caches(); |
|
# |
# Call the initialize routine selected above |
# Call the initialize routine selected above |
$initialize->($r); |
$initialize->($r); |
foreach my $student (@Students) { |
foreach my $student (@Students) { |
Line 293 sub CreateInterface {
|
Line 319 sub CreateInterface {
|
# $Str .= &CreateLegend(); |
# $Str .= &CreateLegend(); |
$Str .= '<table cellspacing="5">'."\n"; |
$Str .= '<table cellspacing="5">'."\n"; |
$Str .= '<tr>'; |
$Str .= '<tr>'; |
$Str .= '<td align="center"><b>Sections</b></td>'; |
$Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>'; |
$Str .= '<td align="center"><b>Student Data</b></td>'; |
$Str .= '<td align="center"><b>'.&mt('Student Data</b>').'</td>'; |
$Str .= '<td align="center"><b>Enrollment Status</b></td>'; |
$Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>'; |
$Str .= '<td align="center"><b>Sequences and Folders</b></td>'; |
$Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>'; |
$Str .= '<td align="center"><b>Output Format</b>'. |
$Str .= '<td align="center"><b>'.&mt('Output Format').'</b>'. |
&Apache::loncommon::help_open_topic("Chart_Output_Formats"). |
&Apache::loncommon::help_open_topic("Chart_Output_Formats"). |
'</td>'; |
'</td>'; |
$Str .= '<td align="center"><b>Output Data</b>'. |
$Str .= '<td align="center"><b>'.&mt('Output Data').'</b>'. |
&Apache::loncommon::help_open_topic("Chart_Output_Data"). |
&Apache::loncommon::help_open_topic("Chart_Output_Data"). |
'</td>'; |
'</td>'; |
$Str .= '</tr>'."\n"; |
$Str .= '</tr>'."\n"; |
Line 329 sub CreateInterface {
|
Line 355 sub CreateInterface {
|
$Str .= &CreateAndParseOutputDataSelector(); |
$Str .= &CreateAndParseOutputDataSelector(); |
$Str .= '</td></tr>'."\n"; |
$Str .= '</td></tr>'."\n"; |
$Str .= '</table>'."\n"; |
$Str .= '</table>'."\n"; |
$Str .= '<input type="submit" value="Generate Chart" />'; |
$Str .= '<input type="submit" name="Generate Chart" value="'. |
|
&mt('Generate Chart').'" />'; |
|
$Str .= ' 'x5; |
|
$Str .= '<input type="submit" name="selectstudent" value="'. |
|
&mt('Select One Student').'" />'; |
$Str .= ' 'x5; |
$Str .= ' 'x5; |
$Str .= '<input type="submit" name="selectstudent" '. |
$Str .= '<input type="submit" name="ClearCache" value="'. |
'value="Select One Student" />'; |
&mt('Clear Caches').'" />'; |
$Str .= ' 'x5; |
$Str .= ' 'x5; |
$Str .= '<input type="submit" name="ClearCache" value="Clear Caches" />'; |
$Str .= '<br />'; |
$Str .= ' 'x5.'<br />'; |
|
return $Str; |
return $Str; |
} |
} |
|
|
Line 406 sub OutputDescriptions {
|
Line 435 sub OutputDescriptions {
|
sub CreateAndParseOutputSelector { |
sub CreateAndParseOutputSelector { |
my $Str = ''; |
my $Str = ''; |
my $elementname = 'chartoutputmode'; |
my $elementname = 'chartoutputmode'; |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
|
[$elementname]); |
# |
# |
# Format for output options is 'mode, restrictions'; |
# Format for output options is 'mode, restrictions'; |
my $selected = 'html, without links'; |
my $selected = 'html, without links'; |
Line 432 sub CreateAndParseOutputSelector {
|
Line 463 sub CreateAndParseOutputSelector {
|
foreach my $option (@OutputOptions) { |
foreach my $option (@OutputOptions) { |
$Str .= "\n".' <option value="'.$option->{'value'}.'"'; |
$Str .= "\n".' <option value="'.$option->{'value'}.'"'; |
$Str .= " selected " if ($option->{'value'} eq $selected); |
$Str .= " selected " if ($option->{'value'} eq $selected); |
$Str .= ">".$option->{'name'}."<\/option>"; |
$Str .= ">".&mt($option->{'name'})."<\/option>"; |
} |
} |
$Str .= "\n</select>"; |
$Str .= "\n</select>"; |
return $Str; |
return $Str; |
Line 443 sub CreateAndParseOutputSelector {
|
Line 474 sub CreateAndParseOutputSelector {
|
## |
## |
my @OutputDataOptions = |
my @OutputDataOptions = |
( |
( |
{ name => 'Scores', |
{ name => 'Scores Summary', |
base => 'scores', |
|
value => 'scores', |
|
shortdesc => 'Score on each Problem Part', |
|
longdesc =>'The students score on each problem part, computed as'. |
|
'the part weight * part awarded', |
|
}, |
|
{ name => 'Scores Sum', |
|
base => 'scores', |
|
value => 'sum only', |
|
shortdesc => 'Sum of Scores on each Problem Part', |
|
longdesc =>'The total of the scores of the student on each problem'. |
|
' part in the sequences or folders selected.', |
|
}, |
|
{ name => 'Scores Sum & Maximums', |
|
base => 'scores', |
base => 'scores', |
value => 'sum and total', |
value => 'sum and total', |
shortdesc => 'Total Score and Maximum Possible for each '. |
shortdesc => 'Total Score and Maximum Possible for each '. |
Line 465 my @OutputDataOptions =
|
Line 482 my @OutputDataOptions =
|
longdesc => 'The score of each student as well as the '. |
longdesc => 'The score of each student as well as the '. |
' maximum possible on each Sequence or Folder.', |
' maximum possible on each Sequence or Folder.', |
}, |
}, |
{ name => 'Scores Summary Table Only', |
{ name => 'Scores Per Problem', |
base => 'scores', |
base => 'scores', |
value => 'final table scores', |
value => 'scores', |
shortdesc => 'Summary of Scores', |
shortdesc => 'Score on each Problem Part', |
longdesc => 'The average score on each sequence or folder for the '. |
longdesc =>'The students score on each problem part, computed as'. |
'selected students.', |
'the part weight * part awarded', |
}, |
}, |
|
# { name => 'Scores Sum', |
|
# base => 'scores', |
|
# value => 'sum only', |
|
# shortdesc => 'Sum of Scores on each Problem Part', |
|
# longdesc =>'The total of the scores of the student on each problem'. |
|
# ' part in the sequences or folders selected.', |
|
# }, |
|
# { name => 'Scores Summary Table Only', |
|
# base => 'scores', |
|
# value => 'final table scores', |
|
# shortdesc => 'Summary of Scores', |
|
# longdesc => 'The average score on each sequence or folder for the '. |
|
# 'selected students.', |
|
# }, |
{ name =>'Tries', |
{ name =>'Tries', |
base =>'tries', |
base =>'tries', |
value => 'tries', |
value => 'tries', |
Line 480 my @OutputDataOptions =
|
Line 511 my @OutputDataOptions =
|
}, |
}, |
{ name =>'Parts Correct', |
{ name =>'Parts Correct', |
base =>'tries', |
base =>'tries', |
value => 'parts correct', |
|
shortdesc => 'Number of Problem Parts completed successfully.', |
|
longdesc => 'The Number of Problem Parts completed successfully'. |
|
' on each sequence or folder.', |
|
}, |
|
{ name =>'Parts Correct & Maximums', |
|
base =>'tries', |
|
value => 'parts correct total', |
value => 'parts correct total', |
shortdesc => 'Number of Problem Parts completed successfully.', |
shortdesc => 'Number of Problem Parts completed successfully.', |
longdesc => 'The Number of Problem Parts completed successfully and '. |
longdesc => 'The Number of Problem Parts completed successfully and '. |
'the maximum possible for each student', |
'the maximum possible for each student', |
}, |
}, |
{ name => 'Parts Summary Table Only', |
# { name =>'Parts Correct', |
base => 'tries', |
# base =>'tries', |
value => 'final table parts', |
# value => 'parts correct', |
shortdesc => 'Summary of Parts Correct', |
# shortdesc => 'Number of Problem Parts completed successfully.', |
longdesc => 'A summary table of the average number of problem parts '. |
# longdesc => 'The Number of Problem Parts completed successfully'. |
'students were able to get correct on each sequence.', |
# ' on each sequence or folder.', |
}, |
# }, |
|
# { name => 'Parts Summary Table Only', |
|
# base => 'tries', |
|
# value => 'final table parts', |
|
# shortdesc => 'Summary of Parts Correct', |
|
# longdesc => 'A summary table of the average number of problem parts '. |
|
# 'students were able to get correct on each sequence.', |
|
# }, |
); |
); |
|
|
sub HTMLifyOutputDataDescriptions { |
sub HTMLifyOutputDataDescriptions { |
Line 540 sub CreateAndParseOutputDataSelector {
|
Line 571 sub CreateAndParseOutputDataSelector {
|
foreach my $option (@OutputDataOptions) { |
foreach my $option (@OutputDataOptions) { |
$Str .= "\n".' <option value="'.$option->{'value'}.'"'; |
$Str .= "\n".' <option value="'.$option->{'value'}.'"'; |
$Str .= " selected " if ($option->{'value'} eq $data); |
$Str .= " selected " if ($option->{'value'} eq $data); |
$Str .= ">".$option->{'name'}."<\/option>"; |
$Str .= ">".&mt($option->{'name'})."<\/option>"; |
} |
} |
$Str .= "\n</select>"; |
$Str .= "\n</select>"; |
return $Str; |
return $Str; |
Line 581 sub html_initialize {
|
Line 612 sub html_initialize {
|
$padding = ' 'x3; |
$padding = ' 'x3; |
$count = 0; |
$count = 0; |
$nodata_count = 0; |
$nodata_count = 0; |
|
undef(%prog_state); |
# |
# |
$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>"); |
Line 829 my $cols_output;
|
Line 861 my $cols_output;
|
my %prog_state; # progress window state |
my %prog_state; # progress window state |
my $request_aborted; |
my $request_aborted; |
|
|
|
my $total_formula; |
|
|
sub excel_initialize { |
sub excel_initialize { |
my ($r) = @_; |
my ($r) = @_; |
# |
# |
$request_aborted = undef; |
undef ($excel_sheet); |
|
undef ($excel_workbook); |
|
undef ($filename); |
|
undef ($rows_output); |
|
undef ($cols_output); |
|
undef (%prog_state); |
|
undef ($request_aborted); |
|
undef ($total_formula); |
|
# |
my $total_columns = scalar(&get_student_fields_to_show()); |
my $total_columns = scalar(&get_student_fields_to_show()); |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
# Add 2 because we need a 'sum' and 'total' column for each |
# Add 2 because we need a 'sum' and 'total' column for each |
Line 867 You may consider reducing the number of
|
Line 909 You may consider reducing the number of
|
have selected. |
have selected. |
</p><p> |
</p><p> |
LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the |
LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the |
summary data (<b>Scores Sum</b> or <b>Scores Sum & Totals</b>). |
<b>Scores Summary</b> data. |
</p> |
</p> |
END |
END |
$request_aborted = 1; |
$request_aborted = 1; |
Line 913 END
|
Line 955 END
|
# |
# |
# Add a worksheet |
# 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 = &Apache::loncommon::clean_excel_name($sheetname); |
$sheetname = substr($sheetname,0,31); |
|
} |
|
$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 |
Line 965 END
|
Line 1005 END
|
} |
} |
# |
# |
# Add the remaining column headers |
# Add the remaining column headers |
|
my $total_formula_string = '=0'; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
$excel_sheet->write($rows_output+$row_offset, |
$excel_sheet->write($rows_output+$row_offset, |
$cols_output,$seq->{'title'}); |
$cols_output,$seq->{'title'}); |
if ($data eq 'tries' || $data eq 'scores') { |
if ($data eq 'tries' || $data eq 'scores') { |
|
# Determine starting cell |
|
$seq->{'Excel:startcell'}= |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($rows_output,$cols_output); |
|
$seq->{'Excel:startcol'}=$cols_output; |
|
# Put the names of the problems and parts into the sheet |
foreach my $res (@{$seq->{'contents'}}) { |
foreach my $res (@{$seq->{'contents'}}) { |
next if ($res->{'type'} ne 'assessment'); |
next if ($res->{'type'} ne 'assessment'); |
if (scalar(@{$res->{'parts'}}) > 1) { |
if (scalar(@{$res->{'parts'}}) > 1) { |
Line 983 END
|
Line 1030 END
|
$res->{'title'}); |
$res->{'title'}); |
} |
} |
} |
} |
$excel_sheet->write($rows_output,$cols_output++,'score'); |
# Determine ending cell |
$excel_sheet->write($rows_output,$cols_output++,'maximum'); |
$seq->{'Excel:endcell'} = |
} elsif ($data eq 'sum and total' || $data eq 'parts correct total') { |
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
$excel_sheet->write($rows_output+1,$cols_output,'score'); |
($rows_output,$cols_output-1); |
$excel_sheet->write($rows_output+1,$cols_output+1,'maximum'); |
$seq->{'Excel:endcol'}=$cols_output-1; |
$cols_output += 2; |
# Create the formula for summing up this sequence |
|
$seq->{'Excel:sum'}= $excel_sheet->store_formula |
|
('=SUM('.$seq->{'Excel:startcell'}. |
|
':'.$seq->{'Excel:endcell'}.')'); |
|
} |
|
# Determine cell the score is held in |
|
$seq->{'Excel:scorecell'} = |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($rows_output,$cols_output); |
|
$seq->{'Excel:scorecol'}=$cols_output; |
|
if ($data eq 'parts correct total') { |
|
$excel_sheet->write($rows_output,$cols_output++,'parts correct'); |
} else { |
} else { |
$cols_output++; |
$excel_sheet->write($rows_output,$cols_output++,'score'); |
} |
} |
|
# |
|
$total_formula_string.='+'. |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($rows_output,$cols_output-1); |
|
$excel_sheet->write($rows_output,$cols_output++,'maximum'); |
} |
} |
|
$excel_sheet->write($rows_output,$cols_output++,'Grand Total'); |
|
$total_formula = $excel_sheet->store_formula($total_formula_string); |
# |
# |
# Bookkeeping |
# Bookkeeping |
if ($data eq 'sum and total' || $data eq 'parts correct total') { |
if ($data eq 'sum and total' || $data eq 'parts correct total') { |
Line 1013 END
|
Line 1078 END
|
} |
} |
# |
# |
# Add the maximums for each sequence or assessment |
# Add the maximums for each sequence or assessment |
|
my %total_cell_translation; |
|
my $grand_total = 0; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
|
$total_cell_translation{$seq->{'Excel:scorecell'}} = |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($rows_output,$seq->{'Excel:scorecol'}); |
my $weight; |
my $weight; |
my $max = 0; |
my $max = 0; |
foreach my $resource (@{$seq->{'contents'}}) { |
foreach my $resource (@{$seq->{'contents'}}) { |
Line 1039 END
|
Line 1109 END
|
if (! ($data eq 'sum only' || $data eq 'parts correct')) { |
if (! ($data eq 'sum only' || $data eq 'parts correct')) { |
$excel_sheet->write($rows_output,$cols_output++,''); |
$excel_sheet->write($rows_output,$cols_output++,''); |
} |
} |
$excel_sheet->write($rows_output,$cols_output++,$max); |
# |
|
if ($data eq 'tries' || $data eq 'scores') { |
|
my %replaceCells; |
|
$replaceCells{$seq->{'Excel:startcell'}} = |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($rows_output,$seq->{'Excel:startcol'}); |
|
$replaceCells{$seq->{'Excel:endcell'}} = |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($rows_output,$seq->{'Excel:endcol'}); |
|
$excel_sheet->repeat_formula($rows_output,$cols_output++, |
|
$seq->{'Excel:sum'},undef, |
|
%replaceCells); |
|
} else { |
|
$excel_sheet->write($rows_output,$cols_output++, |
|
$max); |
|
} |
|
$grand_total+=$max; |
|
} |
|
if ($data eq 'tries' || $data eq 'scores') { |
|
$excel_sheet->repeat_formula($rows_output,$cols_output++, |
|
$total_formula,undef, |
|
%total_cell_translation); |
|
} else { |
|
$excel_sheet->write($rows_output,$cols_output++,$grand_total); |
} |
} |
$rows_output++; |
$rows_output++; |
# |
# |
Line 1056 END
|
Line 1149 END
|
($r,'Excel File Compilation Status', |
($r,'Excel File Compilation Status', |
'Excel File Compilation Progress', $studentcount); |
'Excel File Compilation Progress', $studentcount); |
# |
# |
|
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
|
'Processing first student'); |
return; |
return; |
} |
} |
|
|
Line 1082 sub excel_outputstudent {
|
Line 1177 sub excel_outputstudent {
|
} |
} |
# |
# |
# Write out sequence scores and totals data |
# Write out sequence scores and totals data |
|
my %total_cell_translation; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
|
# Keep track of cells to translate in total cell |
|
$total_cell_translation{$seq->{'Excel:scorecell'}} = |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($rows_output,$seq->{'Excel:scorecol'}); |
|
# |
my ($performance,$performance_length,$score,$seq_max,$rawdata); |
my ($performance,$performance_length,$score,$seq_max,$rawdata); |
if ($base eq 'tries') { |
if ($base eq 'tries') { |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
Line 1097 sub excel_outputstudent {
|
Line 1198 sub excel_outputstudent {
|
foreach my $value (@$rawdata) { |
foreach my $value (@$rawdata) { |
$excel_sheet->write($rows_output,$cols_output++,$value); |
$excel_sheet->write($rows_output,$cols_output++,$value); |
} |
} |
$excel_sheet->write($rows_output,$cols_output++,$score); |
# Write a formula for the sum of this sequence |
|
my %replaceCells; |
|
$replaceCells{$seq->{'Excel:startcell'}} = |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($rows_output,$seq->{'Excel:startcol'}); |
|
$replaceCells{$seq->{'Excel:endcell'}} = |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($rows_output,$seq->{'Excel:endcol'}); |
|
# The undef is for the format |
|
$excel_sheet->repeat_formula($rows_output,$cols_output++, |
|
$seq->{'Excel:sum'},undef, |
|
%replaceCells); |
|
# |
$excel_sheet->write($rows_output,$cols_output++,$seq_max); |
$excel_sheet->write($rows_output,$cols_output++,$seq_max); |
} elsif ($data eq 'sum and total' || $data eq 'sum only' || |
} elsif ($data eq 'sum and total' || $data eq 'sum only' || |
$data eq 'parts correct' || $data eq 'parts correct total') { |
$data eq 'parts correct' || $data eq 'parts correct total') { |
Line 1108 sub excel_outputstudent {
|
Line 1221 sub excel_outputstudent {
|
} |
} |
} |
} |
# |
# |
|
$excel_sheet->repeat_formula($rows_output,$cols_output++, |
|
$total_formula,undef, |
|
%total_cell_translation); |
|
|
|
# |
# Bookkeeping |
# Bookkeeping |
$rows_output++; |
$rows_output++; |
$cols_output=0; |
$cols_output=0; |
Line 1167 sub csv_initialize{
|
Line 1285 sub csv_initialize{
|
my ($r) = @_; |
my ($r) = @_; |
# |
# |
# Clean up |
# Clean up |
$filename = undef; |
undef($outputfile); |
$outputfile = undef; |
undef($filename); |
|
undef($request_aborted); |
undef(%prog_state); |
undef(%prog_state); |
# |
# |
# Deal with unimplemented requests |
# Deal with unimplemented requests |
Line 1372 sub StudentTriesOnSequence {
|
Line 1491 sub StudentTriesOnSequence {
|
$performance_length++; |
$performance_length++; |
my $symbol = ' '; # default to space |
my $symbol = ' '; # default to space |
# |
# |
|
my $awarded = 0; |
|
if (exists($resource_data->{'resource.'.$partnum.'.awarded'})) { |
|
$awarded = $resource_data->{'resource.'.$partnum.'.awarded'}; |
|
$awarded = 0 if (! $awarded); |
|
} |
|
# |
|
my $status = ''; |
if (exists($resource_data->{'resource.'.$partnum.'.solved'})) { |
if (exists($resource_data->{'resource.'.$partnum.'.solved'})) { |
my $status = $resource_data->{'resource.'.$partnum.'.solved'}; |
$status = $resource_data->{'resource.'.$partnum.'.solved'}; |
if ($status eq 'correct_by_override') { |
} |
$symbol = '+'; |
# |
$sum++; |
my $tries = 0; |
} elsif ($status eq 'incorrect_by_override') { |
if(exists($resource_data->{'resource.'.$partnum.'.tries'})) { |
$symbol = '-'; |
$tries = $resource_data->{'resource.'.$partnum.'.tries'}; |
} elsif ($status eq 'ungraded_attempted') { |
} |
$symbol = '#'; |
# |
} elsif ($status eq 'incorrect_attempted') { |
if ($awarded > 0) { |
$symbol = '.'; |
# The student has gotten the problem correct to some degree |
} elsif ($status eq 'excused') { |
if ($status eq 'excused') { |
$symbol = 'x'; |
$symbol = 'x'; |
$max--; |
$max--; |
} elsif ($status eq 'correct_by_student' && |
} elsif ($status eq 'correct_by_override') { |
exists($resource_data->{'resource.'.$partnum.'.tries'})){ |
$symbol = '+'; |
$tries = $resource_data->{'resource.'.$partnum.'.tries'}; |
$sum++; |
|
} elsif ($tries > 0) { |
if ($tries > 9) { |
if ($tries > 9) { |
$symbol = '*'; |
$symbol = '*'; |
} elsif ($tries > 0) { |
|
$symbol = $tries; |
|
} else { |
} else { |
$symbol = ' '; |
$symbol = $tries; |
} |
} |
$sum++; |
$sum++; |
} elsif (exists($resource_data->{'resource.'. |
|
$partnum.'.tries'})){ |
|
$symbol = '.'; |
|
} else { |
} else { |
$symbol = ' '; |
$symbol = '+'; |
|
$sum++; |
} |
} |
} else { |
} else { |
# Unsolved. Did they try? |
# The student has the problem incorrect or it is ungraded |
if (exists($resource_data->{'resource.'.$partnum.'.tries'})){ |
if ($status eq 'excused') { |
|
$symbol = 'x'; |
|
$max--; |
|
} elsif ($status eq 'incorrect_by_override') { |
|
$symbol = '-'; |
|
} elsif ($status eq 'ungraded_attempted') { |
|
$symbol = '#'; |
|
} elsif ($status eq 'incorrect_attempted' || |
|
$tries > 0) { |
$symbol = '.'; |
$symbol = '.'; |
} else { |
} else { |
$symbol = ' '; |
# Problem is wrong and has not been attempted. |
|
$symbol=' '; |
} |
} |
} |
} |
# |
# |
Line 1425 sub StudentTriesOnSequence {
|
Line 1557 sub StudentTriesOnSequence {
|
$symbol = '<a href="/adm/grades'. |
$symbol = '<a href="/adm/grades'. |
'?symb='.&Apache::lonnet::escape($resource->{'symb'}). |
'?symb='.&Apache::lonnet::escape($resource->{'symb'}). |
'&student='.$student->{'username'}. |
'&student='.$student->{'username'}. |
'&domain='.$student->{'domain'}. |
'&userdom='.$student->{'domain'}. |
'&command=submission">'.$symbol.'</a>'; |
'&command=submission">'.$symbol.'</a>'; |
} |
} |
$value .= $symbol; |
$value .= $symbol; |
Line 1493 sub StudentPerformanceOnSequence {
|
Line 1625 sub StudentPerformanceOnSequence {
|
my $awarded = 0; |
my $awarded = 0; |
if (exists($resource_data->{'resource.'.$part.'.awarded'})) { |
if (exists($resource_data->{'resource.'.$part.'.awarded'})) { |
$awarded = $resource_data->{'resource.'.$part.'.awarded'}; |
$awarded = $resource_data->{'resource.'.$part.'.awarded'}; |
|
$awarded = 0 if (! $awarded); |
} |
} |
# |
# |
$partscore = $weight*$awarded; |
$partscore = $weight*$awarded; |
$score += $partscore; |
$score += $partscore; |
$symbol = $weight; |
$symbol = $partscore; |
|
if (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) { |
|
$symbol = sprintf("%.0f",$symbol); |
|
} |
if (length($symbol) > 1) { |
if (length($symbol) > 1) { |
$symbol = '*'; |
$symbol = '*'; |
} |
} |
Line 1525 sub StudentPerformanceOnSequence {
|
Line 1661 sub StudentPerformanceOnSequence {
|
$symbol = '<a href="/adm/grades'. |
$symbol = '<a href="/adm/grades'. |
'?symb='.&Apache::lonnet::escape($resource->{'symb'}). |
'?symb='.&Apache::lonnet::escape($resource->{'symb'}). |
'&student='.$student->{'username'}. |
'&student='.$student->{'username'}. |
'&domain='.$student->{'domain'}. |
'&userdom='.$student->{'domain'}. |
'&command=submission">'.$symbol.'</a>'; |
'&command=submission">'.$symbol.'</a>'; |
} |
} |
$Str .= $symbol; |
$Str .= $symbol; |