version 1.149, 2008/09/16 08:49:08
|
version 1.154, 2009/05/17 22:55:42
|
Line 369 sub CreateInterface {
|
Line 369 sub CreateInterface {
|
$Str .= ' 'x5; |
$Str .= ' 'x5; |
$Str .= '<input type="submit" name="ClearCache" value="'. |
$Str .= '<input type="submit" name="ClearCache" value="'. |
&mt('Clear Caches').'" />'; |
&mt('Clear Caches').'" />'; |
$Str .= ' 'x5; |
$Str .= '<p>'; |
$Str .= |
$Str .= |
&mt('Status [_1]', |
&mt('Status [_1]', |
'<input type="text" name="stats_status" size="60" value="" readonly="readonly" />'); |
'<input type="text" name="stats_status" size="60" value="" readonly="readonly" />'); |
$Str .= '<br />'; |
$Str .= '</p>'; |
return $Str; |
return $Str; |
} |
} |
|
|
Line 675 sub html_initialize {
|
Line 675 sub html_initialize {
|
$r->print(<<NEW_WINDOW_CHECKBOX); |
$r->print(<<NEW_WINDOW_CHECKBOX); |
<script type="text/javascript">new_window = true;</script> |
<script type="text/javascript">new_window = true;</script> |
<p><label>$labeltext |
<p><label>$labeltext |
<input type="checkbox" checked="1" onclick="new_window=this.checked" /> |
<input type="checkbox" checked="checked" onclick="new_window=this.checked" /> |
</label></p> |
</label></p> |
NEW_WINDOW_CHECKBOX |
NEW_WINDOW_CHECKBOX |
} |
} |
Line 713 NEW_WINDOW_CHECKBOX
|
Line 713 NEW_WINDOW_CHECKBOX
|
$width{$symb}->{'width_sum'} += 1; |
$width{$symb}->{'width_sum'} += 1; |
} |
} |
$total_count += &count_parts($navmap,$seq); |
$total_count += &count_parts($navmap,$seq); |
# Use 3 digits for the sum |
# Use 6 digits for the sum |
$width{$symb}->{'width_sum'} += 3; |
$width{$symb}->{'width_sum'} += 6; |
} |
} |
# Compute width of maximum |
# Compute width of maximum |
if ($chosen_output->{'sequence_max'}) { |
if ($chosen_output->{'sequence_max'}) { |
Line 722 NEW_WINDOW_CHECKBOX
|
Line 722 NEW_WINDOW_CHECKBOX
|
# One digit for the '/' |
# One digit for the '/' |
$width{$symb}->{'width_sum'} +=1; |
$width{$symb}->{'width_sum'} +=1; |
} |
} |
# Use 3 digits for the total |
# Use 6 digits for the total |
$width{$symb}->{'width_sum'}+=3; |
$width{$symb}->{'width_sum'}+=6; |
} |
} |
# |
# |
if ($chosen_output->{'every_problem'}) { |
if ($chosen_output->{'every_problem'}) { |
Line 885 sub html_outputstudent {
|
Line 885 sub html_outputstudent {
|
$ratio .= ' '; |
$ratio .= ' '; |
} |
} |
if ($chosen_output->{'sequence_sum'} && $score ne ' ') { |
if ($chosen_output->{'sequence_sum'} && $score ne ' ') { |
my $score .= sprintf("%3.0f",$score); |
my $score .= sprintf("%3.2f",$score); |
$ratio .= (' 'x(3-length($score))).$score; |
$ratio .= (' 'x(6-length($score))).$score; |
} elsif($chosen_output->{'sequence_sum'}) { |
} elsif($chosen_output->{'sequence_sum'}) { |
$ratio .= ' 'x3; |
$ratio .= ' 'x6; |
} |
} |
if ($chosen_output->{'sequence_max'}) { |
if ($chosen_output->{'sequence_max'}) { |
if ($chosen_output->{'sequence_sum'}) { |
if ($chosen_output->{'sequence_sum'}) { |
$ratio .= '/'; |
$ratio .= '/'; |
} |
} |
$ratio .= sprintf("%3.0f",$seq_max); |
my $sequence_total=sprintf("%3.2f",$seq_max); |
|
$ratio .= $sequence_total.(' 'x(6-length($sequence_total))); |
} |
} |
# |
# |
if (! $chosen_output->{'every_problem'}) { |
if (! $chosen_output->{'every_problem'}) { |
Line 928 sub html_outputstudent {
|
Line 929 sub html_outputstudent {
|
if (! defined($score)) { |
if (! defined($score)) { |
$score = ' ' x $total_sum_width; |
$score = ' ' x $total_sum_width; |
} else { |
} else { |
$score = sprintf("%.0f",$score); |
$score = sprintf("%.2f",$score); |
$score = (' 'x(3-length($score))).$score; |
$score = (' 'x(6-length($score))).$score; |
} |
} |
$Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max; |
$Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max; |
$Str .= " \n"; |
$Str .= " \n"; |
Line 962 sub html_finish {
|
Line 963 sub html_finish {
|
|
|
sub StudentAverageTotal { |
sub StudentAverageTotal { |
my $Str = '<h3>'.&mt('Summary Tables').'</h3>'.$/; |
my $Str = '<h3>'.&mt('Summary Tables').'</h3>'.$/; |
$Str .= '<table border=2 cellspacing="1">'."\n"; |
$Str .= &Apache::loncommon::start_data_table(); |
$Str .= '<tr>'. |
$Str .= &Apache::loncommon::start_data_table_header_row(). |
'<th>'.&mt('Title').'</th>'. |
'<th>'.&mt('Title').'</th>'. |
'<th>'.&mt('Average').'</th>'. |
'<th>'.&mt('Average').'</th>'. |
'<th>'.&mt('Maximum').'</th>'. |
'<th>'.&mt('Maximum').'</th>'. |
'</tr>'.$/; |
&Apache::loncommon::end_data_table_header_row().$/; |
foreach my $seq (@sequences) { |
foreach my $seq (@sequences) { |
my $symb = $seq->symb; |
my $symb = $seq->symb; |
my $ave; |
my $ave; |
Line 981 sub StudentAverageTotal {
|
Line 982 sub StudentAverageTotal {
|
} |
} |
my $max = $Statistics->{$symb}->{'max'}; |
my $max = $Statistics->{$symb}->{'max'}; |
$ave = sprintf("%.2f",$ave); |
$ave = sprintf("%.2f",$ave); |
$Str .= '<tr><td>'.$seq->compTitle.'</td>'. |
$Str .= &Apache::loncommon::start_data_table_row(). |
|
'<td>'.$seq->compTitle.'</td>'. |
'<td align="right">'.$ave.' </td>'. |
'<td align="right">'.$ave.' </td>'. |
'<td align="right">'.$max.' '.'</td></tr>'."\n"; |
'<td align="right">'.$max.' '.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
} |
} |
$Str .= "</table>\n"; |
$Str .= &Apache::loncommon::end_data_table()."\n"; |
return $Str; |
return $Str; |
} |
} |
|
|
Line 996 sub SingleStudentTotal {
|
Line 999 sub SingleStudentTotal {
|
$student->{'fullname'}, |
$student->{'fullname'}, |
$student->{'username'},$student->{'domain'}).'</h3>'; |
$student->{'username'},$student->{'domain'}).'</h3>'; |
$Str .= $/; |
$Str .= $/; |
$Str .= '<table border=2 cellspacing="1">'."\n"; |
$Str .= &Apache::loncommon::start_data_table()."\n"; |
$Str .= |
$Str .= |
'<tr>'. |
&Apache::loncommon::start_data_table_header_row(). |
'<th>'.&mt('Sequence or Folder').'</th>'; |
'<th>'.&mt('Sequence or Folder').'</th>'; |
if ($chosen_output->{'base'} eq 'tries') { |
if ($chosen_output->{'base'} eq 'tries') { |
$Str .= '<th>'.&mt('Parts Correct').'</th>'; |
$Str .= '<th>'.&mt('Parts Correct').'</th>'; |
} else { |
} else { |
$Str .= '<th>'.&mt('Score').'</th>'; |
$Str .= '<th>'.&mt('Score').'</th>'; |
} |
} |
$Str .= '<th>'.&mt('Maximum').'</th>'."</tr>\n"; |
$Str .= '<th>'.&mt('Maximum').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row()."\n"; |
my $total = 0; |
my $total = 0; |
my $total_max = 0; |
my $total_max = 0; |
foreach my $seq (@sequences) { |
foreach my $seq (@sequences) { |
my $value = $Statistics->{$seq->symb}->{'score'}; |
my $value = $Statistics->{$seq->symb}->{'score'}; |
my $max = $Statistics->{$seq->symb}->{'max'}; |
my $max = $Statistics->{$seq->symb}->{'max'}; |
$Str .= '<tr><td>'.&HTML::Entities::encode($seq->compTitle).'</td>'. |
$Str .= &Apache::loncommon::start_data_table_row(). |
|
'<td>'.&HTML::Entities::encode($seq->compTitle).'</td>'. |
'<td align="right">'.$value.'</td>'. |
'<td align="right">'.$value.'</td>'. |
'<td align="right">'.$max.'</td></tr>'."\n"; |
'<td align="right">'.$max.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
$total += $value; |
$total += $value; |
$total_max +=$max; |
$total_max +=$max; |
} |
} |
$Str .= '<tr><td><b>'.&mt('Total').'</b></td>'. |
$Str .= &Apache::loncommon::start_data_table_row(). |
|
'<td><b>'.&mt('Total').'</b></td>'. |
'<td align="right">'.$total.'</td>'. |
'<td align="right">'.$total.'</td>'. |
'<td align="right">'.$total_max."</td></tr>\n"; |
'<td align="right">'.$total_max.'</td>'. |
$Str .= "</table>\n"; |
&Apache::loncommon::end_data_table_row()."\n"; |
|
$Str .= &Apache::loncommon::end_data_table()."\n"; |
return $Str; |
return $Str; |
} |
} |
|
|
Line 1431 sub excel_initialize {
|
Line 1439 sub excel_initialize {
|
if ($env{'form.SelectedStudent'}) { |
if ($env{'form.SelectedStudent'}) { |
$studentcount = '1'; |
$studentcount = '1'; |
} |
} |
if ($studentcount > 1) { |
$r->print('<p>' |
$r->print('<h1>'.&mt('Compiling Excel spreadsheet for [_1] students', |
.&mt('Compiling Excel spreadsheet for [quant,_1,student]...',$studentcount) |
$studentcount)."</h1>\n"); |
."</p>\n" |
} else { |
); |
$r->print('<h1>'. |
|
&mt('Compiling Excel spreadsheet for 1 student'). |
|
"</h1>\n"); |
|
} |
|
$r->rflush(); |
$r->rflush(); |
# |
# |
# Initialize progress window |
# Initialize progress window |
Line 1586 sub excel_finish {
|
Line 1590 sub excel_finish {
|
# |
# |
# Tell the user where to get their excel file |
# Tell the user where to get their excel file |
$r->print('<br />'. |
$r->print('<br />'. |
'<a href="'.$filename.'">Your Excel spreadsheet.</a>'."\n"); |
'<a href="'.$filename.'">'.&mt('Your Excel spreadsheet').'</a>'."\n"); |
$r->rflush(); |
$r->rflush(); |
&excel_cleanup(); |
&excel_cleanup(); |
return; |
return; |