--- loncom/interface/lonpdfupload.pm	2009/04/04 21:47:41	1.3
+++ loncom/interface/lonpdfupload.pm	2009/05/15 23:40:54	1.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpdfupload.pm,v 1.3 2009/04/04 21:47:41 bisitz Exp $
+# $Id: lonpdfupload.pm,v 1.5 2009/05/15 23:40:54 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,7 +80,12 @@ sub handler() {
     }
 
     #link to course-content
-    $r->print("    <br />\n    <a href='/adm/navmaps'>\n      ".&mt("Navigate Contents")."\n    </a>\n    <br />");
+    $r->print('<p>'."\n"
+             .'<a href="/adm/navmaps">'."\n"
+             .&mt("Navigate Contents")."\n"
+             .'</a>'."\n"
+             .'</p>'."\n"
+    );
 
     #&dumpenv($r); #debug -> prints the environment
     $r->print("  </body> \n</html>\n");
@@ -139,42 +144,30 @@ END
 
 
 sub get_uploadform() {
-    my $result = <<END
-    <p height='25'> 
-    </p>
-    <form method="post" enctype="multipart/form-data" onsubmit="return checkFilename(this);">
-      <input type="hidden" name="type" value="upload" />
-      <div align="center">
-        <table bgcolor="#000000" width="450" cellspacing="0" cellpadding="0" border="0">
-          <tr>
-            <td>
-              <table cellspacing="1" cellpadding="2" border="0" width="100%">
-                <tr>
-                  <td colspan="2" bgcolor="#99EEEE">
-                    <b>PDF-Formular einsenden</b>
-                  </td>
-                </tr>
-                <tr>
-                  <td bgcolor="#F8F8F8">
-                      Datei ausw&auml;hlen
-                  </td>
-                  <td bgcolor="#F8F8F8">
-                    <input type="file" name="file" id="filename" />
-                  </td>
-                </tr>
-                <tr>
-                  <td bgcolor="#F8F8F8" colspan="2" align="right" style="margin-right: 30px;">
-                    <input type="submit" name="Uploaded" value="Absenden" />
-                  </td>
-                </tr>
-                </table>
-              </td>
-           </tr>
-        </table>
-      </div>
-    </form>    
-END
-;
+    
+    my %lt = &Apache::lonlocal::texthash(
+                 'title'=>'Submit a PDF-Form with problems', 
+                 'chFile' => 'Choose file',
+                 'submit'=>'Submit'
+             );
+
+    my $result = 
+        '<br />'
+       .'<form method="post" enctype="multipart/form-data" onsubmit="return checkFilename(this);">'
+       .'<input type="hidden" name="type" value="upload" />'
+       .&Apache::lonhtmlcommon::start_pick_box()
+       .&Apache::lonhtmlcommon::row_headline()
+       .'<h2>'.$lt{'title'}.'</h2>'
+       .&Apache::lonhtmlcommon::row_closure()
+       .&Apache::lonhtmlcommon::row_title($lt{'chFile'})
+       .'<input type="file" name="file" id="filename" />'
+       .&Apache::lonhtmlcommon::row_closure(1)
+       .&Apache::lonhtmlcommon::end_pick_box()
+       .'<input type="submit" name="Uploaded" value="'.$lt{'submit'}.'" />'
+       .'</form>'
+       .'<br />'
+       .'<hr />';
+
   return $result;
 }
 
@@ -222,13 +215,18 @@ sub grade_pdf {
     my $debug = ();
 
     $debug  .= "Found: ". scalar @pdfdata." Entries \n";
-    $result .= "<table width='80%'>\n";
+    $result .= '<br />';
+    $result .= &Apache::loncommon::start_data_table();
+    $result .= &Apache::loncommon::start_data_table_header_row();
+    $result .= &mt('<b>Results of PDF-Form problems</b>');
+    $result .= &Apache::loncommon::end_data_table_header_row();
+
     foreach my $entry (sort(@pdfdata)) {
         if ($entry =~ /^meta.*/) {
             $debug .= 'found: metadata -> '.$entry . "<br />";
             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 "<pre>".&mt('Wrong username in PDF-File').": $user $domain -> $env{'user.domain'} $env{'user.name'} </pre>";    
@@ -252,7 +250,7 @@ sub grade_pdf {
                  $problems{$symb.$part}{$HWVAL} = $value;
             } else {
                  $problems{$symb.$part} =  { 'resource' => $resource,
-                                        'symb' => $symb,
+                                        'symb' => &Apache::lonenc::encrypted($symb),
                                         'submitted' => $part,
                                         $submit => 'Answer',
                                         $HWVAL => $value};
@@ -262,21 +260,27 @@ sub grade_pdf {
             next;
         }
     }
-    $result .= $debug;
+    #$result .= $debug;
 
     foreach my $key (sort (keys %problems)) {
         my %problem = %{$problems{$key}};
         my ($problemname, $grade) = &grade_problem(%problem);
-        $result .= "<tr style='background-color: #EEF5F5;'><td>$problemname</td><td style='background-color: ";
+
+        $problemname =~ s/(.*)\s*-\sPart\s0/$1/; #cut part when there is only one part in problem
+
+        $result .= &Apache::loncommon::start_data_table_row();
+        $result .= "<td>$problemname</td><td class='";
         if($grade eq "EXACT_ANS") {
-            $result .= "#DDFFDD";
+            $result .= "LC_answer_correct";
         } else { 
-            $result .= "#DD5555";
+            $result .= "LC_answer_charged_try";
         }
-        $result .= "'>$grade</td></tr>";
-
+        $result .= "'>$grade</span></td>";
+        $result .= &Apache::loncommon::end_data_table_row();
     }
-    $result .= "\n</table>";
+    #$result .= "\n</table>";
+    $result .= &Apache::loncommon::end_data_table();
+
 
     return $result;        
 }
@@ -286,7 +290,9 @@ sub grade_problem {
 
     my ($content) =  &Apache::loncommon::ssi_with_retries('/res/'.
             $problem{'resource'}, 5, %problem);
-
+    
+    #TODO ? filter html response can't be the answer 
+    #     ! find an other way to get a problemname and Part
     $content =~ s/.*class="LC_current_location".*>(.*)<\/td>.*/$1/g;
     $content = $1;