--- loncom/homework/grades.pm	2006/02/26 00:30:17	1.316
+++ loncom/homework/grades.pm	2006/02/27 20:32:38	1.321
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.316 2006/02/26 00:30:17 albertel Exp $
+# $Id: grades.pm,v 1.321 2006/02/27 20:32:38 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1413,7 +1413,7 @@ SUBJAVASCRIPT
 
 #--- displays the grading box, used in essay type problem and grading by page/sequence
 sub gradeBox {
-    my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
+    my ($request,$symb,$uname,$udom,$counter,$partid,$record,$respid) = @_;
     my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
 	'/check.gif" height="16" border="0" />';
     my $wgt    = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
@@ -1421,8 +1421,9 @@ sub gradeBox {
 		  '<font color="red">problem weight assigned by computer</font>');
     $wgt       = ($wgt > 0 ? $wgt : '1');
     my $score  = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
-		  '' : $$record{'resource.'.$partid.'.awarded'}*$wgt);
+		  '' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
     my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
+    $result.='<br />'.$partid.' - '.$respid.'<br />';
     my $display_part=&get_display_part($partid,undef,$symb);
     my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
 				       [$partid]);
@@ -1471,19 +1472,25 @@ sub gradeBox {
         '<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
         $aggtries.'" />'."\n";
     $result.='</td></tr></table>'."\n";
-    my $files=&get_submitted_files($udom,$uname,$partid,$counter,$record);
+    $result.=&handbackBox($uname,$udom,$counter,$partid,$record,$respid);
+    return $result;
+}
+sub handbackBox {
+    my ($uname,$udom,$counter,$partid,$record,$respid) = @_;
+    my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);
+    my $result;
     if (@$files) {
-        my $file_counter = 0;
+        my $file_counter = 1;
 	foreach my $file (@$files) {
-            $result.=' Return commented document to student. <input type="file" name="part'.$partid.'_returndoc';
+	    $file =~ /.+\/(.+$)/;
+	    my $file_disp = $1;
+            $result.=' Return commented version of <span class="filename">'.$file_disp.' </span>to student. <input type="file" name="'.$partid.'_'.$respid.'_returndoc';
             $result.=$file_counter.'" />'."\n";
-            $result.='<input type="hidden" name="respid" value="'.$counter.'" />';
-            $result.='<input type="hidden" name="returndocorig'.$file_counter.'" value="'.$file.'" />';
+            $result.='<input type="hidden" name="'.$partid.'_'.$respid.'_origdoc'.$file_counter.'" value="'.$file.'" /><br />';
+            $file_counter++;
         }
     }
-
-    
-    return $result;
+    return $result;    
 }
 
 sub show_problem {
@@ -1825,15 +1832,6 @@ KEYWORDS
 			    $display_part.' <font color="#999999">( ID '.$respid.
 			    ' )</font>&nbsp; &nbsp;';
 			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
-#			if ($record{"resource.$partid.$respid.portfiles"}) {
-#			    my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
-#			    foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {
-#				push(@files,$file_url.$file);
-#			    }
-#			}
-#			if ($record{"resource.$partid.$respid.uploadedurl"}) {
-#			    push(@files,$record{"resource.$partid.$respid.uploadedurl"});
-#			}
 			if (@$files) {
 			    $lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
 			    my $file_counter = 0;
@@ -1918,15 +1916,18 @@ KEYWORDS
     my %seen = ();
     my @partlist;
     my @gradePartRespid;
-    for (sort keys(%$handgrade)) {
-	my ($partid,$respid) = split(/_/);
-	next if ($seen{$partid} > 0);
+    for my $part_resp(sort keys(%$handgrade)) {
+	my ($partid,$respid) = split(/_/, $part_resp);
+	#next if ($seen{$partid} > 0);
+	if ($seen{$partid} > 0) {
+	    $request->print(&handbackBox($uname,$udom,$counter,$partid,\%record,$respid));
+	    next;
+	}
 	$seen{$partid}++;
-	next if ($$handgrade{$_} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);
+	next if ($$handgrade{$part_resp} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);
 	push @partlist,$partid;
 	push @gradePartRespid,$partid.'.'.$respid;
-
-	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
+	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record,$respid));
     }
     $result='<input type="hidden" name="partlist'.$counter.
 	'" value="'.(join ":",@partlist).'" />'."\n";
@@ -2317,25 +2318,22 @@ sub saveHandGrade {
 	    $newrecord{'resource.'.$new_part.'.regrader'}=
 		"$env{'user.name'}:$env{'user.domain'}";
 	}
-        if ($env{'form.part'.$new_part.'_returndoc1'}) {
-            # if multiple files are uploaded names will be 'returndoc2','returndoc3'
-           
-            my $portfolio_root = &Apache::loncommon::propath($domain,
-    					 $stuname).
-    					'/userfiles/portfolio';
-                $request->print('<br>'.$portfolio_root.'<br>');
-                
-    #                my $result=&Apache::lonnet::userfileupload('uploaddoc','',
-    #	        	 'portfolio'.$env{'form.currentpath'});
-    
-            my $file_counter = 1;
-            my $respid = $env{'form.respid'};
-            while ($env{'form.part'.$new_part.'_returndoc'.$file_counter}) {
-                my $fname=$env{'form.returndoc'.$file_counter.'.filename'};
-                $newrecord{"resource.$new_part.$respid.handback"} = $env{'form.returndocorig'.$file_counter};
-                $request->print("<br />".$fname." will be the uploaded file name");
-                $request->print("<font color=\"red\">Will upload document</font>".$env{'form.returndocorig'.$file_counter});
-                $file_counter++;
+	my ($partlist,$handgrade,$responseType) = &response_type($url,$symb);
+	my $portfolio_root = &Apache::loncommon::propath($domain,
+        					 $stuname).
+        					'/userfiles/portfolio';
+	foreach my $part_resp(sort(keys(%$handgrade))) {
+	    my ($part_id, $resp_id) = split(/_/,$part_resp);
+            if ($env{'form.'.$part_resp.'_returndoc1'} && ($new_part eq $part_id)) {
+                # if multiple files are uploaded names will be 'returndoc2','returndoc3'
+                my $file_counter = 1;
+                while ($env{'form.'.$part_resp.'_returndoc'.$file_counter}) {
+                    my $fname=$env{'form.returndoc'.$file_counter.'.filename'};
+                    $newrecord{"resource.$new_part.$resp_id.handback"} = $env{'form.returndocorig'.$file_counter};
+                    $request->print("<br />".$fname." will be the uploaded file name");
+                    $request->print("<font color=\"red\">Will upload document</font>".$env{'form.returndocorig'.$file_counter});
+                    $file_counter++;
+                }
             }
         }
 	
@@ -2894,7 +2892,7 @@ sub viewstudentgrade {
             $aggregates{$part} = 1;
         }
 	if ($type eq 'awarded') {
-	    my $pts = $score eq '' ? '' : $score*$$weight{$part};
+	    my $pts = $score eq '' ? '' : &compute_points($score,$$weight{$part});
 	    $result.='<input type="hidden" name="'.
 		'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
 	    $result.='<input type="text" name="'.