[LON-CAPA-cvs] cvs: loncom /homework grades.pm
raeburn
raeburn at source.lon-capa.org
Sun Dec 31 08:29:54 EST 2017
raeburn Sun Dec 31 13:29:54 2017 EDT
Modified files:
/loncom/homework grades.pm
Log:
- Set values for colspans in grading table which will support the number
of stores_ items for a part (excluding awarded and solved).
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.747 loncom/homework/grades.pm:1.748
--- loncom/homework/grades.pm:1.747 Thu Dec 21 23:20:48 2017
+++ loncom/homework/grades.pm Sun Dec 31 13:29:53 2017
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.747 2017/12/21 23:20:48 raeburn Exp $
+# $Id: grades.pm,v 1.748 2017/12/31 13:29:53 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4090,6 +4090,7 @@
$ctr++;
}
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
+ my $totcolspan = 0;
foreach my $partid (@partid) {
$header .= '<th align="center">'.&mt('Old Score').'</th>'.
'<th align="center">'.&mt('New Score').'</th>';
@@ -4106,6 +4107,7 @@
'<th align="center">'.&mt('New').' '.$display.'</th>';
$columns{$partid}+=2;
}
+ $totcolspan += $columns{$partid};
}
foreach my $partid (@partid) {
my $display_part=&get_display_part($partid,$symb);
@@ -4121,18 +4123,18 @@
my @noupdate;
my ($updateCtr,$noupdateCtr) = (1,1);
for ($i=0; $i<$env{'form.total'}; $i++) {
- my $line;
my $user = $env{'form.ctr'.$i};
my ($uname,$udom)=split(/:/,$user);
my %newrecord;
my $updateflag = 0;
- $line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
my $usec=$classlist->{"$uname:$udom"}[5];
- if (!&canmodify($usec)) {
- my $numcols=scalar(@partid)*4+2;
+ my $canmodify = &canmodify($usec);
+ my $line = '<td'.($canmodify?'':' colspan="2"').'>'.
+ &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
+ if (!$canmodify) {
push(@noupdate,
- $line."<td colspan=\"$numcols\"><span class=\"LC_warning\">".
- &mt('Not allowed to modify student')."</span></td></tr>");
+ $line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">".
+ &mt('Not allowed to modify student')."</span></td>");
next;
}
my %aggregate = ();
@@ -4249,8 +4251,7 @@
}
}
if (@noupdate) {
-# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
- my $numcols=scalar(@partid)*4+2;
+ my $numcols=$totcolspan+2;
$result .= &Apache::loncommon::start_data_table_row('LC_empty_row').
'<td align="center" colspan="'.$numcols.'">'.
&mt('No Changes Occurred For the Students Below').
More information about the LON-CAPA-cvs
mailing list