--- loncom/interface/lonwhatsnew.pm 2021/01/01 15:29:14 1.105.2.19 +++ loncom/interface/lonwhatsnew.pm 2012/08/19 00:18:16 1.106 @@ -1,7 +1,5 @@ -# The LearningOnline Network -# What's New in a course # -# $Id: lonwhatsnew.pm,v 1.105.2.19 2021/01/01 15:29:14 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.106 2012/08/19 00:18:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,37 +62,17 @@ sub handler { my $command = $env{'form.command'}; my $refpage = $env{'form.refpage'}; - 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,); - } + my %checkallowed = ( coursenormalmail => 1, + coursecritmail => 1, ); foreach my $perm_check (['whn','whatsnew',1], ['pch','coursediscussion',1], ['mgr','handgrading',1], ['vgr','abovethreshold',1], - ['vgr','haserrors',1], - ['whn','versionchanges',1], + ['opa','haserrors',1], + ['mdc','versionchanges',0], ['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'}; @@ -173,19 +151,12 @@ 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,$cdom,$crs); + &display_main_box($r,$command,$refpage,\%checkallowed); return OK; } @@ -196,7 +167,7 @@ sub handler { #------------------------------ sub display_main_box { - my ($r,$command,$refpage,$checkallowed,$cdom,$crs) = @_; + my ($r,$command,$refpage,$checkallowed) = @_; my $domain=&Apache::loncommon::determinedomain(); my $function = &Apache::loncommon::get_users_function(); my $lctype = lc(&Apache::loncommon::course_type()); @@ -231,19 +202,11 @@ 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", @@ -251,10 +214,13 @@ 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'); @@ -272,9 +238,6 @@ 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); @@ -319,54 +282,48 @@ END "\n"; } } - $scripttag.=<<"ENDTOGG"; - document.visible.submit(); + $scripttag.='document.visible.submit(); } -function thresholdreset() { - document.visible.command.value="reset"; - document.visible.submit(); -} - -function toggledetails(prefix) { - var total = document.visible[prefix+'count'].value; - var sumrow = document.visible[prefix+'row'].value; +function togglelogins() { + var total = document.visible.logincount.value; + var sumrow = document.visible.loginrow.value; if (total == 0) { return; } - var showdetails = 0; - for (var i=0; i -ENDTOGG +'; } my $course_type=&Apache::loncommon::course_type(); return &Apache::loncommon::start_page("What's New?", @@ -426,8 +383,6 @@ sub display_actions_box { my %activated; my %loggedin; my $logincount; - my %sessions; - my $sessioncount; my %res_title = (); my %show = (); my $needitems = 0; @@ -481,7 +436,7 @@ sub display_actions_box { $r->print(&Apache::loncommon::head_subbox($header)); if ($command eq 'reset') { - $result = &process_reset($cdom,$crs,$checkallowed); + $result = &process_reset($cdom,$crs); } elsif ($command eq 'update') { $result = &process_update($uname,$udom,$threshold_titles); } elsif ($command eq 'newinterval') { @@ -572,49 +527,28 @@ 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; - + my $now = time; if ($timediff{'versions'} == -1) { - $starttime = 0; - } else { - $starttime = $now - $timediff{'versions'}; + $timediff{'versions'} = time; } + my $starttime = $now - $timediff{'versions'}; if ($timediff{'newroles'} == -1) { - $activatedstart = 0; - } else { - $activatedstart = $now - $timediff{'newroles'}; + $timediff{'newroles'} = time; } + my $activatedstart = $now - $timediff{'newroles'}; if ($timediff{'oldroles'} == -1) { - $expiredstart = 0; - } else { - $expiredstart = $now - $timediff{'oldroles'}; + $timediff{'oldroles'} = time; } + my $expiredstart = $now - $timediff{'oldroles'}; if ($timediff{'crslogin'} == -1) { - $crsloginstart = 0; - } else { - $crsloginstart = $now - $timediff{'crslogin'}; + $timediff{'crslogin'} = time; } + my $crsloginstart = $now - $timediff{'crslogin'}; + my $countunread = $display_settings{$cid.':countunread'}; unless (defined($countunread)) { $countunread = 'on'; @@ -628,20 +562,7 @@ sub display_actions_box { $threshold{'av_attempts'},$threshold{'degdiff'}, '
',$threshold{'numstudents'}); - 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', - ); + my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin'); foreach my $key (keys(%{$checkallowed})) { if ($key =~ /_section$/) { next; } @@ -655,8 +576,7 @@ sub display_actions_box { foreach my $item (@actionorder) { unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail' || - $item eq 'newroles' || $item eq 'oldroles' || - $item eq 'crslogin' || $item eq 'sessions') { + $item eq 'newroles' || $item eq 'oldroles') { if ($show{$item}) { $needitems = 1; last; @@ -666,11 +586,7 @@ 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,$checkallowed); - } - my $classlist; - if ($show{'oldroles'} || $show{'newroles'} || $show{'crslogin'} || $show{'sessions'}) { - $classlist = &Apache::loncoursedata::get_classlist(); + $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); } if ($show{'coursenormalmail'}) { $msgcount = &getnormalmail(\@newmsgs); @@ -679,17 +595,14 @@ sub display_actions_box { $critmsgcount = &getcritmail(\@critmsgs); } if ($show{'oldroles'}) { - $expirecount = &getexpired(\%expired,$expiredstart,'previous',$classlist); + $expirecount = &getexpired(\%expired,$expiredstart,'previous'); } if ($show{'newroles'}) { - $activecount = &getactivated(\%activated,$activatedstart,'active',$classlist); + $activecount = &getactivated(\%activated,$activatedstart,'active'); } 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|); @@ -711,15 +624,14 @@ sub display_actions_box { $totalboxes ++; } } - my $currcolumn = 'left'; + my $halfway = 4; # my $halfway = int($totalboxes/2) + $totalboxes%2; foreach my $actionitem (@actionorder) { - if ($checkallowed->{$actionitem}) { - if (($actioncolumn{$actionitem} eq 'right') && ($currcolumn eq 'left')) { + if ($$checkallowed{$actionitem}) { + if ($displayed == $halfway) { $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,\%sessions,$sessioncount,$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); $displayed ++; } } @@ -766,7 +678,7 @@ sub display_threshold_config { foreach my $type (@thresholditems) { my $parameter = $env{'request.course.id'}.':threshold_'.$type; # onchange is javascript to automatically check the 'Set' button. - my $onchange = 'onfocus="javascript:window.document.forms'. + my $onchange = 'onFocus="javascript:window.document.forms'. "['thresholdform'].elements['".$parameter."_setparmval']". '.checked=true;"'; $r->print(&Apache::loncommon::start_data_table_row()."\n". @@ -800,8 +712,6 @@ 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'}, @@ -812,8 +722,6 @@ 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.').'
'); } @@ -834,14 +742,7 @@ sub display_interval_config { '); if (ref($interval_titles) eq 'HASH') { if (ref($interval_titles->{$context}) eq 'HASH') { - 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) { + foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}})))) { $r->print(''."\n"); } @@ -884,7 +785,7 @@ function toggle_countunread(choice) { .'
' .&mt("This can increase the time taken to gather data for the [_1]What's New Page[_2] by a few seconds.",'','') .'  ' - .&mt('Currently set to [_1].',''.$current.'') + .&mt('Currently set to [_1].',''.$current.'.') ); $r->print('

@@ -986,8 +887,7 @@ 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,$sessions,$sessioncount, - $classlist) = @_; + $crstype,$itemserror,$loggedin,$logincount) = @_; if ($$checkallowed{$action}) { &start_box($r,$show,$headings,$action,$refpage); @@ -1000,7 +900,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,$checkallowed); + $res_title,$itemserror); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, $countunread,$res_title,$itemserror); @@ -1010,16 +910,13 @@ sub display_launcher { &display_coursecritmail($r,$critmsgcount,$critmsgs); } elsif ($action eq 'newroles') { # ACTIVATED ROLES &display_rolechanges($r,$activecount,$activated,$interval->{'newroles'}, - $crstype,$classlist); + $crstype); } elsif ($action eq 'oldroles') { # EXPIRED ROLES &display_rolechanges($r,$expirecount,$expired,$interval->{'oldroles'}, - $crstype,$classlist); + $crstype); } elsif ($action eq 'crslogin') { #LAST LOGIN - &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); + &display_crslogins($r,$logincount,$loggedin,$interval->{'crslogin'}, + $crstype); } } &end_box($r); @@ -1030,7 +927,7 @@ sub display_launcher { sub getitems { my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions, $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show, - $starttime,$countunread,$checkallowed) = @_; + $starttime,$countunread) = @_; 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].','','').''; @@ -1090,9 +987,9 @@ sub getitems { # Maxtries and degree of difficulty for problem parts, unless handgradeable if ($$show{'abovethreshold'}) { &check_thresholds($resource,$symb,\%resourcetracker, - $triggered,$threshold,$warnings, - $checkallowed); + $triggered,$threshold,$warnings); } + } return; } @@ -1123,28 +1020,12 @@ sub check_discussions { sub check_handgraded { my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_; if ($resource->is_problem()) { - my ($handgradeable,$is_task); + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); my $partlist=$resource->parts(); - if ($resource->is_task()) { - $is_task = 1; - foreach my $part (@$partlist) { - if ($resource->handgrade($part) eq 'yes') { - $handgradeable=1; - last; - } - } - } else { - foreach my $part (@$partlist) { - my @types = $resource->responseType($part); - if (grep(/^essay$/,@types)) { - $handgradeable=1; - last; - } elsif (grep(/^custom$/,@types)) { - if ($resource->handgrade($part) eq 'yes') { - $handgradeable=1; - last; - } - } + my $handgradeable; + foreach my $part (@$partlist) { + if ($resource->handgrade($part) eq 'yes') { + $handgradeable=1; last; } } if ($handgradeable) { @@ -1153,7 +1034,6 @@ sub check_handgraded { if (@ungraded > 0) { $$ungraded{$symb}{count} = scalar(@ungraded); $$ungraded{$symb}{title} = $title; - $$ungraded{$symb}{is_task} = $is_task; if ($resource->encrypted()) { $$ungraded{$symb}{'enclink'} = $resource->link(); $$ungraded{$symb}{'encsymb'} = $resource->shown_symb(); @@ -1181,8 +1061,7 @@ sub check_bombed { } sub check_thresholds { - my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings, - $checkallowed) = @_; + my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_; # Compile maxtries and degree of difficulty for problem parts, unless handgradeable my @parts = @{$resource->parts()}; my %stats; @@ -1248,12 +1127,8 @@ sub check_thresholds { '.$stats{$part}{users}.' '.$stats{$part}{attempts}.' '.$stats{$part}{degdiff}.' - '.$lastreset{$part}.''; - if ($checkallowed->{'resetcounters'}) { - $$triggered{$symb}{text}[$partcount] .= - ''. - ''; - } + '.$lastreset{$part}.' + '; $partcount ++; } $$triggered{$symb}{numparts} = $partcount; @@ -1275,7 +1150,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}; @@ -1290,7 +1165,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} = @@ -1315,11 +1190,7 @@ sub get_current { } sub process_reset { - my ($dom,$crs,$checkallowed) = @_; - if (!$checkallowed->{'resetcounters'}) { - return ''.&mt('You do not have the required privileges to reset counters'). - '
'; - } + my ($dom,$crs) = @_; my $result = ''.&mt('Counters reset for following problems (and parts):'). '
'; my @agg_types = ('attempts','users','correct'); @@ -1361,13 +1232,9 @@ sub process_reset { sub process_update { my ($uname,$udom,$threshold_titles) = @_; my $setoutput = ''.&mt('Changes to threshold(s) for problem tracking:').'

'; - foreach my $key (keys(%env)) { - my $name; - if ($key =~/^form\.(.+)\_setparmval$/) { - $name = $1; - } else { - next; - } + foreach (keys %env) { + next if ($_!~/^form\.(.+)\_setparmval$/); + my $name = $1; my $value = $env{'form.'.$name.'_value'}; if ($name && defined($value) && ($value ne '')) { my $put_result = &Apache::lonnet::put('nohist_whatsnew', @@ -1390,37 +1257,29 @@ sub process_update { sub getnormalmail { my ($newmsgs) = @_; -# Check for unread messages in user's INBOX (which were sent in context of current course). +# Check for unread mail in course my $msgcount = 0; - 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 - }); + + 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'); } + push(@{$newmsgs}, { + msgid => $msgid, + sendtime => $sendtime, + shortsub => $shortsubj, + from => $fromname, + fromdom => $fromdom + }); } } } @@ -1430,15 +1289,13 @@ sub getnormalmail { sub getcritmail { my ($critmsgs) = @_; -# Check for critical messages which were sent in context of current course. +# Check for critical messages in 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($esc_msgid,undef,1,undef, - $env{'request.course.id'}); + &Apache::lonmsg::unpackmsgid($msgid); if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { if (defined($sendtime) && $sendtime!~/error/) { $sendtime = &Apache::lonlocal::locallocaltime($sendtime); @@ -1447,7 +1304,7 @@ sub getcritmail { $shortsubj = &mt('No subject'); } push(@{$critmsgs}, { - msgid => $esc_msgid, + msgid => $msgid, sendtime => $sendtime, shortsub => $shortsubj, from => $fromname, @@ -1460,13 +1317,13 @@ sub getcritmail { } sub getexpired { - my ($rolechgs,$rolechgtime,$status,$classlist) = @_; - my $expirecount = &getrolechanges($rolechgs,$rolechgtime,$status,$classlist); + my ($rolechgs,$rolechgtime,$status) = @_; + my $expirecount = &getrolechanges($rolechgs,$rolechgtime,$status); return $expirecount; } sub getactivated { - my ($rolechgs,$rolechgtime,$status,$classlist) = @_; + my ($rolechgs,$rolechgtime,$status) = @_; my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $now = time(); @@ -1478,26 +1335,28 @@ sub getactivated { my (%stucounted,%advcounted); my $activatedcount = 0; if (keys(%changes) > 0) { - foreach my $chg (keys(%changes)) { + foreach my $chg (sort { $b <=> $a } (keys(%changes))) { if (ref($changes{$chg}) eq 'HASH') { - next if ($changes{$chg}{'delflag'}); - if ($rolechgtime > 0) { - next if ($changes{$chg}{'exe_time'} < $rolechgtime); - } - if ($changes{$chg}{'exe_time'}) { - my $timestamp = $changes{$chg}{'exe_time'}; + my $timestamp = $changes{$chg}{'exe_time'}; + if ($timestamp) { + if ($rolechgtime > 0) { + if ($timestamp < $rolechgtime) { + last; + } + } if (ref($changes{$chg}{'logentry'}) eq 'HASH') { - my $end = $changes{$chg}{'logentry'}{'end'}; - next if ($end && $end <= $now); + next if ($changes{$chg}{'delflag'}); my $start = $changes{$chg}{'logentry'}{'start'}; - next if ($start >= $timestamp); + my $end = $changes{$chg}{'logentry'}{'end'}; my $section = $changes{$chg}{'logentry'}{'section'}; - if (($viewablesec ne '') && ($section ne '')) { - next if ($viewablesec ne $section); - } my $role = $changes{$chg}{'logentry'}{'role'}; my $uname = $changes{$chg}{'uname'}; my $udom = $changes{$chg}{'udom'}; + next if ($end && $end <= $now); + if (($viewablesec ne '') && ($section ne '')) { + next if ($viewablesec ne $section); + } + next if ($start >= $timestamp); if ($role eq 'st') { $stucounted{$uname.':'.$udom.':'.$section} = $start.':'.$end; } else { @@ -1517,13 +1376,12 @@ sub getactivated { } } } - $activatedcount += &getrolechanges($rolechgs,$rolechgtime,$status,$classlist,\%stucounted, - \%advcounted); + $activatedcount += &getrolechanges($rolechgs,$rolechgtime,$status,\%stucounted,\%advcounted); return $activatedcount; } sub getrolechanges { - my ($rolechgs,$rolechgtime,$status,$classlist,$stucountref,$advcountref) = @_; + my ($rolechgs,$rolechgtime,$status,$stucountref,$advcountref) = @_; my (%stucounted,%advcounted); if (ref($stucountref) eq 'HASH') { %stucounted = %{$stucountref}; @@ -1541,64 +1399,63 @@ sub getrolechanges { my ($permission,$allowed) = &Apache::lonuserutils::get_permission($context); my $viewablesec = &Apache::lonuserutils::viewable_section($permission); + my $classlist = &Apache::loncoursedata::get_classlist(); my $secidx = &Apache::loncoursedata::CL_SECTION(); my $startidx = &Apache::loncoursedata::CL_START(); my $endidx = &Apache::loncoursedata::CL_END(); my $rolechgcount = 0; - if (ref($classlist) eq 'HASH') { - foreach my $key (keys(%{$classlist})) { - my ($userstatus,$eventtime); - my $student = $classlist->{$key}; - if (ref($student) eq 'ARRAY') { - my $start = $student->[$startidx]; - my $end = $student->[$endidx]; - my $sec = $student->[$secidx]; - my ($stuname,$studom) = split(/:/,$key); - if ($status eq 'active') { - if (exists($stucounted{$key.':'.$sec})) { - next; - } + foreach my $key (keys(%{$classlist})) { + my ($userstatus,$eventtime); + my $student = $classlist->{$key}; + if (ref($student) eq 'ARRAY') { + my $start = $student->[$startidx]; + my $end = $student->[$endidx]; + my $sec = $student->[$secidx]; + my ($stuname,$studom) = split(/:/,$key); + if ($status eq 'active') { + if (exists($stucounted{$key.':'.$sec})) { + next; } - if (($end == 0) || ($end > $start)) { - if ($start <= $now) { - if ($end && $end < $now) { - if ($rolechgtime > 0) { - if ($end > $rolechgtime) { - $userstatus = 'previous'; - } - } else { + } + if (($end == 0) || ($end > $start)) { + if ($start <= $now) { + if ($end && $end < $now) { + if ($rolechgtime > 0) { + if ($end > $rolechgtime) { $userstatus = 'previous'; } } else { - if ($rolechgtime > 0) { - if ($start >= $rolechgtime) { - $userstatus = 'active'; - } - } else { + $userstatus = 'previous'; + } + } else { + if ($rolechgtime > 0) { + if ($start >= $rolechgtime) { $userstatus = 'active'; } + } else { + $userstatus = 'active'; } } } - next if ($userstatus ne $status); - if ($status eq 'active') { - $eventtime = $start; - } else { - $eventtime = $end; - } - if (($viewablesec ne '') && ($sec ne '')) { - next if ($viewablesec ne $sec); - } - my %chginfo = ( - 'section' => $sec, - 'uname' => $stuname, - 'udom' => $studom, - 'role' => 'st', - 'status' => $userstatus, - ); - $rolechgcount ++; - push(@{$rolechgs->{$eventtime}},\%chginfo); } + next if ($userstatus ne $status); + if ($status eq 'active') { + $eventtime = $start; + } else { + $eventtime = $end; + } + if (($viewablesec ne '') && ($sec ne '')) { + next if ($viewablesec ne $sec); + } + my %chginfo = ( + 'section' => $sec, + 'uname' => $stuname, + 'udom' => $studom, + 'role' => 'st', + 'status' => $userstatus, + ); + $rolechgcount ++; + push (@{$rolechgs->{$eventtime}},\%chginfo); } } my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef, @@ -1692,78 +1549,6 @@ 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); @@ -1819,24 +1604,13 @@ sub display_handgrade { foreach my $res (@{$tograde}) { $rowNum ++; my $css_class = $rowNum%2?' class="LC_odd_row"':''; - my $linkurl; - if ($$ungraded{$res}{'is_task'}) { - my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); - $linkurl=&Apache::lonnet::clutter($url); - $linkurl .= '?symb='.&escape($res); - if ($$ungraded{$res}{'enclink'}) { - $linkurl = - $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'}; - } + my $linkurl='/adm/grades'; + if ($$ungraded{$res}{'enclink'}) { + $linkurl.='?symb='.$$ungraded{$res}{'encsymb'}; } else { - $linkurl='/adm/grades'; - if ($$ungraded{$res}{'enclink'}) { - $linkurl.='?symb='.$$ungraded{$res}{'encsymb'}; - } else { - $linkurl.='?symb='.&escape($res); - } - $linkurl.='&command=ungraded'; + $linkurl.='?symb='.&escape($res); } + $linkurl.='&command=ungraded'; $r->print(''.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.''); } } elsif ($itemserror) { @@ -1875,7 +1649,7 @@ sub display_haserrors { } sub display_abovethreshold { - my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror,$checkallowed) = @_; + my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', part => 'Part', @@ -1889,16 +1663,16 @@ sub display_abovethreshold { ); if (@{$warnings} > 0) { @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings}; + $r->print(''. + ' '."\n". + ' '. + "\n"); $r->print(''. - ''.$lt{'reso'}. - ''. + ''.$lt{'reso'}.''. ''.$lt{'part'}.''.$lt{'nust'}.''. ''.$lt{'avat'}.''.$lt{'dedi'}.''. - ''.$lt{'lare'}.''); - if ($checkallowed->{'resetcounters'}) { - $r->print(''.$lt{'reco'}.''); - } - $r->print(''); + ''.$lt{'lare'}.''. + $lt{'reco'}.''); my $row; foreach my $res (@{$warnings}) { $row++; @@ -1924,15 +1698,13 @@ sub display_abovethreshold { if (ref($$triggered{$res}{text}) eq 'ARRAY') { if (@{$$triggered{$res}{text}} > 1) { for (my $i=1; $i<@{$$triggered{$res}{text}}; $i++) { - $r->print(''. + $r->print(''. $$triggered{$res}{text}[$i].''); } } } } - if ($checkallowed->{'resetcounters'}) { - $r->print('
'); - } + $r->print('
'); } elsif ($itemserror) { $r->print(''.$itemserror.''); } else { @@ -1978,7 +1750,7 @@ sub display_versionchanges { } sub display_rolechanges { - my ($r,$chgcount,$changed,$interval,$crstype,$classlist) = @_; + my ($r,$chgcount,$changed,$interval,$crstype) = @_; my $now = time(); my %lt = &Apache::lonlocal::texthash( 'user' => 'User', @@ -1997,7 +1769,6 @@ sub display_rolechanges { if (ref($changed) eq 'HASH') { my @changes = sort { $b <=> $a } (keys(%{$changed})); my $changenum = 0; - my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME(); foreach my $item (@changes) { if (ref($changed->{$item}) eq 'ARRAY') { foreach my $chg (@{$changed->{$item}}) { @@ -2015,14 +1786,8 @@ sub display_rolechanges { my $udom = $chg->{'udom'}; $changenum ++; my $css_class = $changenum%2?' class="LC_odd_row"':''; - my $fullname; - if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') { - $fullname = $classlist->{$uname.':'.$udom}->[$fullnameidx]; - } else { - $fullname = &Apache::loncommon::plainname($uname,$udom,'lastname'); - } my $link = - &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom); + &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom); $r->print(''. ''.&Apache::lonlocal::locallocaltime($item).''. ''.$link.''. @@ -2041,47 +1806,36 @@ sub display_rolechanges { return; } -sub display_activity { - my ($r,$context,$count,$details,$interval,$crstype,$classlist) = @_; - return unless (ref($classlist) eq 'HASH'); +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', ); - 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) { + if ($logincount) { - my $hdr = ''. + my $hdr = ''. ''.$lt{'user'}.''. ''.$lt{'role'}.''. - ''.$lt{'sec'}.''; - if ($context eq 'sessions') { - $hdr .= ''.$lt{'active'}.''; - } - $hdr .= ''."\n". - ''. - ''.$lt{'number'}.''. - ''.$lt{'role'}.''. - ''.$lt{'sec'}; + ''.$lt{'sec'}.''. + ''. + ''.$lt{'number'}.''. + ''.$lt{'role'}.''. + ''.$lt{'sec'}; my (%bylastname,%counts); - if (ref($details) eq 'HASH') { - my @items = sort { $b <=> $a } (keys(%{$details})); - my $num = 0; - my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME(); - foreach my $item (@items) { - if (ref($details->{$item}) eq 'ARRAY') { - foreach my $user (@{$details->{$item}}) { + if (ref($loggedin) eq 'HASH') { + my @logins = sort { $b <=> $a } (keys(%{$loggedin})); + my $numlogin = 0; + foreach my $item (@logins) { + if (ref($loggedin->{$item}) eq 'ARRAY') { + foreach my $user (@{$loggedin->{$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 { @@ -2090,21 +1844,13 @@ sub display_activity { $counts{$user->{'role'}}{$section} ++; my $uname = $user->{'uname'}; my $udom = $user->{'udom'}; - my $fullname; - if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') { - $fullname = $classlist->{$uname.':'.$udom}->[$fullnameidx]; - } else { - $fullname = &Apache::loncommon::plainname($uname,$udom,'lastname'); - } + my $fullname = &Apache::loncommon::plainname($uname,$udom,'lastname'); my $link = &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom); - my $entry = ''.$link.''. - ''.$role.''. - ''.$section.''; - if ($context eq 'sessions') { - $entry .= ''.&Apache::lonlocal::locallocaltime($item).''; - } - push(@{$bylastname{$fullname}},$entry); + push(@{$bylastname{$fullname}}, + ''.$link.''. + ''.$role.''. + ''.$section.''); } } } @@ -2113,9 +1859,9 @@ sub display_activity { foreach my $person (sort(keys(%bylastname))) { if (ref($bylastname{$person}) eq 'ARRAY') { foreach my $item (@{$bylastname{$person}}) { - $num ++; - my $css_class = $num%2?' class="LC_odd_row"':''; - $table .= '