--- loncom/interface/lonpickcode.pm 2005/08/12 22:14:12 1.7
+++ loncom/interface/lonpickcode.pm 2007/10/12 20:08:38 1.13
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Pick a CODE from the list of possible CODEs
#
-# $Id: lonpickcode.pm,v 1.7 2005/08/12 22:14:12 albertel Exp $
+# $Id: lonpickcode.pm,v 1.13 2007/10/12 20:08:38 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,7 +43,7 @@ sub get_code_freq {
$r->rflush();
my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
for (my $i=0;$i<=$scanlines->{'count'};$i++) {
- my $line=&Apache::grades::scantron_get_line($scanlines,$i);
+ my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }
my $scan_record=
&Apache::grades::scantron_parse_scanline($line,$i,
@@ -60,13 +60,6 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
- my $html=&Apache::lonxml::xmlbegin();
- $r->print(<<ENDDOCUMENT);
-$html
- <head>
- <title>The LearningOnline Network with CAPA</title>
- </head>
-ENDDOCUMENT
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['curCODE','scantron_selectfile',
@@ -75,42 +68,69 @@ ENDDOCUMENT
if (!($env{'request.course.id'}) &&
(&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
- $r->print('<body>Access not allowed.</body>');
+ $r->print(&Apache::loncommon::start_page().
+ &mt('Access not allowed.').
+ &Apache::loncommon::end_page());
return OK;
}
if ($env{'form.command'} eq 'codelist') {
&code_list($r);
+ $r->print(&Apache::grades::show_grading_menu_form($env{'form.symb'},
+ $env{'form.url'}));
} elsif ($env{'form.command'} eq 'showcodes') {
&show_codes($r);
} else {
&picking_a_code($r);
}
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::end_page());
return OK;
}
sub code_list {
- my ($r,$secondview)=@_;
- if (!$secondview) {
- $r->print(&Apache::loncommon::bodytag("View CODEs"));
- $r->print("<p>".&mt('Select a set of saved CODEs to view.')."</p>");
- } else {
- $r->print("<p>".&mt('Select another set of saved CODEs to view.')."</p>");
+ my ($r,$context)=@_;
+ # $context = 0 Print page header and enclosing table
+ # $context = 1 No page header, print enclosing table
+ # $context = 2 No page header, no enclosing table
+ my $table_head;
+ my $enc_table_start;
+ my $enc_table_close;
+
+ if (!$context) {
+ $r->print(&Apache::loncommon::start_page("View CODEs",undef,
+ {'no_nav_bar' => 1}));
+ $table_head = ('<b>'.&mt('Select a set of saved CODEs to view.')."</b>");
+ } elsif ($context eq 1) {
+ $table_head = ('<b>'.&mt('Select another set of saved CODEs to view.')."</b>");
+ $enc_table_start = '<table width="100%"><tr><td bgcolor="#777777">';
+ $enc_table_close = '</tr></td></table>';
+ } elsif ($context eq 2) {
+ $table_head = ('<b>'.&mt('Select a set of saved CODEs to view.')."</b>");
}
$r->print("<form method='POST' action='/adm/pickcode' name='pickcode'>");
+ $r->print($enc_table_start);
+ $r->print('<table width="100%">');
+ $r->print('<tr><td bgcolor="#e6ffff">');
+ $r->print($table_head);
+ $r->print('</td></tr>');
+ $r->print('<tr><td bgcolor="#ffffe6">');
$r->print(&Apache::grades::scantron_CODElist());
+ $r->print('</td></tr>');
$r->print("<input type='hidden' name='command' value='showcodes' />");
$r->print("<input type='hidden' name='symb' value='".$env{'form.symb'}."' />");
$r->print("<input type='hidden' name='url' value='".$env{'form.url'}."' />");
+ $r->print('<tr><td bgcolor="#ffffe6">');
$r->print("<input type='submit' name='submit' value='".&mt("View")."' />");
+ $r->print('</td></tr>');
+ $r->print('</table>');
+ $r->print($enc_table_close); # conditional
$r->print("</form>");
- $r->print(&Apache::grades::show_grading_menu_form($env{'form.symb'},
- $env{'form.url'}));
+
}
sub show_codes {
my ($r)=@_;
- $r->print(&Apache::loncommon::bodytag("View CODEs"));
+ $r->print(&Apache::loncommon::start_page("View CODEs",undef,
+ {'no_nav_bar' => 1}));
my %codes=&Apache::grades::get_codes();
$r->print("<h2>".$env{'form.scantron_CODElist'}."</h2>");
$r->print('<pre>');
@@ -119,11 +139,14 @@ sub show_codes {
}
$r->print('</pre>');
&code_list($r,1);
+ $r->print(&Apache::grades::show_grading_menu_form($env{'form.symb'},
+ $env{'form.url'}));
}
sub picking_a_code {
my ($r)=@_;
- $r->print(&Apache::loncommon::bodytag("Selecting a CODE"));
+ $r->print(&Apache::loncommon::start_page("Selecting a CODE",undef,
+ {'no_nav_bar' => 1}));
$r->print(<<ENDSCRIPT);
<script>
function gochoose(newcode) {
@@ -145,7 +168,7 @@ ENDSCRIPT
my %code_freq=&get_code_freq($r);
my $num_matches=length($env{'form.curCODE'});
for (my $i=$num_matches;$i>=0;$i--) {
- my $to_print="<p> CODEs with $i matches</p>";
+ my $to_print="<p>".&mt("CODEs with [_1] matching letters",$i)."</p>";
$to_print.='<table border="1"><tr><td></td><td>CODE</td><td>exams using this CODE</td>';
my $print;
foreach my $code (sort(keys(%codes))) {