[LON-CAPA-cvs] cvs: loncom /homework grades.pm
banghart
lon-capa-cvs-allow@mail.lon-capa.org
Mon, 08 Oct 2007 22:30:00 -0000
banghart Mon Oct 8 18:30:00 2007 EDT
Modified files:
/loncom/homework grades.pm
Log:
Saving work in progress. Remove log spew. Make link look like link.
start doing what 4058 originally asked for.
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.445 loncom/homework/grades.pm:1.446
--- loncom/homework/grades.pm:1.445 Mon Oct 8 17:05:54 2007
+++ loncom/homework/grades.pm Mon Oct 8 18:29:59 2007
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.445 2007/10/08 21:05:54 banghart Exp $
+# $Id: grades.pm,v 1.446 2007/10/08 22:29:59 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -7031,9 +7031,10 @@
} else {
$Str .=' <h3><a '.
$menudata->{'jscript'}.
- ' nohref="nohref" >'.
+ ' href="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" >'.
$menudata->{'name'}."</a></h3>\n";
- $Str .= ' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).
+ $Str .= (' 'x8).
+ ' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
}
$Str .= ' '.(' 'x8).$menudata->{'short_description'}.
@@ -7198,15 +7199,15 @@
'<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".
' <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".
@@ -7218,8 +7219,8 @@
}
}
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> ';
-# $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');
@@ -7254,38 +7255,38 @@
'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
'</td></tr></table>'."\n";
- $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.='</td>'; #<td valign="top">';
- $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;
}
@@ -7797,7 +7798,6 @@
sub handler {
my $request=$_[0];
-
&reset_caches();
if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($request,'text/xml');
@@ -7807,7 +7807,6 @@
$request->send_http_header;
return '' if $request->header_only;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
- &Apache::lonnet::logthis("receipt is ".$env{'form.receipt'});
my $symb=&get_symb($request,1);
my @commands=&Apache::loncommon::get_env_multiple('form.command');
my $command=$commands[0];