version 1.150, 2008/09/16 13:10:19
|
version 1.153, 2009/05/17 22:49:42
|
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 1438 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 1593 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; |