--- 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(< - The LearningOnline Network with CAPA - -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('Access not allowed.'); + $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(''); + $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("

".&mt('Select a set of saved CODEs to view.')."

"); - } else { - $r->print("

".&mt('Select another set of saved CODEs to view.')."

"); + 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 = (''.&mt('Select a set of saved CODEs to view.').""); + } elsif ($context eq 1) { + $table_head = (''.&mt('Select another set of saved CODEs to view.').""); + $enc_table_start = '
'; + $enc_table_close = '
'; + } elsif ($context eq 2) { + $table_head = (''.&mt('Select a set of saved CODEs to view.').""); } $r->print("
"); + $r->print($enc_table_start); + $r->print(''); + $r->print(''); + $r->print(''); $r->print(""); $r->print(""); $r->print(""); + $r->print(''); + $r->print('
'); + $r->print($table_head); + $r->print('
'); $r->print(&Apache::grades::scantron_CODElist()); + $r->print('
'); $r->print(""); + $r->print('
'); + $r->print($enc_table_close); # conditional $r->print("
"); - $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("

".$env{'form.scantron_CODElist'}."

"); $r->print('
');
@@ -119,11 +139,14 @@ sub show_codes {
     }
     $r->print('
'); &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(< 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="

CODEs with $i matches

"; + my $to_print="

".&mt("CODEs with [_1] matching letters",$i)."

"; $to_print.=''; my $print; foreach my $code (sort(keys(%codes))) {
CODEexams using this CODE