--- loncom/homework/grades.pm	2003/06/21 00:39:46	1.106
+++ loncom/homework/grades.pm	2003/07/02 15:30:21	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.106 2003/06/21 00:39:46 albertel Exp $
+# $Id: grades.pm,v 1.109 2003/07/02 15:30:21 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1264,7 +1264,7 @@ KEYWORDS
 	    } else {
 		for my $part (sort keys(%$handgrade)) {
 		    foreach (@$string) {
-			my ($partid,$respid) = /^resource\.(\d+)\.(\d+)\.submission/;
+			my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
 			if ($part eq ($partid.'_'.$respid)) {
 			    my ($ressub,$subval) = split(/:/,$_,2);
 # Similarity check
@@ -1673,8 +1673,8 @@ sub viewgrades_js {
 	var textbox = eval("document.classgrade.TEXTVAL_"+partid);
 	if (point == "textval") {
 	    var point = eval("document.classgrade.TEXTVAL_"+partid+".value");
-	    if (isNaN(point) || point < 0) {
-		alert("A number equal or greater than 0 is expected. Entered value = "+point);
+	    if (isNaN(point) || parseFloat(point) < 0) {
+		alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
 		var resetbox = false;
 		for (var i=0; i<radioButton.length; i++) {
 		    if (radioButton[i].checked) {
@@ -1687,8 +1687,8 @@ sub viewgrades_js {
 		}
 		return;
 	    }
-	    if (point > weight) {
-		var resp = confirm("You entered a value ("+point+
+	    if (parseFloat(point) > parseFloat(weight)) {
+		var resp = confirm("You entered a value ("+parseFloat(point)+
 				   ") greater than the weight for the part. Accept?");
 		if (resp == false) {
 		    textbox.value = "";
@@ -1697,7 +1697,7 @@ sub viewgrades_js {
 	    }
 	    for (var i=0; i<radioButton.length; i++) {
 		radioButton[i].checked=false;
-		if (point == i) {
+		if (parseFloat(point) == i) {
 		    radioButton[i].checked=true;
 		}
 	    }
@@ -1771,13 +1771,13 @@ sub viewgrades_js {
 	var point  = textbox.value;
 	var weight = eval("document.classgrade.weight_"+partid+".value");
 
-	if (isNaN(point) || point < 0) {
-	    alert("A number equal or greater than 0 is expected. Entered value = "+point);
+	if (isNaN(point) || parseFloat(point) < 0) {
+	    alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
 	    textbox.value = "";
 	    return;
 	}
-	if (point > weight) {
-	    var resp = confirm("You entered a value ("+point+
+	if (parseFloat(point) > parseFloat(weight)) {
+	    var resp = confirm("You entered a value ("+parseFloat(point)+
 			       ") greater than the weight of the part. Accept?");
 	    if (resp == false) {
 		textbox.value = "";
@@ -2083,7 +2083,7 @@ sub editgrades {
 	$line .= '<tr bgcolor="#ffffde"><td>'.$uname.'&nbsp;</td><td>'.
 	    $udom.'&nbsp;</td><td>'.
 		$$fullname{$usercolon}.'&nbsp;</td>';
-	my $usec=%$classlist->{"$uname:$udom"}[5];
+	my $usec=$classlist->{"$uname:$udom"}[5];
 	if (!&canmodify($usec)) {
 	    my $numcols=scalar(@partid)*(scalar(@parts)-1)*2;
 	    $noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
@@ -2440,7 +2440,7 @@ sub csvuploadassign {
 	    push(@skipped,"$username:$domain");
 	    next;
 	}
-	my $usec=%$classlist->{"$username:$domain"}[5];
+	my $usec=$classlist->{"$username:$domain"}[5];
 	if (!&canmodify($usec)) {
 	    push(@notallowed,"$username:$domain");
 	    next;