loncom/homework/grades.pm - diff

Return to grades.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.444 and 1.446

version 1.444, 2007/10/05 16:43:31	version 1.446, 2007/10/08 22:29:59
Line 6990 sub grading_menu {	Line 6990 sub grading_menu {
&mt('')});	&mt('')});
$fields{'command'} = 'verify';	$fields{'command'} = 'verify';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push (@menu, { url => $url,	push (@menu, { url => "",
jscript => ' onChange="javascript:checkReceiptNo(this.form,\'OK\')" ',	jscript => ' onClick="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" ',
name => &mt('Verify Receipt'),	name => &mt('Verify Receipt'),
short_description =>	short_description =>
&mt('')});	&mt('')});
Line 7012 sub grading_menu {	Line 7012 sub grading_menu {
# Create the menu	# Create the menu
my $Str;	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="adm/grades" name="gradingMenu">';	$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) {	foreach my $menudata (@menu) {
$Str .=' <h3><a '.	if ($menudata->{'name'} ne &mt('Verify Receipt')) {
$menudata->{'jscript'}.	$Str .=' <h3><a '.
' href="'.	$menudata->{'jscript'}.
$menudata->{'url'}.'" >'.	' href="'.
$menudata->{'name'}."</a></h3>\n";	$menudata->{'url'}.'" >'.
if ($menudata->{'name'} eq &mt('Verify Receipt')) {	$menudata->{'name'}."</a></h3>\n";
$Str .= ' receipt: 156-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';	} else {
	$Str .=' <h3><a '.
	$menudata->{'jscript'}.
	' href="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" >'.
	$menudata->{'name'}."</a></h3>\n";
	$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'}.	$Str .= ' '.(' 'x8).$menudata->{'short_description'}.
"\n";	"\n";
Line 7047 sub grading_menu {	Line 7062 sub grading_menu {
}	}
if (val < 7) formname.submit();	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) {	function checkReceiptNo(formname,nospace) {
var receiptNo = formname.receipt.value;	var receiptNo = formname.receipt.value;
Line 7168 GRADINGMENUJS	Line 7199 GRADINGMENUJS
'<input type="hidden" name="gradingMenu" value="1" />'."\n".	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";	'<input type="hidden" name="showgrading" value="yes" />'."\n";

$result.='<table width="100%" border="0"><tr><td bgcolor=#777777>'."\n".	$result.='<table border="0"><tr><td bgcolor=#777777>'."\n".
'<table width="100%" border="0"><tr bgcolor="#e6ffff"><td colspan="2">'."\n".	'<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n".
' <b>Select a Grading/Viewing Option</b></td></tr>'."\n".	' <b>Select a Grading/Viewing Option</b></td></tr>'."\n".
'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";	'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";

$result.='<table width="100%" border="0">';	$result.='<table width="100%" border="0">';
$result.='<tr bgcolor="#ffffe6" valign="top">'."\n";	$result.='<tr bgcolor="#ffffe6" valign="top">'."\n";
$result.='<td><b>'.&mt('Sections').'</b></td>';	$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.='<td><b>'.&mt('Access Status').'</td>'."\n";
$result.='</tr>';	$result.='</tr>';
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".	$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
Line 7188 GRADINGMENUJS	Line 7219 GRADINGMENUJS
}	}
}	}
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';	$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';
# $result.= '</td><td>'."\n";	$result.= '</td><td>'."\n";
# $result.='Put group select here'."\n";	$result.= &Apache::lonstatistics::GroupSelect('group','multiple',3);
$result.='</td><td>'."\n";	$result.='</td><td>'."\n";
$result.=&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,3,undef,'mult');	$result.=&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,3,undef,'mult');

Line 7224 GRADINGMENUJS	Line 7255 GRADINGMENUJS
'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
'</td></tr></table>'."\n";	'</td></tr></table>'."\n";

$result.='</td><td valign="top">';	$result.='</td>'; #<td valign="top">';

$result.='<table width="100%" border="0">';	# $result.='<table width="100%" border="0">';
$result.='<tr bgcolor="#ffffe6"><td>'.	# $result.='<tr bgcolor="#ffffe6"><td>'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.	# '<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
' '.&mt('scores from file').' </td></tr>'."\n";	# ' '.&mt('scores from file').' </td></tr>'."\n";
	#
$result.='<tr bgcolor="#ffffe6"><td>'.	# $result.='<tr bgcolor="#ffffe6"><td>'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'.	# '<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'.
' '.&mt('clicker file').' </td></tr>'."\n";	# ' '.&mt('clicker file').' </td></tr>'."\n";
	#
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.	# $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.	# '<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";	# '" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
	#
if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {	# if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.	# $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.	# '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
' '.&mt('receipt').': '.	# ' '.&mt('receipt').': '.
&Apache::lonnet::recprefix($env{'request.course.id'}).	# &Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.	# '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.
'</td></tr>'."\n";	# '</td></tr>'."\n";
}	# }
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.	# $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.	# '<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
'" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";	# '" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.	# $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();'.	# '<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";	# '" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";
	#
$result.='</table>'."\n".	# $result.='</table>'."\n".'</td>';
'</td></tr></table>'."\n".	$result.= '</tr></table>'."\n".
'</td></tr></table></form>'."\n";	'</td></tr></table></form>'."\n";
return $result;	return $result;
}	}
Line 7767 ENDHEADER	Line 7798 ENDHEADER

sub handler {	sub handler {
my $request=$_[0];	my $request=$_[0];

&reset_caches();	&reset_caches();
if ($env{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($request,'text/xml');	&Apache::loncommon::content_type($request,'text/xml');

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.444
changed lines
	Added in v.1.446