--- loncom/interface/lonwhatsnew.pm 2017/09/13 23:35:07 1.125 +++ loncom/interface/lonwhatsnew.pm 2020/03/30 11:04:13 1.126 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.125 2017/09/13 23:35:07 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.126 2020/03/30 11:04:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -91,6 +91,7 @@ sub handler { ['vcl','newroles',1], ['vcl','oldroles',1], ['whn','crslogin',1], + ['vcl','sessions',1], ['mgr','resetcounters',1], ) { my ($perm,$key,$check_section) = @{ $perm_check }; @@ -170,6 +171,13 @@ 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' @@ -221,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", @@ -254,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); @@ -298,7 +317,8 @@ END "\n"; } } - $scripttag.='document.visible.submit(); + $scripttag.=<<"ENDTOGG"; + document.visible.submit(); } function thresholdreset() { @@ -306,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?", @@ -404,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; @@ -548,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; @@ -588,7 +626,7 @@ 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', @@ -600,6 +638,7 @@ sub display_actions_box { newroles => 'right', oldroles => 'right', crslogin => 'right', + sessions => 'right', ); foreach my $key (keys(%{$checkallowed})) { @@ -627,7 +666,7 @@ sub display_actions_box { $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'}) { @@ -645,6 +684,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|); @@ -674,7 +716,7 @@ sub display_actions_box { $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 ++; } } @@ -755,6 +797,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'}, @@ -765,6 +809,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.').'
'); } @@ -785,7 +831,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"); } @@ -930,7 +983,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); @@ -958,8 +1012,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); @@ -1033,7 +1090,6 @@ sub getitems { $triggered,$threshold,$warnings, $checkallowed); } - } return; } @@ -1616,6 +1672,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); @@ -1882,8 +2010,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', @@ -1891,29 +2019,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 { @@ -1930,10 +2067,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); } } } @@ -1942,9 +2082,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 .= '