');
+ $r->print('| ');
my $displayed = 0;
my $totalboxes = 0;
@@ -631,7 +540,7 @@ sub display_actions_box {
if ($displayed == $halfway) {
$r->print(' | | ');
}
- &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,\%interval,$countunread,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror,\%loggedin,$logincount);
+ &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,\%interval,$countunread,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror);
$displayed ++;
}
}
@@ -639,7 +548,6 @@ sub display_actions_box {
|
-
');
}
@@ -720,8 +628,6 @@ sub display_interval_config {
$r->print('
'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' expired.').'
');
} elsif ($context eq 'newroles') {
$r->print('
'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' became available.').'
');
- } elsif ($context eq 'crslogin') {
- $r->print('
'.&mt('Choose the time window to use to display the last login by a user in the '.$lctype).'
');
} else {
$r->print('
'.&mt('Choose the time window to use to display resources in the '.$lctype.' with version changes.').'
');
}
@@ -887,10 +793,10 @@ sub display_launcher {
$tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered,
$newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs,
$interval,$countunread,$expired,$expirecount,$activated,$activecount,
- $crstype,$itemserror,$loggedin,$logincount) = @_;
+ $crstype,$itemserror) = @_;
if ($$checkallowed{$action}) {
- &start_box($r,$show,$headings,$action,$refpage);
+ &start_box($r,$show,$headings,$action,$refpage,$action);
if ($$show{$action}) {
if ($action eq 'handgrading') { # UNGRADED ITEMS
&display_handgrade($r,$tograde,$ungraded,$itemserror);
@@ -914,10 +820,6 @@ sub display_launcher {
} elsif ($action eq 'oldroles') { # EXPIRED ROLES
&display_rolechanges($r,$expirecount,$expired,$interval->{'oldroles'},
$crstype);
- } elsif ($action eq 'crslogin') { #LAST LOGIN
- &display_crslogins($r,$logincount,$loggedin,$interval->{'crslogin'},
- $crstype);
-
}
}
&end_box($r);
@@ -1516,39 +1418,6 @@ sub getrolechanges {
return $rolechgcount;
}
-sub getloggedin {
- my ($cdom,$crs,$lastlogins,$starttime) = @_;
- my $context = 'course';
- my ($permission,$allowed) =
- &Apache::lonuserutils::get_permission($context);
- my $viewablesec = &Apache::lonuserutils::viewable_section($permission);
- my %crslogins=&Apache::lonnet::dump('nohist_crslastlogin',$cdom,$crs);
- my $logincount = 0;
- my ($tmp) = keys(%crslogins);
- unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
- if (keys(%crslogins) > 0) {
- foreach my $key (keys(%crslogins)) {
- my ($uname,$udom,$section,$role) = split(/:/,$key);
- my $eventtime = $crslogins{$key};
- if ($eventtime > $starttime) {
- if (($viewablesec ne '') && ($section ne '')) {
- next if ($viewablesec ne $section);
- }
- my %chginfo = (
- 'section' => $section,
- 'uname' => $uname,
- 'udom' => $udom,
- 'role' => $role,
- );
- $logincount ++;
- push (@{$lastlogins->{$eventtime}},\%chginfo);
- }
- }
- }
- }
- return $logincount;
-}
-
sub checkversions {
my ($cdom,$crs,$navmap,$changed,$starttime) = @_;
my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs);
@@ -1565,7 +1434,7 @@ sub checkversions {
'lastrevisiondate');
$revdate = &Apache::lonlocal::locallocaltime($revdate);
my $linkurl=&Apache::lonnet::clutter($key);
- my $usedversion=$navmap->usedVersion($linkurl);
+ my $usedversion=$navmap->usedVersion('version_'.$linkurl);
my @resources = $navmap->getResourceByUrl($linkurl,1);
if (($usedversion) && ($usedversion ne 'mostrecent')) {
$version = $usedversion;
@@ -1604,13 +1473,13 @@ sub display_handgrade {
foreach my $res (@{$tograde}) {
$rowNum ++;
my $css_class = $rowNum%2?' class="LC_odd_row"':'';
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
- my $linkurl=&Apache::lonnet::clutter($url);
- $linkurl .= '?symb='.&escape($res);
+ my $linkurl='/adm/grades';
if ($$ungraded{$res}{'enclink'}) {
- $linkurl =
- $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'};
- }
+ $linkurl.='?symb='.$$ungraded{$res}{'encsymb'};
+ } else {
+ $linkurl.='?symb='.&escape($res);
+ }
+ $linkurl.='&command=ungraded';
$r->print(''.$$ungraded{$res}{title}.' | '.$$ungraded{$res}{count}.' | |
');
}
} elsif ($itemserror) {
@@ -1805,92 +1674,6 @@ sub display_rolechanges {
}
return;
}
-
-sub display_crslogins {
- my ($r,$logincount,$loggedin,$interval,$crstype) = @_;
- my %lt = &Apache::lonlocal::texthash(
- 'user' => 'User',
- 'role' => 'Role',
- 'sec' => 'Section',
- 'number' => 'Total number of logins',
- );
- if ($logincount) {
-
- my $hdr = '