--- loncom/homework/grades.pm	2003/07/28 18:04:39	1.126
+++ loncom/homework/grades.pm	2003/07/29 20:54:39	1.128
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.126 2003/07/28 18:04:39 ng Exp $
+# $Id: grades.pm,v 1.128 2003/07/29 20:54:39 ng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,9 +109,8 @@ sub response_type {
 	    my ($responsetype,$part) = split(/_/,$_,2);
 	    my ($partid,$respid) = split(/_/,$part);
 	    $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
-#	    my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
-#	    $handgrade{$part} = $responsetype.':'.($value eq 'yes' ? 'yes' : 'no'); #a bug $value is 'yes' regardless
-	    $handgrade{$part} = $responsetype.':'.(($allkeys =~ /parameter_$part\_handgrade/) ? 'yes' : 'no');
+	    my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
+	    $handgrade{$part} = $responsetype.':'.($value eq 'yes' ? 'yes' : 'no'); 
 	    next if ($seen{$partid} > 0);
 	    $seen{$partid}++;
 	    push @partlist,$partid;
@@ -299,7 +298,7 @@ sub student_gradeStatus {
     my %record     = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
     my %partstatus = ();
     foreach (@$partlist) {
-	my ($status,$foo)    = split(/_/,$record{"resource.$_.solved"},2);
+	my ($status,undef)   = split(/_/,$record{"resource.$_.solved"},2);
 	$status              = 'nothing' if ($status eq '');
 	$partstatus{$_}      = $status;
 	my $subkey           = "resource.$_.submitted_by";
@@ -755,8 +754,7 @@ sub sub_page_js {
 	    for (i=0;i<=total;i++) {
 		for (j=0;j<parttot;j++) {
 		    var partid = formname["partid"+i+"_"+j].value;
-		    var selopt = formname["GD_SEL"+i+"_"+partid];
-		    if (selopt[0].selected) {
+		    if (formname["GD_SEL"+i+"_"+partid][0].selected) {
 			var points = formname["GD_BOX"+i+"_"+partid].value;
 			if (points == "") {
 			    var name = formname["name"+i].value;
@@ -788,8 +786,7 @@ sub sub_page_js {
 	var ptr = 0;
 	for (i=1;i<total;i++) {
 	    var partid = formname["q_"+i].value;
-	    var selopt = formname["GD_SEL"+i+"_"+partid];
-	    if (selopt[0].selected) {
+	    if (formname["GD_SEL"+i+"_"+partid][0].selected) {
 		var points = formname["GD_BOX"+i+"_"+partid].value;
 		var status = formname["solved"+i+"_"+partid].value;
 		if (points == "" && status != "correct_by_student") {
@@ -837,8 +834,8 @@ sub sub_page_kw_js {
     if (nret==null) return;
     formname.keywords.value = nret;
 
-    formname.refresh.value = "on";
     if (formname.keywords.value != "") {
+	formname.refresh.value = "on";
 	formname.submit();
     }
     return;
@@ -865,10 +862,9 @@ sub sub_page_kw_js {
     }
     var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
     if (nret==null) return;
-    var curlist = document.SCORE.keywords.value;
-    document.SCORE.keywords.value = curlist+" "+nret;
-    document.SCORE.refresh.value = "on";
+    document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
     if (document.SCORE.keywords.value != "") {
+	document.SCORE.refresh.value = "on";
 	document.SCORE.submit();
     }
     return;
@@ -885,8 +881,7 @@ sub sub_page_kw_js {
     var Nmsg  = msgform.savemsgN.value;
     savedMsgHeader(Nmsg,usrctr,fullname);
     var subject = msgform.msgsub.value;
-    var rtrchk  = document.SCORE["includemsg"+usrctr];
-    var msgchk = rtrchk.value;
+    var msgchk = document.SCORE["includemsg"+usrctr].value;
     re = /msgsub/;
     var shwsel = "";
     if (re.test(msgchk)) { shwsel = "checked" }
@@ -934,7 +929,6 @@ sub sub_page_kw_js {
 	height = 600;
 	scrollbar = "yes";
     }
-//    if (window.pWin) {window.pWin.close(); window.pWin=null}
     var xpos = (screen.width-600)/2;
     xpos = (xpos < 0) ? '0' : xpos;
     var ypos = (screen.height-height)/2-30;
@@ -943,6 +937,7 @@ sub sub_page_kw_js {
     pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
     pWin.focus();
     pDoc = pWin.document;
+    pDoc.open('text/html','replace');
     pDoc.write("<html><head>");
     pDoc.write("<title>Message Central</title>");
 
@@ -1029,6 +1024,7 @@ sub sub_page_kw_js {
     pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
     pDoc.write("</form>");
     pDoc.write("</body></html>");
+    pDoc.close();
 }
 
 //====================== Script for keyword highlight options ==============
@@ -1072,6 +1068,7 @@ sub sub_page_kw_js {
     hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
     hwdWin.focus();
     var hDoc = hwdWin.document;
+    hDoc.open('text/html','replace');
     hDoc.write("<html><head>");
     hDoc.write("<title>Highlight Central</title>");
 
@@ -1120,6 +1117,7 @@ sub sub_page_kw_js {
     hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
     hDoc.write("</form>");
     hDoc.write("</body></html>");
+    hDoc.close();
   }
 
 </script>
@@ -1769,17 +1767,14 @@ sub processHandGrade {
 	}
     }
     $ctr = 0;
-    my ($partlist,$handgrade) = &response_type($ENV{'form.url'},$symb);
     @parsedlist = reverse @parsedlist if ($button eq 'Previous');
     foreach my $student (@parsedlist) {
 	my ($uname,$udom) = split(/:/,$student);
 	if ($ENV{'form.submitonly'} eq 'yes') {
-	    my (%status) = &student_gradeStatus($ENV{'form.url'},$symb,$udom,$uname,$partlist) ;
+	    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
 	    my $statusflg = '';
-	    foreach (keys(%status)) {
-		$statusflg = 1 if ($status{$_} ne 'nothing');
-		my ($foo,$partid,$foo1) = split(/\./);
-		$statusflg = '' if ($status{'resource.'.$partid.'.submitted_by'} ne '');
+	    foreach (split(/:/,$ENV{'form.partlist0'})){
+		$statusflg = 1 if (exists ($record{'resource.'.$_.'.solved'}));
 	    }
 	    next if ($statusflg eq '');
 	}