--- loncom/homework/grades.pm	2007/10/04 02:00:29	1.443
+++ loncom/homework/grades.pm	2007/10/08 22:29:59	1.446
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.443 2007/10/04 02:00:29 banghart Exp $
+# $Id: grades.pm,v 1.446 2007/10/08 22:29:59 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6954,7 +6954,9 @@ sub grading_menu {
 
     #
     # Define menu data
-     
+    $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+    my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
+    $request->print($table);
     my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
                   'handgrade'=>$hdgrade,
                   'probTitle'=>$probTitle,
@@ -6988,7 +6990,8 @@ sub grading_menu {
             &mt('')});
     $fields{'command'} = 'verify';
     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    push (@menu, { url => $url,
+    push (@menu, { url => "",
+                   jscript => ' onClick="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" ',
                    name => &mt('Verify Receipt'),
                    short_description => 
             &mt('')});
@@ -7008,16 +7011,37 @@ sub grading_menu {
     #
     # Create the menu
     my $Str;
-    $Str .= '<h2>'.&mt('Please select a grading task').'</h2>';
+    # $Str .= '<h2>'.&mt('Please select a grading task').'</h2>';
+    $Str .= '<form method="post" action="" name="gradingMenu">';
+    $Str .= '<input type="hidden" name="command" value="" />'.
+    	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
+	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
+	'<input type="hidden" name="probTitle"   value="'.$probTitle.'" ue="" />'."\n".
+	'<input type="hidden" name="saveState"   value="" />'."\n".
+	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
+	'<input type="hidden" name="showgrading" value="yes" />'."\n";
+
     foreach my $menudata (@menu) {
-        $Str .='    <h3><a href="'.
-            $menudata->{'url'}.'" >'.
-            $menudata->{'name'}."</a></h3>\n";
+        if ($menudata->{'name'} ne &mt('Verify Receipt')) {
+            $Str .='    <h3><a '.
+                $menudata->{'jscript'}.
+                ' href="'.
+                $menudata->{'url'}.'" >'.
+                $menudata->{'name'}."</a></h3>\n";
+        } else {
+            $Str .='    <h3><a '.
+                $menudata->{'jscript'}.
+                ' href="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" >'.
+                $menudata->{'name'}."</a></h3>\n";
+            $Str .= ('&nbsp;'x8).
+                    ' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).
+                    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
+        }
         $Str .= '    '.('&nbsp;'x8).$menudata->{'short_description'}.
             "\n";
     }
     $Str .="</dl>\n";
-    
+    $Str .="</form>\n";
     $request->print(<<GRADINGMENUJS);
 <script type="text/javascript" language="javascript">
     function checkChoice(formname,val,cmdx) {
@@ -7038,6 +7062,22 @@ sub grading_menu {
 	}
 	if (val < 7) formname.submit();
     }
+    function checkChoice2(formname,val,cmdx) {
+	if (val <= 2) {
+	    var cmd = radioSelection(formname.radioChoice);
+	    var cmdsave = cmd;
+	} else {
+	    cmd = cmdx;
+	    cmdsave = 'submission';
+	}
+	formname.command.value = cmd;
+	if (val < 5) formname.submit();
+	if (val == 5) {
+	    if (!checkReceiptNo(formname,'notOK')) { return false;}
+	    formname.submit();
+	}
+	if (val < 7) formname.submit();
+    }
 
     function checkReceiptNo(formname,nospace) {
 	var receiptNo = formname.receipt.value;
@@ -7159,15 +7199,15 @@ GRADINGMENUJS
 	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
 	'<input type="hidden" name="showgrading" value="yes" />'."\n";
 
-    $result.='<table width="100%" border="0"><tr><td bgcolor=#777777>'."\n".
-	'<table width="100%" border="0"><tr bgcolor="#e6ffff"><td colspan="2">'."\n".
+    $result.='<table border="0"><tr><td bgcolor=#777777>'."\n".
+	'<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n".
 	'&nbsp;<b>Select a Grading/Viewing Option</b></td></tr>'."\n".
 	'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";
 
     $result.='<table width="100%" border="0">';
     $result.='<tr bgcolor="#ffffe6" valign="top">'."\n";
     $result.='<td><b>'.&mt('Sections').'</b></td>';
-#    $result.='<td>Groups</td>';
+    $result.='<td><b>'.&mt('Groups').'</b></td>';
     $result.='<td><b>'.&mt('Access Status').'</td>'."\n";
     $result.='</tr>';
     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
@@ -7179,8 +7219,8 @@ GRADINGMENUJS
 	}
     }
     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
-#    $result.= '</td><td>'."\n";
-#    $result.='Put group select here'."\n";
+    $result.= '</td><td>'."\n";
+    $result.= &Apache::lonstatistics::GroupSelect('group','multiple',3);
     $result.='</td><td>'."\n";
     $result.=&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,3,undef,'mult');
 
@@ -7215,38 +7255,38 @@ GRADINGMENUJS
 	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
 	'</td></tr></table>'."\n";
 
-    $result.='</td><td valign="top">';
+    $result.='</td>'; #<td valign="top">';
 
-    $result.='<table width="100%" border="0">';
-    $result.='<tr bgcolor="#ffffe6"><td>'.
-	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
-	' '.&mt('scores from file').' </td></tr>'."\n";
-
-    $result.='<tr bgcolor="#ffffe6"><td>'.
-        '<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'.
-        ' '.&mt('clicker file').' </td></tr>'."\n";
-
-    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
-	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
-	'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
-
-    if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
-	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
-	    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
-	    ' '.&mt('receipt').': '.
-	    &Apache::lonnet::recprefix($env{'request.course.id'}).
-	    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.
-	    '</td></tr>'."\n";
-    } 
-    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
-	'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
-	'" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
-    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
-	'<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.
-	'" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";
-
-    $result.='</table>'."\n".
-	'</td></tr></table>'."\n".
+#    $result.='<table width="100%" border="0">';
+#    $result.='<tr bgcolor="#ffffe6"><td>'.
+#	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
+#	' '.&mt('scores from file').' </td></tr>'."\n";
+#
+#    $result.='<tr bgcolor="#ffffe6"><td>'.
+#        '<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'.
+#        ' '.&mt('clicker file').' </td></tr>'."\n";
+#
+#    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+#	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
+#	'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
+#
+#    if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
+#	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+#	    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
+#	    ' '.&mt('receipt').': '.
+#	    &Apache::lonnet::recprefix($env{'request.course.id'}).
+#	    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.
+#	    '</td></tr>'."\n";
+#    } 
+#    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+#	'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
+#	'" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
+#    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+#	'<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.
+#	'" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";
+#
+#    $result.='</table>'."\n".'</td>';
+    $result.= '</tr></table>'."\n".
 	'</td></tr></table></form>'."\n";
     return $result;
 }
@@ -7758,7 +7798,6 @@ ENDHEADER
 
 sub handler {
     my $request=$_[0];
-
     &reset_caches();
     if ($env{'browser.mathml'}) {
 	&Apache::loncommon::content_type($request,'text/xml');