--- loncom/interface/lonpickcode.pm 2005/04/07 06:56:23 1.6 +++ loncom/interface/lonpickcode.pm 2006/03/15 22:11:04 1.9 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a CODE from the list of possible CODEs # -# $Id: lonpickcode.pm,v 1.6 2005/04/07 06:56:23 albertel Exp $ +# $Id: lonpickcode.pm,v 1.9 2006/03/15 22:11:04 albertel 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,27 +60,65 @@ 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', - 'form','scantron_format', - 'scantron_CODElist']); + 'form','scantron_format','symb', + 'scantron_CODElist','command']); 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); + } elsif ($env{'form.command'} eq 'showcodes') { + &show_codes($r); + } else { + &picking_a_code($r); + } + $r->print(&Apache::loncommon::end_page()); + return OK; +} + +sub code_list { + my ($r,$secondview)=@_; + if (!$secondview) { + $r->print(&Apache::loncommon::start_page("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.')."

"); + } + $r->print("
"); + $r->print(&Apache::grades::scantron_CODElist()); + $r->print(""); + $r->print(""); + $r->print(""); + $r->print(""); + $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::start_page("View CODEs")); + my %codes=&Apache::grades::get_codes(); + $r->print("

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

"); + $r->print('
');
+    foreach my $code (sort(keys(%codes))) {
+	$r->print($code."\n");
+    }
+    $r->print('
'); + &code_list($r,1); +} - $r->print(&Apache::loncommon::bodytag("Selecting a CODE")); +sub picking_a_code { + my ($r)=@_; + $r->print(&Apache::loncommon::start_page("Selecting a CODE")); $r->print(< function gochoose(newcode) { @@ -125,8 +163,7 @@ ENDSCRIPT $to_print.=''; if ($print) { $r->print($to_print); } } - $r->print(''); - return OK; + $r->print(''); } 1;