--- loncom/interface/lonwhatsnew.pm 2013/12/14 02:08:30 1.105.2.9 +++ loncom/interface/lonwhatsnew.pm 2020/03/30 16:30:47 1.105.2.17 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.105.2.9 2013/12/14 02:08:30 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.105.2.17 2020/03/30 16:30:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,17 +62,37 @@ sub handler { my $command = $env{'form.command'}; my $refpage = $env{'form.refpage'}; - my %checkallowed = ( coursenormalmail => 1, - coursecritmail => 1, ); + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; + + my ($isadhoc,%checkallowed); + + if ($env{'request.role'} =~ m{^(cc|co)/}) { + my $rolecode = $1; + if ($env{"environment.internal.$cdom.$crs.$env{'request.role'}.adhoc"}) { + $isadhoc = 1; + } + } elsif ($env{'request.role'} =~ m{^cr/$cdom/$cdom\-domainconfig/(\w+)\./}) { + my $rolename = $1; + if ($env{"environment.internal.$cdom.$crs.cr/$cdom/$cdom-domainconfig/$rolename.adhoc"}) { + $isadhoc = 1; + } + } + unless ($isadhoc) { + %checkallowed = ( coursenormalmail => 1, + coursecritmail => 1,); + } foreach my $perm_check (['whn','whatsnew',1], ['pch','coursediscussion',1], ['mgr','handgrading',1], ['vgr','abovethreshold',1], - ['opa','haserrors',1], - ['mdc','versionchanges',0], + ['vgr','haserrors',1], + ['whn','versionchanges',1], ['vcl','newroles',1], ['vcl','oldroles',1], ['whn','crslogin',1], + ['vcl','sessions',1], + ['mgr','resetcounters',1], ) { my ($perm,$key,$check_section) = @{ $perm_check }; my $scope = $env{'request.course.id'}; @@ -151,12 +171,19 @@ sub handler { $r->print(&Apache::lonhtmlcommon::breadcrumbs ("What's New?",#'Course_Action_Items_Intervals' )); + } elsif ($command eq 'chgsessionlimit' && $checkallowed{'sessions'}) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/whatsnew?command=chgsessionlimit&refpage='.$refpage, + text=>"Change session range"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + ("What's New?",#'Course_Action_Items_Sessions' + )); } else { $r->print(&Apache::lonhtmlcommon::breadcrumbs ("What's New?",#'Course_Action_Items_Display' )); } - &display_main_box($r,$command,$refpage,\%checkallowed); + &display_main_box($r,$command,$refpage,\%checkallowed,$cdom,$crs); return OK; } @@ -167,7 +194,7 @@ sub handler { #------------------------------ sub display_main_box { - my ($r,$command,$refpage,$checkallowed) = @_; + my ($r,$command,$refpage,$checkallowed,$cdom,$crs) = @_; my $domain=&Apache::loncommon::determinedomain(); my $function = &Apache::loncommon::get_users_function(); my $lctype = lc(&Apache::loncommon::course_type()); @@ -202,11 +229,19 @@ sub display_main_box { 604800 => 'last logins for users in last 7 days', 86400 => 'last logins for users in last 24 hours', ); + my %sessions = ( + 300 => 'course sessions active in the last 5 minutes', + 600 => 'course sessions active in the last 10 minutes', + 1800 => 'course sessions active in the last 30 minutes', + 7200 => 'course sessions active in the last 2 hours', + -7200 => 'course sessions with last activity more than 2 hours ago', + ); my %interval_titles = ( versions => \%versions, newroles => \%newroles, oldroles => \%oldroles, crslogin => \%crslogins, + sessions => \%sessions, ); my %initpage = &Apache::lonlocal::texthash ( firstres => "first resource in the $lctype", @@ -214,13 +249,10 @@ sub display_main_box { userpref => 'your general user preferences', coursespecific => "specific setting for this $lctype", ); - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; if (($command eq 'chgthreshold') && $checkallowed->{'abovethreshold'}) { - &display_threshold_config($r,$refpage,\%threshold_titles, - $cdom,$crs); + &display_threshold_config($r,$refpage,\%threshold_titles,$cdom,$crs); } elsif (($command eq 'chginterval') && $checkallowed->{'versionchanges'}) { &display_interval_config($r,$refpage,\%interval_titles,'versions'); @@ -238,6 +270,9 @@ sub display_main_box { } elsif (($command eq 'chgcrslogininterval') && $checkallowed->{'crslogin'}) { &display_interval_config($r,$refpage,\%interval_titles,'crslogin'); + } elsif (($command eq 'chgsessionlimit') + && $checkallowed->{'sessions'}) { + &display_interval_config($r,$refpage,\%interval_titles,'sessions'); } else { &display_actions_box($r,$command,$refpage,\%threshold_titles, \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); @@ -282,7 +317,8 @@ END "\n"; } } - $scripttag.='document.visible.submit(); + $scripttag.=<<"ENDTOGG"; + document.visible.submit(); } function thresholdreset() { @@ -290,45 +326,45 @@ function thresholdreset() { document.visible.submit(); } -function togglelogins() { - var total = document.visible.logincount.value; - var sumrow = document.visible.loginrow.value; +function toggledetails(prefix) { + var total = document.visible[prefix+'count'].value; + var sumrow = document.visible[prefix+'row'].value; if (total == 0) { return; } - var showlogindetails = 0; - for (var i=0; i -'; +ENDTOGG } my $course_type=&Apache::loncommon::course_type(); return &Apache::loncommon::start_page("What's New?", @@ -388,6 +424,8 @@ sub display_actions_box { my %activated; my %loggedin; my $logincount; + my %sessions; + my $sessioncount; my %res_title = (); my %show = (); my $needitems = 0; @@ -441,7 +479,7 @@ sub display_actions_box { $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') { @@ -532,6 +570,22 @@ sub display_actions_box { $headings{'crslogin'} = &mt('Last login for users in last 24 hours'); } + $timediff{'sessions'} = $display_settings{$cid.':sessionactivity'}; + unless (defined($timediff{'sessions'})) { $timediff{'sessions'} = 7200; } + $interval{'sessions'} = $interval_titles->{'sessions'}->{$timediff{'sessions'}}; + + if ($timediff{'sessions'} == -7200) { + $headings{'sessions'} = &mt('Session with activity more than 2 hours ago'); + } elsif ($timediff{'sessions'} == 7200) { + $headings{'sessions'} = &mt('Session with activity in last 2 hours'); + } elsif ($timediff{'sessions'} == 1800) { + $headings{'sessions'} = &mt('Session with activity in last 30 minutes'); + } elsif ($timediff{'sessions'} == 600) { + $headings{'sessions'} = &mt('Session with activity in last 10 minutes'); + } elsif ($timediff{'sessions'} == 300) { + $headings{'sessions'} = &mt('Session with activity in last 5 minutes'); + } + my ($now,$starttime,$activatedstart,$expiredstart,$crsloginstart); $now = time; @@ -572,7 +626,20 @@ sub display_actions_box { $threshold{'av_attempts'},$threshold{'degdiff'}, '
',$threshold{'numstudents'}); - my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin'); + my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin','sessions'); + my %actioncolumn = ( + handgrading => 'left', + haserrors => 'left', + abovethreshold => 'left', + versionchanges => 'left', + coursediscussion => 'right', + coursenormalmail => 'right', + coursecritmail => 'right', + newroles => 'right', + oldroles => 'right', + crslogin => 'right', + sessions => 'right', + ); foreach my $key (keys(%{$checkallowed})) { if ($key =~ /_section$/) { next; } @@ -586,7 +653,8 @@ sub display_actions_box { foreach my $item (@actionorder) { unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail' || - $item eq 'newroles' || $item eq 'oldroles') { + $item eq 'newroles' || $item eq 'oldroles' || + $item eq 'crslogin' || $item eq 'sessions') { if ($show{$item}) { $needitems = 1; last; @@ -596,10 +664,10 @@ sub display_actions_box { 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'}) { + if ($show{'oldroles'} || $show{'newroles'} || $show{'crslogin'} || $show{'sessions'}) { $classlist = &Apache::loncoursedata::get_classlist(); } if ($show{'coursenormalmail'}) { @@ -617,6 +685,9 @@ sub display_actions_box { if ($show{'crslogin'}) { $logincount = &getloggedin($cdom,$crs,\%loggedin,$crsloginstart); } + if ($show{'sessions'}) { + $sessioncount = &getsessions($cdom,$crs,\%sessions,$timediff{'sessions'},$classlist); + } $r->print(qq|$lt{'hial'}   $lt{'shal'}
\n|); @@ -638,14 +709,15 @@ sub display_actions_box { $totalboxes ++; } } - my $halfway = 4; + my $currcolumn = 'left'; # my $halfway = int($totalboxes/2) + $totalboxes%2; foreach my $actionitem (@actionorder) { - if ($$checkallowed{$actionitem}) { - if ($displayed == $halfway) { + if ($checkallowed->{$actionitem}) { + if (($actioncolumn{$actionitem} eq 'right') && ($currcolumn eq 'left')) { $r->print(' '); + $currcolumn = 'right'; } - &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,$classlist); + &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,\%sessions,$sessioncount,$classlist); $displayed ++; } } @@ -726,6 +798,8 @@ sub display_interval_config { $setting = 'oldroleinterval'; } elsif ($context eq 'newroles') { $setting = 'newroleinterval'; + } elsif ($context eq 'sessions') { + $setting = 'sessionactivity'; } my $lctype = lc(&Apache::loncommon::course_type()); my $current = &get_current($env{'user.name'},$env{'user.domain'}, @@ -736,6 +810,8 @@ sub display_interval_config { $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).'
'); + } elsif ($context eq 'sessions') { + $r->print('
'.&mt('Choose the time limit to use to display active user sessions in the '.$lctype.'.').'
'); } else { $r->print('
'.&mt('Choose the time window to use to display resources in the '.$lctype.' with version changes.').'
'); } @@ -756,7 +832,14 @@ sub display_interval_config { '); if (ref($interval_titles) eq 'HASH') { if (ref($interval_titles->{$context}) eq 'HASH') { - foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}})))) { + my @sorted; + if ($context eq 'sessions') { + @sorted = sort { $a <=> $b } (keys(%{$interval_titles->{$context}})); + push(@sorted,shift(@sorted)); + } else { + @sorted = reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}}))); + } + foreach my $key (@sorted) { $r->print(''."\n"); } @@ -901,7 +984,8 @@ 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,$classlist) = @_; + $crstype,$itemserror,$loggedin,$logincount,$sessions,$sessioncount, + $classlist) = @_; if ($$checkallowed{$action}) { &start_box($r,$show,$headings,$action,$refpage); @@ -914,7 +998,7 @@ sub display_launcher { &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); @@ -929,8 +1013,11 @@ sub display_launcher { &display_rolechanges($r,$expirecount,$expired,$interval->{'oldroles'}, $crstype,$classlist); } elsif ($action eq 'crslogin') { #LAST LOGIN - &display_crslogins($r,$logincount,$loggedin,$interval->{'crslogin'}, + &display_activity($r,'logins',$logincount,$loggedin,$interval->{'crslogin'}, $crstype,$classlist); + } elsif ($action eq 'sessions') { #ACTIVE SESSIONS + &display_activity($r,'sessions',$sessioncount,$sessions,$interval->{'sessions'}, + $crstype,$classlist); } } &end_box($r); @@ -941,7 +1028,7 @@ sub display_launcher { 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 = ''.&mt('An error occurred retrieving information about the course.').'
'.&mt('It is recommended that you [_1]re-select the course[_2].','','').''; @@ -1001,9 +1088,9 @@ sub getitems { # 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); } - } return; } @@ -1075,7 +1162,8 @@ sub check_bombed { } 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 +1229,12 @@ sub check_thresholds { '.$stats{$part}{users}.' '.$stats{$part}{attempts}.' '.$stats{$part}{degdiff}.' - '.$lastreset{$part}.' - '; + '.$lastreset{$part}.''; + if ($checkallowed->{'resetcounters'}) { + $$triggered{$symb}{text}[$partcount] .= + ''. + ''; + } $partcount ++; } $$triggered{$symb}{numparts} = $partcount; @@ -1164,7 +1256,7 @@ sub get_curr_thresholds { my $thresholdcount = 0; my ($tmp) = %thresholdsettings; unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { - foreach my $item (keys %{$threshold}) { + foreach my $item (keys(%{$threshold})) { if (exists($thresholdsettings{$cid.':threshold_'.$item})) { $$threshold{$item} = $thresholdsettings{$cid.':threshold_'.$item}; @@ -1179,7 +1271,7 @@ sub get_curr_thresholds { $cdom,$crs,'internal.threshold'); my ($temp) = %coursesettings; unless ($temp =~ /^(con_lost|error|no_such_host)/i) { - foreach my $item (keys %{$threshold}) { + foreach my $item (keys(%{$threshold})) { unless (exists($thresholdsettings{$cid.':threshold_'.$item})) { if (exists($coursesettings{'internal.threshold_'.$item})) { $$threshold{$item} = @@ -1204,7 +1296,11 @@ sub get_current { } sub process_reset { - my ($dom,$crs) = @_; + my ($dom,$crs,$checkallowed) = @_; + if (!$checkallowed->{'resetcounters'}) { + return ''.&mt('You do not have the required privileges to reset counters'). + '
'; + } my $result = ''.&mt('Counters reset for following problems (and parts):'). '
'; my @agg_types = ('attempts','users','correct'); @@ -1246,9 +1342,13 @@ sub process_reset { sub process_update { my ($uname,$udom,$threshold_titles) = @_; my $setoutput = ''.&mt('Changes to threshold(s) for problem tracking:').'

'; - foreach (keys %env) { - next if ($_!~/^form\.(.+)\_setparmval$/); - my $name = $1; + foreach my $key (keys(%env)) { + my $name; + if ($key =~/^form\.(.+)\_setparmval$/) { + $name = $1; + } else { + next; + } my $value = $env{'form.'.$name.'_value'}; if ($name && defined($value) && ($value ne '')) { my $put_result = &Apache::lonnet::put('nohist_whatsnew', @@ -1271,29 +1371,37 @@ sub process_update { sub getnormalmail { my ($newmsgs) = @_; -# Check for unread mail in course +# Check for unread messages in user's INBOX (which were sent in context of current course). my $msgcount = 0; - - my @messages = sort(&Apache::lonnet::getkeys('nohist_email')); - foreach my $message (@messages) { - my $msgid=&escape($message); - my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= - &Apache::lonmsg::unpackmsgid($msgid); - if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { - if (defined($sendtime) && $sendtime!~/error/) { - if ($status eq 'new') { - $sendtime = &Apache::lonlocal::locallocaltime($sendtime); - $msgcount ++; - if ($shortsubj eq '') { - $shortsubj = &mt('No subject'); + my @messages = &Apache::lonnet::getkeys('nohist_email'); + return $msgcount if (!@messages); + my %emailstatus = &Apache::lonnet::dump('email_status'); + foreach my $msgid (sort(@messages)) { + if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) { + my $skipstatus; + if ($emailstatus{$msgid} eq 'new') { + $skipstatus = 1; + } + my $esc_msgid = &escape($msgid); + my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= + &Apache::lonmsg::unpackmsgid($esc_msgid,undef,$skipstatus,undef, + $env{'request.course.id'}); + if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { + if (defined($sendtime) && $sendtime!~/error/) { + if (($emailstatus{$msgid} eq 'new') || ($status eq 'new')) { + $sendtime = &Apache::lonlocal::locallocaltime($sendtime); + $msgcount ++; + if ($shortsubj eq '') { + $shortsubj = &mt('No subject'); + } + push(@{$newmsgs}, { + msgid => $esc_msgid, + sendtime => $sendtime, + shortsub => $shortsubj, + from => $fromname, + fromdom => $fromdom + }); } - push(@{$newmsgs}, { - msgid => $msgid, - sendtime => $sendtime, - shortsub => $shortsubj, - from => $fromname, - fromdom => $fromdom - }); } } } @@ -1303,13 +1411,15 @@ sub getnormalmail { sub getcritmail { my ($critmsgs) = @_; -# Check for critical messages in course +# Check for critical messages which were sent in context of current course. my %what=&Apache::lonnet::dump('critical'); my $result = ''; my $critmsgcount = 0; foreach my $msgid (sort(keys(%what))) { + my $esc_msgid = &escape($msgid); my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= - &Apache::lonmsg::unpackmsgid($msgid); + &Apache::lonmsg::unpackmsgid($esc_msgid,undef,1,undef, + $env{'request.course.id'}); if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { if (defined($sendtime) && $sendtime!~/error/) { $sendtime = &Apache::lonlocal::locallocaltime($sendtime); @@ -1318,7 +1428,7 @@ sub getcritmail { $shortsubj = &mt('No subject'); } push(@{$critmsgs}, { - msgid => $msgid, + msgid => $esc_msgid, sendtime => $sendtime, shortsub => $shortsubj, from => $fromname, @@ -1563,6 +1673,78 @@ sub getloggedin { return $logincount; } +sub getsessions { + my ($cdom,$cnum,$sessions,$lastactive,$classlist) = @_; + my $context = 'course'; + my ($permission,$allowed) = + &Apache::lonuserutils::get_permission($context); + my %crs_sessions = &Apache::lonnet::get_course_sessions($cnum,$cdom,$lastactive); + my $sessioncount = 0; + if (keys(%crs_sessions) > 0) { + if (ref($classlist) eq 'HASH') { + my $viewablesec = &Apache::lonuserutils::viewable_section($permission); + my $secidx = &Apache::loncoursedata::CL_SECTION(); + my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'_'.$cnum,1); + my %personnel; + foreach my $role (sort(keys(%coursepersonnel))) { + my ($rolecode,$section); + if ($role =~ /:/) { + ($rolecode,$section) = split(/:/,$role); + } else { + $rolecode = $role; + } + if ($viewablesec ne '') { + next if ($viewablesec ne $section); + } + foreach my $user (split(/\,/,$coursepersonnel{$role})) { + push(@{$personnel{$user}{$rolecode}},$section); + } + } + foreach my $key (keys(%crs_sessions)) { + if (exists($classlist->{$key})) { + my $student = $classlist->{$key}; + my $section = $student->[$secidx]; + my $lastaccess = $crs_sessions{$key}; + if ($viewablesec ne '') { + next if ($viewablesec ne $section); + } + my ($stuname,$studom) = split(/:/,$key); + my %info = ( + 'section' => $section, + 'role' => 'st', + 'uname' => $stuname, + 'udom' => $studom, + ); + $sessioncount ++; + push(@{$sessions->{$lastaccess}},\%info); + } elsif (exists($personnel{$key})) { + my $lastaccess = $crs_sessions{$key}; + my ($uname,$udom) = split(/:/,$key); + if (ref($personnel{$key}) eq 'HASH') { + my ($showrole,$showsec); + foreach my $possrole ('cc','co','in','ta','ep','ad','st') { + if (exists($personnel{$key}{$possrole})) { + $showrole = $possrole; + $showsec = join(', ',@{$personnel{$key}{$possrole}}); + last; + } + } + my %info = ( + 'section' => $showsec, + 'role' => $showrole, + 'uname' => $uname, + 'udom' => $udom, + ); + $sessioncount ++; + push(@{$sessions->{$lastaccess}},\%info); + } + } + } + } + } + return $sessioncount; +} + sub checkversions { my ($cdom,$crs,$navmap,$changed,$starttime) = @_; my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs); @@ -1663,7 +1845,7 @@ sub display_haserrors { } 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', @@ -1682,8 +1864,11 @@ sub display_abovethreshold { ''. ''.$lt{'part'}.''.$lt{'nust'}.''. ''.$lt{'avat'}.''.$lt{'dedi'}.''. - ''.$lt{'lare'}.''. - $lt{'reco'}.''); + ''.$lt{'lare'}.''); + if ($checkallowed->{'resetcounters'}) { + $r->print(''.$lt{'reco'}.''); + } + $r->print(''); my $row; foreach my $res (@{$warnings}) { $row++; @@ -1715,7 +1900,9 @@ sub display_abovethreshold { } } } - $r->print('
'); + if ($checkallowed->{'resetcounters'}) { + $r->print('
'); + } } elsif ($itemserror) { $r->print(''.$itemserror.''); } else { @@ -1824,8 +2011,8 @@ sub display_rolechanges { return; } -sub display_crslogins { - my ($r,$logincount,$loggedin,$interval,$crstype,$classlist) = @_; +sub display_activity { + my ($r,$context,$count,$details,$interval,$crstype,$classlist) = @_; return unless (ref($classlist) eq 'HASH'); my %lt = &Apache::lonlocal::texthash( 'user' => 'User', @@ -1833,29 +2020,38 @@ sub display_crslogins { 'sec' => 'Section', 'number' => 'Total number of logins', ); - if ($logincount) { + my $prefix = 'login'; + if ($context eq 'sessions') { + $lt{'number'} = &mt('Total number of active user sessions'); + $lt{'active'} = &mt('Last active'); + $prefix = 'session'; + } + if ($count) { - my $hdr = ''. + my $hdr = ''. ''.$lt{'user'}.''. ''.$lt{'role'}.''. - ''.$lt{'sec'}.''. - ''. - ''.$lt{'number'}.''. - ''.$lt{'role'}.''. - ''.$lt{'sec'}; + ''.$lt{'sec'}.''; + if ($context eq 'sessions') { + $hdr .= ''.$lt{'active'}.''; + } + $hdr .= ''."\n". + ''. + ''.$lt{'number'}.''. + ''.$lt{'role'}.''. + ''.$lt{'sec'}; my (%bylastname,%counts); - if (ref($loggedin) eq 'HASH') { - my @logins = sort { $b <=> $a } (keys(%{$loggedin})); - my $numlogin = 0; + if (ref($details) eq 'HASH') { + my @items = sort { $b <=> $a } (keys(%{$details})); + my $num = 0; my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME(); - foreach my $item (@logins) { - if (ref($loggedin->{$item}) eq 'ARRAY') { - foreach my $user (@{$loggedin->{$item}}) { + foreach my $item (@items) { + if (ref($details->{$item}) eq 'ARRAY') { + foreach my $user (@{$details->{$item}}) { if (ref($user) eq 'HASH') { my $section; my $role = &Apache::lonnet::plaintext($user->{'role'},$crstype); - my $status = &mt($user->{'status'}); if ($user->{'section'} eq '') { $section = &mt('none'); } else { @@ -1872,10 +2068,13 @@ sub display_crslogins { } my $link = &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom); - push(@{$bylastname{$fullname}}, - ''.$link.''. - ''.$role.''. - ''.$section.''); + my $entry = ''.$link.''. + ''.$role.''. + ''.$section.''; + if ($context eq 'sessions') { + $entry .= ''.&Apache::lonlocal::locallocaltime($item).''; + } + push(@{$bylastname{$fullname}},$entry); } } } @@ -1884,9 +2083,9 @@ sub display_crslogins { foreach my $person (sort(keys(%bylastname))) { if (ref($bylastname{$person}) eq 'ARRAY') { foreach my $item (@{$bylastname{$person}}) { - $numlogin ++; - my $css_class = $numlogin%2?' class="LC_odd_row"':''; - $table .= '