--- loncom/homework/grades.pm	2006/03/28 18:07:24	1.344
+++ loncom/homework/grades.pm	2006/04/10 06:34:07	1.349
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.344 2006/03/28 18:07:24 albertel Exp $
+# $Id: grades.pm,v 1.349 2006/04/10 06:34:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -722,7 +722,14 @@ LISTJAVASCRIPT
     $gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
 	'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
 	'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
-	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n".
+	'<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n".
+        '&nbsp;<b>Grading Increments:</b> <select name="increment">'.
+        '<option value="1">Whole Points</option>'.
+        '<option value=".5">Half Points</option>'.
+        '<option value=".25">Quarter Points</option>'.
+        '<option value=".1">Tenths of a Point</option>'.
+        '</select>'.
+
 	'<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
 	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
 	'<input type="hidden" name="handgrade"   value="'.$env{'form.handgrade'}.'" /><br />'."\n".
@@ -1436,6 +1443,15 @@ sub sub_page_kw_js {
 SUBJAVASCRIPT
 }
 
+sub get_increment {
+    my $increment = $env{'form.increment'};
+    if ($increment != 1 && $increment != .5 && $increment != .25 &&
+        $increment != .1) {
+        $increment = 1;
+    }
+    return $increment;
+}
+
 #--- displays the grading box, used in essay type problem and grading by page/sequence
 sub gradeBox {
     my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
@@ -1458,13 +1474,16 @@ sub gradeBox {
     $result.='<table border="0"><tr><td>'.
 	'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
     my $ctr = 0;
+    my $thisweight = 0;
+    my $increment = &get_increment();
     $result.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
-    while ($ctr<=$wgt) {
+    while ($thisweight<=$wgt) {
 	$result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
 	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
-	    $ctr.')" value="'.$ctr.'" '.
-	    ($score eq $ctr ? 'checked':'').' /> '.$ctr."</label></nobr></td>\n";
+	    $thisweight.')" value="'.$thisweight.'" '.
+	    ($score eq $thisweight ? 'checked':'').' /> '.$thisweight."</label></nobr></td>\n";
 	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+        $thisweight += $increment;
 	$ctr++;
     }
     $result.='</tr></table>';
@@ -1517,7 +1536,10 @@ sub handback_box {
 	next if (!@$files);
 	my $file_counter = 1;
 	foreach my $file (@$files) {
-	    my ($file_disp) = ($file =~ m|.+/(.+)$|);
+	    my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|);
+	    my ($name,$version,$ext) = &file_name_version_ext($file_disp);
+	    $file_disp = "$name.$ext";
+	    $file = $file_path.$file_disp;
 	    $result.=&mt('Return commented version of [_1] to student.',
 			 '<span class="filename">'.$file_disp.'</span>');
 	    $result.='<input type="file"   name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
@@ -1992,6 +2014,8 @@ KEYWORDS
 	    '<input type="button" value="Next" '.
 	    'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> &nbsp;';
 	$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
+        $endform.="<input type='hidden' value='".&get_increment().
+            "' name='increment' />";
 	$endform.='</td><tr></table></form>';
 	$endform.=&show_grading_menu_form($symb);
 	$request->print($endform);
@@ -2326,6 +2350,7 @@ sub saveHandGrade {
 	    my $partial= $pts/$wgt;
 	    if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {
 		#do not update score for part if not changed.
+                &handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
 		next;
 	    } else {
 	        push @parts_graded, $new_part;
@@ -3510,6 +3535,7 @@ sub csvuploadassign {
     my ($request)= @_;
     my ($symb)=&get_symb($request);
     if (!$symb) {return '';}
+    my $error_msg = '';
     &Apache::loncommon::load_tmp_file($request);
     my @gradedata = &Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@gradedata); }
@@ -3562,12 +3588,20 @@ sub csvuploadassign {
 		my $part=$1;
 		my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
 					      $symb,$domain,$username);
-		$entries{$fields{$dest}}=~s/\s//g;
-		my $pcr=$entries{$fields{$dest}} / $wgt;
-		my $award='correct_by_override';
-		$grades{"resource.$part.awarded"}=$pcr;
-		$grades{"resource.$part.solved"}=$award;
-		$points{$part}=1;
+                if ($wgt) {
+                    $entries{$fields{$dest}}=~s/\s//g;
+                    my $pcr=$entries{$fields{$dest}} / $wgt;
+                    my $award='correct_by_override';
+                    $grades{"resource.$part.awarded"}=$pcr;
+                    $grades{"resource.$part.solved"}=$award;
+                    $points{$part}=1;
+                } else {
+                    $error_msg = "<br />" .
+                        &mt("Some point values were assigned"
+                            ." for problems with a weight "
+                            ."of zero. These values were "
+                            ."ignored.");
+                }
 	    } else {
 		if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }
 		if ($dest=~/stores_(.*)_solved/)  { if ($points{$1}) {next;} }
@@ -3607,7 +3641,7 @@ sub csvuploadassign {
     }
     $request->print("<br />\n");
     $request->print(&show_grading_menu_form($symb));
-    return '';
+    return $error_msg;
 }
 #------------- end of section for handling csv file upload ---------
 #