--- loncom/homework/grades.pm	2007/03/14 19:15:37	1.392
+++ loncom/homework/grades.pm	2007/04/16 19:00:38	1.395
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.392 2007/03/14 19:15:37 albertel Exp $
+# $Id: grades.pm,v 1.395 2007/04/16 19:00:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1627,6 +1627,23 @@ sub show_problem {
     return $result;
 }
 
+sub download_all_link {
+    my ($r,$symb) = @_;
+    my $all_students = 
+	join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));
+
+    my $parts =
+	join("\n",&Apache::loncommon::get_env_multiple('form.vPart'));
+
+    my $identifier = &Apache::loncommon::get_cgi_id();
+    &Apache::lonnet::appenv('cgi.'.$identifier.'.students' => $all_students,
+                            'cgi.'.$identifier.'.symb' => $symb,
+                            'cgi.'.$identifier.'.parts' => $parts,);
+    $r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.
+	      &mt('Download All Submitted Documents').'</a>');
+    return
+}
+
 # --------------------------- show submissions of a student, option to grade 
 sub submission {
     my ($request,$counter,$total) = @_;
@@ -1661,7 +1678,7 @@ sub submission {
 	&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');
 	$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
 	    &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
-
+	&download_all_link($request,$symb);
 	$request->print('<h3>&nbsp;<font color="#339933">Submission Record</font></h3>'."\n".
 			'<font size=+1>&nbsp;<b>Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n");
 
@@ -1872,6 +1889,9 @@ KEYWORDS
 	    my %seenparts;
 	    my @part_response_id = &flatten_responseType($responseType);
 	    foreach my $part (@part_response_id) {
+		next if ($env{'form.lastSub'} eq 'hdgrade' 
+			 && $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes');
+
 		my ($partid,$respid) = @{ $part };
 		my $display_part=&get_display_part($partid,$symb);
 		if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
@@ -1918,8 +1938,8 @@ KEYWORDS
 			($env{'form.lastSub'} eq 'hdgrade' && 
 			 $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
 			my $display_part=&get_display_part($partid,$symb);
-			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
-			    $display_part.' <font color="#999999">( ID '.$respid.
+			$lastsubonly.='<tr><td bgcolor="#ffffe6">Debug -'.'<b>Part:</b> '.
+			    $display_part.' <font color="#999999">( hhhh ID '.$respid.
 			    ' )</font>&nbsp; &nbsp;';
 			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
 			if (@$files) {
@@ -2012,7 +2032,8 @@ KEYWORDS
 	my $part_resp = join('_',@{ $part_response_id });
 	next if ($seen{$partid} > 0);
 	$seen{$partid}++;
-	next if ($$handgrade{$part_resp} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);
+	next if ($$handgrade{$part_resp} ne 'yes' 
+		 && $env{'form.lastSub'} eq 'hdgrade');
 	push @partlist,$partid;
 	push @gradePartRespid,$partid.'.'.$respid;
 	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));