--- loncom/interface/lonpdfupload.pm 2009/04/03 15:40:17 1.2 +++ loncom/interface/lonpdfupload.pm 2009/05/25 12:54:18 1.12 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# Publication Handler +# PDF Form Upload Handler # -# $Id: lonpdfupload.pm,v 1.2 2009/04/03 15:40:17 onken Exp $ +# $Id: lonpdfupload.pm,v 1.12 2009/05/25 12:54:18 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,7 +65,7 @@ sub handler() { $env{'request.uri'}=$r->uri; $r->content_type('text/html'); $r->send_http_header(); - $r->print(&Apache::loncommon::start_page('Upload-PDF-Form')); + $r->print(&Apache::loncommon::start_page('Upload PDF Form')); #load post data into environment &Apache::lonacc::get_posted_cgi($r); @@ -80,10 +80,16 @@ sub handler() { } #link to course-content - $r->print("
\n \n ".&mt("Navigate Contents")."\n \n
"); + $r->print('
' + .'

'."\n" + .''."\n" + .&mt("Navigate Contents")."\n" + .''."\n" + .'

'."\n" + ); #&dumpenv($r); #debug -> prints the environment - $r->print(" \n\n"); + $r->print(&Apache::loncommon::end_page()); return OK; } @@ -116,7 +122,7 @@ END sub get_javascripts() { - my $message = &mt('Please choose a PDF-File'); + my $message = &mt('Please choose a PDF-File.'); # simple test if the upload ends with ".pdf" # it's only for giving a message to the user @@ -139,42 +145,29 @@ END sub get_uploadform() { - my $result = < -

-
- -
- - - - -
- - - - - - - - - - - -
- PDF-Formular einsenden -
- Datei auswählen - - -
- -
-
-
-
-END -; + + my %lt = &Apache::lonlocal::texthash( + 'title' => 'Upload a PDF Form with filled Form Fields', + 'chFile' => 'File', + 'submit' => 'Upload', + ); + + my $result = + '
' + .'
' + .'' + .&Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_headline() + .'

'.$lt{'title'}.'

' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title($lt{'chFile'}) + .'' + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + .'' + .'
' + .'
'; + return $result; } @@ -187,7 +180,9 @@ sub processPDF { if (scalar @pdfdata) { &grade_pdf(@pdfdata); } else { - $result .= "

".&mt("Can't find any valid PDF-formfields")."

"; + $result .= '

' + .&mt("Can't find any valid PDF formfields.") + .'

'; } } @@ -222,16 +217,20 @@ sub grade_pdf { my $debug = (); $debug .= "Found: ". scalar @pdfdata." Entries \n"; - $result .= "\n"; + foreach my $entry (sort(@pdfdata)) { if ($entry =~ /^meta.*/) { $debug .= 'found: metadata -> '.$entry . "
"; my ($label, $value) = ($entry =~ /^([^?]*)\?(.*)/); my ($domain, $user) = split('&', $value); - $user =~ s/(.*)\n/$1/; #TODO find an other way + $user =~ s/(.*)\n/$1/; #TODO is that equals to chomp? if($user ne $env{'user.name'} or $domain ne $env{'user.domain'}) { - return "
".&mt('Wrong username in PDF-File').": $user $domain -> $env{'user.domain'} $env{'user.name'}
"; + return '

' + .&mt('Wrong username ([_1]) found in PDF file. Expected username: [_2]' + ,$user.':'.$domain + ,$env{'user.domain'}.':'.$env{'user.name'}) + .'

'; } } elsif($entry =~ /^upload.*/) { @@ -241,7 +240,7 @@ sub grade_pdf { my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symb); $value =~ s/(.*)\n/$1/; - #fehlerhafte Radiobuttons rausfiltern (Bug in CABAReT Stage) + #filter incorrect radiobuttons (Bug in CABAReT Stage) if($type eq 'radiobuttonresponse' && $value eq 'Off' ) { next; } @@ -262,44 +261,74 @@ sub grade_pdf { next; } } - $result .= $debug; + #$result .= $debug; + + $result .= '

'.&mt('Results of PDF Form problems').'

'; + $result .= &Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'' + .'' + .&Apache::loncommon::start_data_table_header_row() + .&Apache::loncommon::end_data_table_header_row(); foreach my $key (sort (keys %problems)) { my %problem = %{$problems{$key}}; my ($problemname, $grade) = &grade_problem(%problem); - $result .= "
'.&mt('Problem Name').''.&mt('Grading').'
$problemname(.*)<\/td>.*/$1/g; - $content = $1; + &Apache::loncommon::ssi_with_retries('/res/'.$problem{'resource'}, 5, %problem); - my $part = $problem{submitted}; + $title = &Apache::lonnet::gettitle($problem{'symb'}); + $part = $problem{submitted}; $part =~ s/part_(.*)/$1/; - $content .= " - Part $part"; + unless($part eq '0') { + #add information about part number + $title .= " - Part $part"; + } my %problemhash = &Apache::lonnet::restore($problem{'symb'}); my $grade = $problemhash{"resource.$part.award"}; - return ($content, $grade); + return ($title, $grade); +} + +sub parse_grade_answer { + my ($shortcut) = @_; + my %answerhash = ('EXACT_ANS' => &mt('You are correct.'), + 'APPROX_ANS' => &mt('You are correct.'), + 'INCORRECT' => &mt('You are incorrect'), + ); + + foreach my $key (keys %answerhash) { + if($shortcut eq $key) { + return $answerhash{$shortcut}; + } + } + return &mt('See course contents for further information.'); + } + sub dumpenv { my $r = shift;