--- loncom/interface/lonwhatsnew.pm 2012/02/08 17:07:02 1.101.2.1.2.1 +++ loncom/interface/lonwhatsnew.pm 2016/10/23 21:50:55 1.120 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.101.2.1.2.1 2012/02/08 17:07:02 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.120 2016/10/23 21:50:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -73,6 +73,7 @@ sub handler { ['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'}; @@ -285,6 +286,11 @@ END $scripttag.='document.visible.submit(); } +function thresholdreset() { + document.visible.command.value="reset"; + document.visible.submit(); +} + function togglelogins() { var total = document.visible.logincount.value; var sumrow = document.visible.loginrow.value; @@ -436,7 +442,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') { @@ -527,28 +533,33 @@ sub display_actions_box { $headings{'crslogin'} = &mt('Last login for users in last 24 hours'); } - my $now = time; + my ($now,$starttime,$activatedstart,$expiredstart,$crsloginstart); + $now = time; + if ($timediff{'versions'} == -1) { - $timediff{'versions'} = time; + $starttime = 0; + } else { + $starttime = $now - $timediff{'versions'}; } - my $starttime = $now - $timediff{'versions'}; if ($timediff{'newroles'} == -1) { - $timediff{'newroles'} = time; + $activatedstart = 0; + } else { + $activatedstart = $now - $timediff{'newroles'}; } - my $activatedstart = $now - $timediff{'newroles'}; if ($timediff{'oldroles'} == -1) { - $timediff{'oldroles'} = time; + $expiredstart = 0; + } else { + $expiredstart = $now - $timediff{'oldroles'}; } - my $expiredstart = $now - $timediff{'oldroles'}; if ($timediff{'crslogin'} == -1) { - $timediff{'crslogin'} = time; + $crsloginstart = 0; + } else { + $crsloginstart = $now - $timediff{'crslogin'}; } - my $crsloginstart = $now - $timediff{'crslogin'}; - my $countunread = $display_settings{$cid.':countunread'}; unless (defined($countunread)) { $countunread = 'on'; @@ -586,7 +597,11 @@ 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'}) { + $classlist = &Apache::loncoursedata::get_classlist(); } if ($show{'coursenormalmail'}) { $msgcount = &getnormalmail(\@newmsgs); @@ -595,10 +610,10 @@ sub display_actions_box { $critmsgcount = &getcritmail(\@critmsgs); } if ($show{'oldroles'}) { - $expirecount = &getexpired(\%expired,$expiredstart,'previous'); + $expirecount = &getexpired(\%expired,$expiredstart,'previous',$classlist); } if ($show{'newroles'}) { - $activecount = &getactivated(\%activated,$activatedstart,'active'); + $activecount = &getactivated(\%activated,$activatedstart,'active',$classlist); } if ($show{'crslogin'}) { $logincount = &getloggedin($cdom,$crs,\%loggedin,$crsloginstart); @@ -613,7 +628,7 @@ sub display_actions_box { } } - $r->print(' - - '; + '; + if ($checkallowed->{'resetcounters'}) { + $$triggered{$symb}{text}[$partcount] .= + ''; + } $partcount ++; } $$triggered{$symb}{numparts} = $partcount; @@ -1149,7 +1171,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}; @@ -1164,7 +1186,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} = @@ -1189,7 +1211,11 @@ sub get_current { } sub process_reset { - my ($dom,$crs) = @_; + my ($dom,$crs,$checkallowed) = @_; + if (!$checkallowed->{'resetcounters'}) { + return ''.&mt('You do not the required privileges to reset counters'). + '
'; + } my $result = ''.&mt('Counters reset for following problems (and parts):'). '
'; my @agg_types = ('attempts','users','correct'); @@ -1231,9 +1257,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', @@ -1256,29 +1286,36 @@ 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 ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= + &Apache::lonmsg::unpackmsgid($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 => $msgid, + sendtime => $sendtime, + shortsub => $shortsubj, + from => $fromname, + fromdom => $fromdom + }); } - push(@{$newmsgs}, { - msgid => $msgid, - sendtime => $sendtime, - shortsub => $shortsubj, - from => $fromname, - fromdom => $fromdom - }); } } } @@ -1288,13 +1325,14 @@ 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 ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= - &Apache::lonmsg::unpackmsgid($msgid); + &Apache::lonmsg::unpackmsgid($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); @@ -1316,13 +1354,13 @@ sub getcritmail { } sub getexpired { - my ($rolechgs,$rolechgtime,$status) = @_; - my $expirecount = &getrolechanges($rolechgs,$rolechgtime,$status); + my ($rolechgs,$rolechgtime,$status,$classlist) = @_; + my $expirecount = &getrolechanges($rolechgs,$rolechgtime,$status,$classlist); return $expirecount; } sub getactivated { - my ($rolechgs,$rolechgtime,$status) = @_; + my ($rolechgs,$rolechgtime,$status,$classlist) = @_; my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $now = time(); @@ -1334,28 +1372,26 @@ sub getactivated { my (%stucounted,%advcounted); my $activatedcount = 0; if (keys(%changes) > 0) { - foreach my $chg (sort { $b <=> $a } (keys(%changes))) { + foreach my $chg (keys(%changes)) { if (ref($changes{$chg}) eq 'HASH') { - my $timestamp = $changes{$chg}{'exe_time'}; - if ($timestamp) { - if ($rolechgtime > 0) { - if ($timestamp < $rolechgtime) { - last; - } - } + 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'}; if (ref($changes{$chg}{'logentry'}) eq 'HASH') { - next if ($changes{$chg}{'delflag'}); - my $start = $changes{$chg}{'logentry'}{'start'}; my $end = $changes{$chg}{'logentry'}{'end'}; - my $section = $changes{$chg}{'logentry'}{'section'}; - my $role = $changes{$chg}{'logentry'}{'role'}; - my $uname = $changes{$chg}{'uname'}; - my $udom = $changes{$chg}{'udom'}; next if ($end && $end <= $now); + my $start = $changes{$chg}{'logentry'}{'start'}; + next if ($start >= $timestamp); + my $section = $changes{$chg}{'logentry'}{'section'}; if (($viewablesec ne '') && ($section ne '')) { next if ($viewablesec ne $section); } - next if ($start >= $timestamp); + my $role = $changes{$chg}{'logentry'}{'role'}; + my $uname = $changes{$chg}{'uname'}; + my $udom = $changes{$chg}{'udom'}; if ($role eq 'st') { $stucounted{$uname.':'.$udom.':'.$section} = $start.':'.$end; } else { @@ -1375,12 +1411,13 @@ sub getactivated { } } } - $activatedcount += &getrolechanges($rolechgs,$rolechgtime,$status,\%stucounted,\%advcounted); + $activatedcount += &getrolechanges($rolechgs,$rolechgtime,$status,$classlist,\%stucounted, + \%advcounted); return $activatedcount; } sub getrolechanges { - my ($rolechgs,$rolechgtime,$status,$stucountref,$advcountref) = @_; + my ($rolechgs,$rolechgtime,$status,$classlist,$stucountref,$advcountref) = @_; my (%stucounted,%advcounted); if (ref($stucountref) eq 'HASH') { %stucounted = %{$stucountref}; @@ -1398,63 +1435,64 @@ 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; - 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 (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; + } } - } - if (($end == 0) || ($end > $start)) { - if ($start <= $now) { - if ($end && $end < $now) { - if ($rolechgtime > 0) { - if ($end > $rolechgtime) { + if (($end == 0) || ($end > $start)) { + if ($start <= $now) { + if ($end && $end < $now) { + if ($rolechgtime > 0) { + if ($end > $rolechgtime) { + $userstatus = 'previous'; + } + } else { $userstatus = 'previous'; } } else { - $userstatus = 'previous'; - } - } else { - if ($rolechgtime > 0) { - if ($start >= $rolechgtime) { + if ($rolechgtime > 0) { + if ($start >= $rolechgtime) { + $userstatus = 'active'; + } + } else { $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, @@ -1603,13 +1641,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(''); } } elsif ($itemserror) { @@ -1648,7 +1686,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', @@ -1662,16 +1700,16 @@ sub display_abovethreshold { ); if (@{$warnings} > 0) { @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings}; - $r->print(''. - ' '."\n". - ' '. - "\n"); $r->print(''. - ''. + ''. ''. ''. - ''); + ''); + if ($checkallowed->{'resetcounters'}) { + $r->print(''); + } + $r->print(''); my $row; foreach my $res (@{$warnings}) { $row++; @@ -1697,13 +1735,15 @@ 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].''); } } } } - $r->print(''); + if ($checkallowed->{'resetcounters'}) { + $r->print(''); + } } elsif ($itemserror) { $r->print(''); } else { @@ -1749,7 +1789,7 @@ sub display_versionchanges { } sub display_rolechanges { - my ($r,$chgcount,$changed,$interval,$crstype) = @_; + my ($r,$chgcount,$changed,$interval,$crstype,$classlist) = @_; my $now = time(); my %lt = &Apache::lonlocal::texthash( 'user' => 'User', @@ -1768,6 +1808,7 @@ 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}}) { @@ -1785,8 +1826,14 @@ 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(&Apache::loncommon::plainname($uname,$udom),$uname,$udom); + &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom); $r->print(''. ''. ''. @@ -1806,7 +1853,8 @@ sub display_rolechanges { } sub display_crslogins { - my ($r,$logincount,$loggedin,$interval,$crstype) = @_; + my ($r,$logincount,$loggedin,$interval,$crstype,$classlist) = @_; + return unless (ref($classlist) eq 'HASH'); my %lt = &Apache::lonlocal::texthash( 'user' => 'User', 'role' => 'Role', @@ -1827,6 +1875,7 @@ sub display_crslogins { if (ref($loggedin) eq 'HASH') { my @logins = sort { $b <=> $a } (keys(%{$loggedin})); my $numlogin = 0; + my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME(); foreach my $item (@logins) { if (ref($loggedin->{$item}) eq 'ARRAY') { foreach my $user (@{$loggedin->{$item}}) { @@ -1843,7 +1892,12 @@ sub display_crslogins { $counts{$user->{'role'}}{$section} ++; my $uname = $user->{'uname'}; my $udom = $user->{'udom'}; - my $fullname = &Apache::loncommon::plainname($uname,$udom,'lastname'); + 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); push(@{$bylastname{$fullname}}, @@ -1920,7 +1974,7 @@ sub display_coursediscussion { my $forum_title = $$unread{$ressymb}{'title'}; my $type = 'Resource'; my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb); - my $disclink = $feedurl.'?symb='.$$unread{$ressymb}{symb}; + my $disclink = $feedurl.'?symb='. &escape($$unread{$ressymb}{symb}); if ($feedurl =~ /bulletinboard/) { $type = 'Discussion Board'; }
'); + $r->print('
'); my $displayed = 0; my $totalboxes = 0; @@ -631,7 +646,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,\%loggedin,$logincount,$classlist); $displayed ++; } } @@ -639,6 +654,7 @@ sub display_actions_box {
+ '); } @@ -677,7 +693,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". @@ -784,7 +800,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('

@@ -886,10 +902,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,$loggedin,$logincount,$classlist) = @_; if ($$checkallowed{$action}) { - &start_box($r,$show,$headings,$action,$refpage,$action); + &start_box($r,$show,$headings,$action,$refpage); if ($$show{$action}) { if ($action eq 'handgrading') { # UNGRADED ITEMS &display_handgrade($r,$tograde,$ungraded,$itemserror); @@ -899,7 +915,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); @@ -909,14 +925,13 @@ sub display_launcher { &display_coursecritmail($r,$critmsgcount,$critmsgs); } elsif ($action eq 'newroles') { # ACTIVATED ROLES &display_rolechanges($r,$activecount,$activated,$interval->{'newroles'}, - $crstype); + $crstype,$classlist); } elsif ($action eq 'oldroles') { # EXPIRED ROLES &display_rolechanges($r,$expirecount,$expired,$interval->{'oldroles'}, - $crstype); + $crstype,$classlist); } elsif ($action eq 'crslogin') { #LAST LOGIN &display_crslogins($r,$logincount,$loggedin,$interval->{'crslogin'}, - $crstype); - + $crstype,$classlist); } } &end_box($r); @@ -927,7 +942,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].','','').''; @@ -987,7 +1002,8 @@ 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); } } @@ -1061,7 +1077,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; @@ -1096,6 +1113,7 @@ sub check_thresholds { $av_attempts = $attempts/$users; $av_attempts = sprintf("%.2f",$av_attempts); } + &Apache::lonnet::statslog($symb,$part,$users,$av_attempts,$degdiff); if ((($degdiff ne '' && $degdiff >= $$threshold{'degdiff'}) || ($av_attempts ne '' && $av_attempts >= $$threshold{'av_attempts'})) && ($users >= $$threshold{'numstudents'})) { $stats{$part}{degdiff} = $degdiff; $stats{$part}{attempts} = $av_attempts; @@ -1126,8 +1144,12 @@ sub check_thresholds {
'.$stats{$part}{users}.' '.$stats{$part}{attempts}.' '.$stats{$part}{degdiff}.''.$lastreset{$part}.''.$lastreset{$part}.''. + ''.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'
'.$lt{'reso'}.''.$lt{'reso'}. + ''.$lt{'part'}.''.$lt{'nust'}.''.$lt{'avat'}.''.$lt{'dedi'}.''.$lt{'lare'}.''. - $lt{'reco'}.'
'.$lt{'lare'}.''.$lt{'reco'}.'


'.$itemserror.'
'.&Apache::lonlocal::locallocaltime($item).''.$link.'