--- loncom/homework/grades.pm 2007/10/09 23:03:22 1.450
+++ loncom/homework/grades.pm 2007/10/15 09:47:47 1.459
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.450 2007/10/09 23:03:22 banghart Exp $
+# $Id: grades.pm,v 1.459 2007/10/15 09:47:47 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,6 +35,7 @@ use Apache::loncommon;
use Apache::lonhtmlcommon;
use Apache::lonnavmaps;
use Apache::lonhomework;
+use Apache::lonpickcode;
use Apache::loncoursedata;
use Apache::lonmsg();
use Apache::Constants qw(:common);
@@ -526,12 +527,18 @@ sub getclasslist {
}
}
# filter students according to groups selected
+ my @stu_groups = split(/,/,$group);
if (@getgroup) {
my $exclude = 1;
- foreach my $grp(@getgroup) {
- if ($group eq $grp) {
- $exclude = 0;
+ foreach my $grp (@getgroup) {
+ foreach my $stu_group (@stu_groups) {
+ if ($stu_group eq $grp) {
+ $exclude = 0;
+ }
}
+ if (($grp eq 'none') && !$group) {
+ $exclude = 0;
+ }
}
if ($exclude) {
delete($classlist->{$student});
@@ -970,7 +977,7 @@ LISTJAVASCRIPT
$ctr++;
my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
-
+ my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
if ( $perm{'vgr'} eq 'F' ) {
$gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
$gradeTable.='<td align="right">'.$ctr.' </td>'.
@@ -978,7 +985,7 @@ LISTJAVASCRIPT
$student.':'.$$fullname{$student}.':::SECTION'.$section.
') " /> </label></td>'."\n".'<td>'.
&nameUserString(undef,$$fullname{$student},$uname,$udom).
- ' '.$section.'</td>'."\n";
+ ' '.$section.'/'.$group.'</td>'."\n";
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (sort keys(%status)) {
@@ -4887,11 +4894,10 @@ SCANTRONFORM
</tr>
SCANTRONFORM
- $r->print(<<SCANTRONFORM);
- </table>
-$grading_menu_button
-SCANTRONFORM
-
+ $r->print('<tr><td bgcolor="#777777">');
+ &Apache::lonpickcode::code_list($r,2);
+ $r->print('</td></tr></table>');
+ $r->print($grading_menu_button);
return
}
@@ -5345,7 +5351,7 @@ sub scantron_parse_scanline {
}
} elsif (scalar(@array) lt 2) {
- my $location = [length($array[0])];
+ my $location = length($array[0]);
my $line_num = $location / $$scantron_config{'Qlength'};
my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}];
@@ -6319,7 +6325,7 @@ sub scantron_validate_ID {
sub scantron_get_correction {
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
-#FIXME in the case of a duplicated ID the previous line, probaly need
+#FIXME in the case of a duplicated ID the previous line, probably need
#to show both the current line and the previous one and allow skipping
#the previous one or the current one
@@ -7217,29 +7223,15 @@ sub grading_menu {
$fields{'command'} = 'scantron_selectphase';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push (@menu, { url => $url,
- name => &mt('Grade Scantron Forms'),
+ name => &mt('Grade/Manage Scantron Forms'),
short_description =>
&mt('')});
$fields{'command'} = 'verify';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push (@menu, { url => "",
- jscript => ' onClick="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" ',
name => &mt('Verify Receipt'),
short_description =>
&mt('')});
- $fields{'command'} = 'manage';
- $url = &Apache::lonhtmlcommon::build_url('/adm/helper/resettimes.helper',\%fields);
- push (@menu, { url => $url,
- name => &mt('Manage Access Times'),
- short_description =>
- &mt('')});
- $fields{'command'} = 'view';
- $url = &Apache::lonhtmlcommon::build_url('/adm/pickcode',\%fields);
- push (@menu, { url => $url,
- name => &mt('View Saved CODEs'),
- short_description =>
- &mt('')});
-
#
# Create the menu
my $Str;
@@ -7261,10 +7253,10 @@ sub grading_menu {
$menudata->{'url'}.'" >'.
$menudata->{'name'}."</a></h3>\n";
} else {
- $Str .=' <h3><a '.
+ $Str .=' <h3><input type="button" value="Verify Receipt" '.
$menudata->{'jscript'}.
- ' href="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" >'.
- $menudata->{'name'}."</a></h3>\n";
+ ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
+ ' /></h3>';
$Str .= (' 'x8).
' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
@@ -7285,30 +7277,14 @@ sub grading_menu {
cmdsave = 'submission';
}
formname.command.value = cmd;
- formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
- ":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
if (val < 5) formname.submit();
if (val == 5) {
- if (!checkReceiptNo(formname,'notOK')) { return false;}
- 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 (!checkReceiptNo(formname,'notOK')) {
+ return false;
+ } else {
+ formname.submit();
+ }
}
- if (val < 7) formname.submit();
}
function checkReceiptNo(formname,nospace) {
@@ -7327,43 +7303,6 @@ sub grading_menu {
</script>
GRADINGMENUJS
&commonJSfunctions($request);
- my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>';
- $result.=$table;
- my (undef,$sections) = &getclasslist('all','0');
- my $savedState = &savedState();
- my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
- my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
- my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
- my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
-
- $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
- '<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";
-
- $result.='<table width="100%" border="0"><tr><td bgcolor=#777777>'."\n".
- '<table width="100%" border="0"><tr bgcolor="#e6ffff"><td colspan="2">'."\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('Access Status').'</td>'."\n";
- $result.='</tr>';
- $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
- ' <select name="section" multiple="multiple" size="3">'."\n";
- if (ref($sections)) {
- foreach (sort (@$sections)) {
- $result.='<option value="'.$_.'" '.
- ($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";
- }
- }
- $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> ';
return $Str;
}
@@ -7441,6 +7380,7 @@ GRADINGMENUJS
$result.='<td><b>'.&mt('Sections').'</b></td>';
$result.='<td><b>'.&mt('Groups').'</b></td>';
$result.='<td><b>'.&mt('Access Status').'</td>'."\n";
+ $result.='<td><b>'.&mt('Submission Status').'</td>'."\n";
$result.='</tr>';
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
' <select name="section" multiple="multiple" size="3">'."\n";
@@ -7456,12 +7396,8 @@ GRADINGMENUJS
$result.='</td><td>'."\n";
$result.=&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,3,undef,'mult');
- $result.='</td></tr>';
-
- $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3"><label>'.
- '<input type="radio" name="radioChoice" value="submission" '.
- ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
- '</label> <select name="submitonly">'.
+ $result.='</td>';
+ $result.='<td><select name="submitonly" size="3">'.
'<option value="yes" '.
($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>'.
'<option value="queued" '.
@@ -7471,19 +7407,29 @@ GRADINGMENUJS
'<option value="incorrect" '.
($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>'.
'<option value="all" '.
- ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>'."\n";
+ ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>';
+
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3"><label>'.
+ '<input type="radio" name="radioChoice" value="submission" '.
+ ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
+ '</label> </td></tr>'."\n";
- $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3">'.
'<label><input type="radio" name="radioChoice" value="viewgrades" '.
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
'<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n";
- $result.='<tr bgcolor="#ffffe6" valign="top"><td colspan="2">'.
- '<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
+ $result.='<tr bgcolor="#ffffe6"><td colspan="3"><br />'.
+ '<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
+ '</td></tr>'."\n";
+
+
+ $result.='<tr bgcolor="#ffffe6" valign="top"><td colspan="3">'.
+ '<br /><label><input type="radio" name="radioChoice" value="pickStudentPage" '.
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
- 'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n";
+ 'The <b>complete</b> set/page/sequence/folder: For one student</label></td></tr>'."\n";
- $result.='<tr bgcolor="#ffffe6"><td colspan="2"><br />'.
+ $result.='<tr bgcolor="#ffffe6"><td colspan="3"><br />'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
'</td></tr></table>'."\n";
@@ -7693,9 +7639,9 @@ function sanitycheck() {
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="file" name="upfile" size="50" />
<br /><label>$type: $selectform</label>
-<br /><label>$attendance: <input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" /></label>
-<br /><label>$personnel: <input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" /></label>
-<br /><label>$specific: <input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" /></label>
+<br /><label><input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" />$attendance </label>
+<br /><label><input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" />$personnel</label>
+<br /><label><input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" />$specific </label>
<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onChange="sanitycheck()" /></label>
@@ -8030,7 +7976,6 @@ ENDHEADER
sub handler {
my $request=$_[0];
-
&reset_caches();
if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($request,'text/xml');