--- loncom/homework/grades.pm 2007/10/09 23:42:49 1.451
+++ loncom/homework/grades.pm 2007/10/12 00:03:11 1.456
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.451 2007/10/09 23:42:49 albertel Exp $
+# $Id: grades.pm,v 1.456 2007/10/12 00:03:11 banghart 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)) {
@@ -4891,7 +4898,7 @@ SCANTRONFORM
</table>
$grading_menu_button
SCANTRONFORM
-
+ &Apache::lonpickcode::code_list($r,1);
return
}
@@ -6319,7 +6326,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,7 +7224,7 @@ 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';
@@ -7227,18 +7234,6 @@ sub grading_menu {
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
@@ -7441,6 +7436,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 +7452,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 +7463,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";
@@ -8030,7 +8032,6 @@ ENDHEADER
sub handler {
my $request=$_[0];
-
&reset_caches();
if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($request,'text/xml');