[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonwhatsnew.pm
raeburn
raeburn at source.lon-capa.org
Sun Oct 23 17:52:27 EDT 2016
raeburn Sun Oct 23 21:52:27 2016 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface lonwhatsnew.pm
Log:
- For 2.11
- Backport 1.119, 1.120
Index: loncom/interface/lonwhatsnew.pm
diff -u loncom/interface/lonwhatsnew.pm:1.105.2.11 loncom/interface/lonwhatsnew.pm:1.105.2.12
--- loncom/interface/lonwhatsnew.pm:1.105.2.11 Sun Aug 7 02:06:00 2016
+++ loncom/interface/lonwhatsnew.pm Sun Oct 23 21:52:26 2016
@@ -1,5 +1,5 @@
#
-# $Id: lonwhatsnew.pm,v 1.105.2.11 2016/08/07 02:06:00 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.105.2.12 2016/10/23 21:52:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -73,6 +73,7 @@
['vcl','newroles',1],
['vcl','oldroles',1],
['whn','crslogin',1],
+ ['mgr','resetcounters',1],
) {
my ($perm,$key,$check_section) = @{ $perm_check };
my $scope = $env{'request.course.id'};
@@ -441,7 +442,7 @@
$r->print(&Apache::loncommon::head_subbox($header));
if ($command eq 'reset') {
- $result = &process_reset($cdom,$crs);
+ $result = &process_reset($cdom,$crs,$checkallowed);
} elsif ($command eq 'update') {
$result = &process_update($uname,$udom,$threshold_titles);
} elsif ($command eq 'newinterval') {
@@ -596,7 +597,7 @@
my $itemserror;
if ($needitems) {
- $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
+ $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread,$checkallowed);
}
my $classlist;
if ($show{'oldroles'} || $show{'newroles'} || $show{'crslogin'}) {
@@ -914,7 +915,7 @@
&display_versionchanges($r,$changed,$res_title,$interval->{'versions'},$itemserror);
} elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS
&display_abovethreshold($r,$refpage,$warnings,$triggered,
- $res_title,$itemserror);
+ $res_title,$itemserror,$checkallowed);
} elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
&display_coursediscussion($r,$newdiscussions,$unread,
$countunread,$res_title,$itemserror);
@@ -941,7 +942,7 @@
sub getitems {
my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions,
$tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show,
- $starttime,$countunread) = @_;
+ $starttime,$countunread,$checkallowed) = @_;
my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {
my $itemserror = '<span class="LC_warning">'.&mt('An error occurred retrieving information about the course.').'<br />'.&mt('It is recommended that you [_1]re-select the course[_2].','<a href="/adm/roles">','</a>').'</span>';
@@ -1001,7 +1002,8 @@
# Maxtries and degree of difficulty for problem parts, unless handgradeable
if ($$show{'abovethreshold'}) {
&check_thresholds($resource,$symb,\%resourcetracker,
- $triggered,$threshold,$warnings);
+ $triggered,$threshold,$warnings,
+ $checkallowed);
}
}
@@ -1075,7 +1077,8 @@
}
sub check_thresholds {
- my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_;
+ my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings,
+ $checkallowed) = @_;
# Compile maxtries and degree of difficulty for problem parts, unless handgradeable
my @parts = @{$resource->parts()};
my %stats;
@@ -1141,8 +1144,12 @@
<td>'.$stats{$part}{users}.'</td>
<td>'.$stats{$part}{attempts}.'</td>
<td>'.$stats{$part}{degdiff}.'</td>
- <td>'.$lastreset{$part}.'</td>
- <td><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>';
+ <td>'.$lastreset{$part}.'</td>';
+ if ($checkallowed->{'resetcounters'}) {
+ $$triggered{$symb}{text}[$partcount] .=
+ '<td><input type="checkbox" name="'.$resetname.'" />'.
+ '<input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>';
+ }
$partcount ++;
}
$$triggered{$symb}{numparts} = $partcount;
@@ -1204,7 +1211,11 @@
}
sub process_reset {
- my ($dom,$crs) = @_;
+ my ($dom,$crs,$checkallowed) = @_;
+ if (!$checkallowed->{'resetcounters'}) {
+ return '<b>'.&mt('You do not the required privileges to reset counters').
+ '</b><br />';
+ }
my $result = '<b>'.&mt('Counters reset for following problems (and parts):').
'</b><br />';
my @agg_types = ('attempts','users','correct');
@@ -1675,7 +1686,7 @@
}
sub display_abovethreshold {
- my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_;
+ my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror,$checkallowed) = @_;
my %lt = &Apache::lonlocal::texthash(
reso => 'Resource',
part => 'Part',
@@ -1694,8 +1705,11 @@
'<input type="hidden" name="command" value="" /></td>'.
'<td>'.$lt{'part'}.'</td><td>'.$lt{'nust'}.'</td>'.
'<td>'.$lt{'avat'}.'</td><td>'.$lt{'dedi'}.'</td>'.
- '<td>'.$lt{'lare'}.'</td><td class="LC_right_item">'.
- $lt{'reco'}.'</td></tr>');
+ '<td>'.$lt{'lare'}.'</td>');
+ if ($checkallowed->{'resetcounters'}) {
+ $r->print('<td class="LC_right_item">'.$lt{'reco'}.'</td>');
+ }
+ $r->print('</tr>');
my $row;
foreach my $res (@{$warnings}) {
$row++;
@@ -1727,7 +1741,9 @@
}
}
}
- $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="button" name="counters" value="'.$lt{'rese'}.'" onclick="javascript:thresholdreset();" /></td></tr>');
+ if ($checkallowed->{'resetcounters'}) {
+ $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="button" name="counters" value="'.$lt{'rese'}.'" onclick="javascript:thresholdreset();" /></td></tr>');
+ }
} elsif ($itemserror) {
$r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
} else {
More information about the LON-CAPA-cvs
mailing list