--- loncom/interface/lonwhatsnew.pm 2005/04/29 14:54:18 1.12 +++ loncom/interface/lonwhatsnew.pm 2005/12/05 19:27:53 1.35 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.12 2005/04/29 14:54:18 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.35 2005/12/05 19:27:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,8 +35,10 @@ use Apache::lonhtmlcommon(); use Apache::lonlocal; use Apache::loncoursedata(); use Apache::lonnavmaps(); +use Apache::lonuserstate; use Apache::Constants qw(:common :http); use Time::Local; +use GDBM_File; #---------------------------- # handler @@ -52,36 +54,40 @@ sub handler { } &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['command']); - my $command = $env{'form.command'}; - - if ($command eq '') { - $command = "info"; + my $command; + if ($env{'form.action'} eq 'reset') { + $command = 'reset'; + } elsif ($env{'form.action'} eq 'update') { + $command = 'update'; + } else { + $command = $env{'form.command'}; } &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print(&display_header()); - if (! (($env{'request.course.fn'}) && (&Apache::lonnet::allowed('vsa',$env{'request.course.id'})))) { - # Not in a course, or not allowed to modify parms - $env{'user.error.msg'}="/adm/whatsnew:vsa:0:0:Cannot display student activity"; + $r->print(&display_header($command)); + if (! (($env{'request.course.fn'}) && (&Apache::lonnet::allowed('bre',$env{'request.course.id'})))) { + # Not in a course, or not allowed to view action items + $env{'user.error.msg'}="/adm/whatsnew:bre:0:0:Cannot display what's new screen"; return HTTP_NOT_ACCEPTABLE; } &Apache::lonhtmlcommon::clear_breadcrumbs(); - if ($command eq 'config') { + if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=config', - text=>"Configure display"}); + ({href=>'/adm/whatsnew?command=threshold', + text=>"Change thresholds"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Course Action Items','Course_Action_Items_Config')); + (undef,'Course Action Items','Course_Action_Items_Thresholds')); } else { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=info', + ({href=>'/adm/whatsnew', text=>"Display Action Items"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs (undef,'Course Action Items','Course_Action_Items_Display')); } &display_main_box($r,$command); + return OK; } #------------------------------ @@ -94,30 +100,20 @@ sub display_main_box { my ($r,$command) = @_; my $domain=&Apache::loncommon::determinedomain(); my $tabbg=&Apache::loncommon::designparm('coordinator.tabbg',$domain); - my $selconfig; - my $selinfo; - if ($command eq 'config') { - $selinfo = 'selected="selected"'; - } else { - $selconfig = 'selected="selected"'; - } - my $picker = (' -
- - - - -
'); - $r->print(' -
'); - - if ($command eq 'config') { - &display_config_box($r,$picker); + + my %threshold_titles = ( + av_attempts => 'Average number of attempts', + degdiff => 'Degree of difficulty', + numstudents => 'Total number of students with submissions', + ); + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; + + if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { + &display_config_box($r,$command,$tabbg,\%threshold_titles,$cdom,$crs); } else { - &display_actions_box($r,$picker); + &display_actions_box($r,$command,\%threshold_titles,$cdom,$crs); } $r->print(< @@ -155,22 +151,29 @@ ENDHEAD #------------------------------- sub display_actions_box() { - my ($r,$picker) = @_; + my ($r,$command,$threshold_titles,$cdom,$crs) = @_; my $rowColor1 = "#ffffff"; my $rowColor2 = "#eeeeee"; - my $rowColor; my %unread = (); my %ungraded = (); my %bombed = (); my %triggered = (); + my %changed = (); my @newmsgs = (); my @critmsgs = (); my @newdiscussions = (); my @tograde = (); my @bombs = (); my @warnings = (); + my $msgcount = 0; + my $critmsgcount = 0; + + my %res_title = (); + my %show = (); + my $needitems = 0; + my $boxcount = 0; my $domain=&Apache::loncommon::determinedomain(); my $function; @@ -181,272 +184,271 @@ sub display_actions_box() { $function='admin'; } + my %threshold = ( + av_attempts => 2, + degdiff => 0.5, + numstudents => 2, + ); + my $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain); my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); - &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2); - my ($msgcount,$critmsgcount) = &getmail(\@newmsgs,\@critmsgs); - unless ($env{'request.course.id'}) { - $r->print('
You are accessing an invalid course


'); + $r->print('
You are accessing an invalid course.


'); return; } - $r->print(''.$picker.'
'); + my %checkallowed = ( + coursediscussion => &Apache::lonnet::allowed('pch',$env{'request.course.id'}), + handgrading => &Apache::lonnet::allowed('mgr',$env{'request.course.id'}), + abovethreshold => &Apache::lonnet::allowed('vgr',$env{'request.course.id'}), + haserrors => &Apache::lonnet::allowed('opa',$env{'request.course.id'}), + versionchanges => &Apache::lonnet::allowed('opa',$env{'request.course.id'}), + coursenormalmail => 1, + coursecritmail => 1, + ); + + my $timediff = 604800; + my %display_settings = &get_display_settings(); + my $now = time; + my %intervals = ( + -1 => 'since start of course', + 2592000 => 'since last month', + 604800 => 'since last week', + 86400 => 'since yesterday', + ); + my $interval = $intervals{$timediff}; + if ($timediff == -1) { + $timediff = time; + } + my $starttime = $now - $timediff; + + my %headings = &Apache::lonlocal::texthash( + coursediscussion => 'Unread course discussion posts', + handgrading => 'Problems requiring handgrading', + haserrors => 'Problems with errors', + versionchanges => 'Resources in course with version changes '.$interval, + coursenormalmail => 'New course message', + coursecritmail => 'New critical messages in course', + ); -## UNGRADED ITEMS ## - $r->print(< -
- - - - -
Problems requiring handgrading
- -END + if ($checkallowed{'abovethreshold'}) { + &get_curr_thresholds(\%threshold,$cdom,$crs); + } - if (@tograde > 0) { - $r->print(''); - my $rowNum = 0; - foreach my $res (@tograde) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); - my $linkurl=&Apache::lonnet::clutter($url); - $linkurl .= '?symb='.&Apache::lonnet::escape($res); + $headings{'abovethreshold'} = &mt('Problems with av. attempts').' ≥ '.$threshold{'av_attempts'}.' '.&mt('or deg. difficulty').' ≥ '.$threshold{'degdiff'}.'
'.&mt('and total number of students with submissions').' ≥ '.$threshold{'numstudents'}; - $r->print(''); - $rowNum ++; - } - } else { - $r->print(''); - } - $r->print('
Problem NameNumber ungraded
'.$ungraded{$res}{title}.''.$ungraded{$res}{count}.'

  No problems require handgrading  


'); + my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail'); -## BOMBS ## - $r->print(<<"END"); - - -
- - - - - -
Problems with errors
- -END - my $bombnum = 0; - if (@bombs > 0) { -# @bombs = sort { &cmp_title($a,$b) } @bombs; - foreach my $bomb (@bombs) { - if ($bombnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; + foreach my $key (keys(%checkallowed)) { + $show{$key} = 0; + if ($checkallowed{$key}) { + unless ($display_settings{$key} eq 'off') { + $show{$key} = 1; } - $r->print(''); - $bombnum ++; } - } else { - $r->print(''); } - $r->print('
'.$bombed{$bomb}{errorlink}.'

No problems with errors


'); -# DEGDIFF AND AV. TRIES TRIGGERS - $r->print(<<"END"); - - -
- - - - - -
Problems with average attempts > 0 or degree of difficulty > 0
- -END - my $warningnum = 0; - if (@warnings > 0) { -# @warnings = sort { &cmp_title($a,$b) } @warnings; - $r->print(''); - foreach my $res (@warnings) { - if ($warningnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; + foreach my $item (@actionorder) { + unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail') { + if ($show{$item}) { + $needitems = 1; + last; } - my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); - my $linkurl=&Apache::lonnet::clutter($url); - my $rowspan; - if ($triggered{$res}{numparts} > 1) { - $rowspan = 'rowspan="'.$triggered{$res}{numparts}.'"'; - } - $linkurl .= '?symb='.&Apache::lonnet::escape($res); - $r->print(''.$triggered{$res}{text}); - $warningnum ++; } - } else { - $r->print(''); } - $r->print('
ResourcePartNum. studentsAv. AttemptsDeg. Diff
'.$triggered{$res}{title}.'

No problems with av. attempts or degree of difficulty above thresholds


'); - $r->print('		 '); -## UNREAD COURSE DISCUSSION POSTS ## - $r->print(<<"END"); - -
- - - - - -
Unread course discussion posts
- -END - - if (@newdiscussions > 0) { - $r->print(''); -# @newdiscussions = sort { &cmp_title($a,$b) } @newdiscussions; - my $rowNum = 0; - foreach my $ressymb (@newdiscussions) { - my $forum_title = $unread{$ressymb}{'title'}; - my $type = 'Resource'; - my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb); - if ($feedurl =~ /bulletinboard/) { - $type = 'Bulletin Board'; - } - my $unreadnum = keys(%{$unread{$ressymb}}); - $unreadnum = $unreadnum - 2; - if ($unreadnum > 0) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(''); - $rowNum ++; - } - } - } else { - $r->print(''); + if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db', + &GDBM_READER(),0640)) { + my $furl=$bighash{'first_url'}; + $r->print('Go to first resource
Change your preferences to suppress display of this screen when accessing courses as Course Coordinator in the future.
'); + untie(%bighash); } - $r->print('
LocationTypeNumber of new posts
'.$forum_title.' '.$type.''.$unreadnum.' 

 No unread posts in course discussions


'); -## MESSAGES ## - $r->print(< -
- - - - - -
New course messages
- -END - if ($msgcount > 0) { - $r->print(''); - my $rowNum = 0; - my $mailcount = 1; - foreach my $msg (@newmsgs) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(''); - $rowNum ++; - $mailcount ++; - } - } else { - $r->print(''); + my $result; + + if ($command eq 'reset') { + $result = &process_reset($cdom,$crs); + } elsif ($command eq 'update') { + $result = &process_update($cdom,$crs,$threshold_titles); + } + if ($result) { + $r->print($result.'
'); } + $r->rflush(); - $r->print('
'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'
'.$mailcount.'.  '.$msg->{'shortsub'}.'    '.$msg->{'from'}.'@'.$msg->{'fromdom'}.' '.$msg->{'sendtime'}.'

No new course messages


'); + if ($needitems) { + &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime); + } + if ($show{'coursenormalmail'}) { + &getnormalmail(\@newmsgs); + } + if ($show{'coursecritmail'}) { + &getcritmail(\@critmsgs); + } - $r->print(< - - - - - - -
New critical messages in course
- -END + $r->print(qq|Hide All  Show All|); - if ($critmsgcount > 0) { - $r->print(''); - my $rowNum = 0; - my $mailcount = 1; - foreach my $msg (@critmsgs) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; + $r->print('
NumberSubjectSenderDate/Time
'); - $rowNum ++; - $mailcount ++; + &display_launcher($r,$actionitem,\%checkallowed,$tabbg,$rowColor1,$rowColor2,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval); + $displayed ++; } - } else { - $r->print(''); } - - $r->print('
'); + + my $displayed = 0; + my $totalboxes = keys(%checkallowed); + my $halfway = int($totalboxes/2) + $totalboxes%2; + foreach my $actionitem (@actionorder) { + if ($checkallowed{$actionitem}) { + if ($displayed == $halfway) { + $r->print(' '); } - $r->print('
'.$mailcount.'.  '.$msg->{'shortsub'}.'    '.$msg->{'from'}.'@'.$msg->{'fromdom'}.' '.$msg->{'sendtime'}.'

No unread critical messages in course


'); - $r->print(' - '); - $r->print(''); + + + + '); } #------------------------------- # display_config_box # -# Display the action items +# Display the threshold setting screen # #------------------------------- sub display_config_box() { - my ($r,$picker) = @_; - $r->print(''.$picker.'
'); + my ($r,$command,$tabbg,$threshold_titles,$cdom,$crs) = @_; + my %threshold = (); + my $rowColor1 = "#ffffff"; + my $rowColor2 = "#eeeeee"; + my $rowColor; + + my @thresholditems = ("av_attempts","degdiff","numstudents"); + my %threshold_titles = ( + av_attempts => 'Average number of attempts', + degdiff => 'Degree of difficulty', + numstudents => 'Total number of students with submissions', + ); + &get_curr_thresholds(\%threshold,$cdom,$crs); + + $r->print('
'."\n"; - } - if (@parts > 1) { - $$triggered{$symb}{text} .= ' - '; - } else { - $$triggered{$symb}{text} .= ' - '; - } + $warning = 1; + } + } + if ($warning) { + if ($warningnum %2 == 1) { + $rowColor = $rowColor1; + } else { + $rowColor = $rowColor2; + } + $$triggered{$symb}{title} = $resource->title; + foreach my $part (@parts) { + if (exists($stats{$part}{users})) { + my $resetname = 'reset_'.&Apache::lonnet::escape($symb."\0".$part); + my $resettitle = 'title_'.&Apache::lonnet::escape($symb."\0".$part); + if ($$triggered{$symb}{numparts}) { + $$triggered{$symb}{text} .= ''."\n"; + } + if (@parts > 1) { + $$triggered{$symb}{text} .= ' + '; + } else { $$triggered{$symb}{text} .= ' - - - - '; - $$triggered{$symb}{numparts} ++; + '; } + $$triggered{$symb}{text} .= ' + + + + + + '; + $$triggered{$symb}{numparts} ++; + } + } + push(@{$warnings},$symb); + $warningnum ++; + } +} + + +sub get_curr_thresholds { + my ($threshold,$cdom,$crs) = @_; + my %coursesettings = &Apache::lonnet::dump('environment', + $cdom,$crs,'internal.threshold'); + if (exists($coursesettings{'internal.threshold_av_attempts'})) { + $$threshold{'av_attempts'} = $coursesettings{'internal.threshold_av_attempts'}; + } + if (exists($coursesettings{'internal.threshold_degdiff'})) { + $$threshold{'degdiff'} = $coursesettings{'internal.threshold_degdiff'}; + } + if (exists($coursesettings{'internal.threshold_numstudents'})) { + $$threshold{'numstudents'} = $coursesettings{'internal.threshold_numstudents'}; + } +} + +sub process_reset { + my ($dom,$crs) = @_; + my $result = 'Counters reset for following problems (and parts):
'; + my @agg_types = ('attempts','users','correct'); + my %agg_titles = ( + attempts => 'Number of submissions', + users => 'Students with submissions', + correct => 'Number of correct submissions', + ); + my @resets = (); + my %titles = (); + foreach my $key (keys(%env)) { + next if ($key !~ /^form\.reset_(.+)$/); + my $title = &Apache::lonnet::unescape($env{'form.title_'.$1}); + my $reset_item = &Apache::lonnet::unescape($1); + my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item); + my %aggregates = (); + my ($symb,$part) = split(/\0/,$reset_item); + foreach my $type (@agg_types) { + $aggregates{$reset_item."\0".$type} = 0; + } + $aggregates{$reset_item."\0".'resettime'} = time; + my $putresult = &Apache::lonnet::put('nohist_resourcetracker',\%aggregates, + $dom,$crs); + if ($putresult eq 'ok') { + $result .= $title.' -part '.$part.': '; + my %new_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item); + foreach my $type (@agg_types) { + $result .= $agg_titles{$type}.' = '.$new_aggregates{$reset_item."\0".$type}.'; '; + } + $result =~ s/; $//; + $result .= '
'; + } else { + $result = $title.' -part '.$part.': '.&mt('Unable to reset counters to zero due to [_1]',$putresult).'.
'."\n"; + } + } + return $result; +} + +sub process_update { + my ($dom,$crs,$threshold_titles) = @_; + my $setoutput = 'Changes to threshold(s) for problem tracking:
'; + foreach (keys %env) { + next if ($_!~/^form\.(.+)\_setparmval$/); + my $name = $1; + my $value = $env{'form.'.$name.'_value'}; + if ($name && defined($value)) { + my $put_result = &Apache::lonnet::put('environment', + {$name=>$value},$dom,$crs); + + my ($shortname) = ($name =~ /^internal\.threshold_(.+)$/); + if ($put_result eq 'ok') { + $setoutput.=&mt('Set threshold for [_1] to [_2]', + ''.$$threshold_titles{$shortname}.'', + ''.$value.'').'
'; + } else { + $setoutput.=&mt('Unable to set threshold for [_1] to [_2] due to [_3].', + ''.$name.'',''.$value.'', + ''.$put_result.'').'
'; } - push(@{$warnings},$symb); - $warningnum ++; } } + return $setoutput; } -sub getmail { - my ($newmsgs,$critmsgs) = @_; +sub getnormalmail { + my ($newmsgs) = @_; # Check for unread mail in course my $msgcount = 0; @@ -618,7 +749,11 @@ sub getmail { } } } + return $msgcount; +} +sub getcritmail { + my ($critmsgs) = @_; # Check for critical messages in course my %what=&Apache::lonnet::dump('critical'); my $result = ''; @@ -645,14 +780,357 @@ sub getmail { } } } - return ($msgcount,$critmsgcount); + return $critmsgcount; +} + + +sub checkversions { + my ($cdom,$crs,$navmap,$changed,$starttime) = @_; + my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs); + my ($tmp) = keys(%changes); + if ($tmp =~/^error\:/) { + &Apache::lonnet::logthis('Error retrieving version update information: '. + $tmp.' for '.$cdom.'_'.$crs.' in whatsnew'); + } else { + if (keys(%changes) > 0) { + foreach my $key (sort(keys(%changes))) { + if ($changes{$key} > $starttime) { + my $version; + my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); + my $currentversion=&Apache::lonnet::getversion($key); + my $revdate = + &Apache::lonnet::metadata($root.'.'.$extension, + 'lastrevisiondate'); + $revdate = &Apache::lonlocal::locallocaltime($revdate); + my $linkurl=&Apache::lonnet::clutter($key); + my $usedversion=$navmap->usedVersion('version_'.$linkurl); + my @resources = $navmap->getResourceByUrl($linkurl,1); + if (($usedversion) && ($usedversion ne 'mostrecent')) { + $version = $usedversion; + } else { + $version = $currentversion; + } + foreach my $res (@resources) { + if (ref($res) eq 'Apache::lonnavmaps::resource') { + my $symb = $res->symb(); + %{$$changed{$symb}} = ( + current => $currentversion, + version => $version, + revdate => $revdate, + ); + } + } + } + } + } + } + return; +} + +sub display_handgrade { + my ($r,$tograde,$rowColor1,$rowColor2,$ungraded) = @_; + my $rowColor; + my %lt = &Apache::lonlocal::texthash( + 'prna' => 'Problem Name', + 'nmun' => 'Number ungraded', + 'nopr' => 'No problems require handgrading', + ); + if (@{$tograde} > 0) { + $r->print(''); + my $rowNum = 0; + foreach my $res (@{$tograde}) { + if ($rowNum %2 == 1) { + $rowColor = $rowColor1; + } else { + $rowColor = $rowColor2; + } + my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); + my $linkurl=&Apache::lonnet::clutter($url); + $linkurl .= '?symb='.&Apache::lonnet::escape($res); + + $r->print(''); + $rowNum ++; + } + } else { + $r->print(''); + } +} + +sub display_haserrors { + my ($r,$bombs,$rowColor1,$rowColor2,$bombed,$res_title) = @_; + my $bombnum = 0; + my $rowColor; + my %lt = &Apache::lonlocal::texthash( + reso => 'Resource', + nmer => 'Number of errors', + noer => 'No problems with errors', + ); + if (@{$bombs} > 0) { + $r->print(''); + @{$bombs} = sort { &cmp_title($a,$b,$res_title) } @{$bombs}; + foreach my $bomb (@{$bombs}) { + if ($bombnum %2 == 1) { + $rowColor = $rowColor1; + } else { + $rowColor = $rowColor2; + } + $r->print(''); + $bombnum ++; + } + } else { + $r->print(''); + } + return; +} + +sub display_abovethreshold { + my ($r,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_; + my %lt = &Apache::lonlocal::texthash( + reso => 'Resource', + part => 'Part', + nust => 'Num. students', + avat => 'Av. Attempts', + dedi => 'Deg. Diff', + lare => 'Last Reset', + reco => 'Reset Count?', + rese => 'Reset counters to 0', + nopr => 'No problems satisfy threshold criteria', + ); + my $rowColor; + my $warningnum = 0; + if (@{$warnings} > 0) { + @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings}; + $r->print(''. + ' '."\n"); + $r->print(''); + foreach my $res (@{$warnings}) { + if ($warningnum %2 == 1) { + $rowColor = $rowColor1; + } else { + $rowColor = $rowColor2; + } + my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); + my $linkurl=&Apache::lonnet::clutter($url); + my $rowspan; + if ($$triggered{$res}{numparts} > 1) { + $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"'; + } + $linkurl .= '?symb='.&Apache::lonnet::escape($res); + $r->print(''.$$triggered{$res}{text}); + $warningnum ++; + } + $r->print(''); + } +} + +sub display_versionchanges { + my ($r,$changed,$res_title,$rowColor1,$rowColor2,$interval) = @_; + my %lt = &Apache::lonlocal::texthash( + 'reso' => 'Resource', + 'revd' => 'Last revised', + 'newv' => 'New version', + 'veru' => 'Version used', + 'noup' => 'No updated versions', + ); + my $rowColor; + if (keys(%{$changed}) > 0) { + $r->print(''); + + + my @changes = sort { &cmp_title($a,$b,$res_title) } keys(%{$changed}); + my $changenum = 0; + foreach my $item (@changes) { + if ($changenum %2 == 1) { + $rowColor = $rowColor1; + } else { + $rowColor = $rowColor2; + } + my ($map,$id,$url)=&Apache::lonnet::decode_symb($item); + my $linkurl=&Apache::lonnet::clutter($url); + $linkurl .= '?symb='.&Apache::lonnet::escape($item); + + $r->print(''); + $changenum ++; + } + } else { + $r->print(''); + } + return; +} + +sub display_coursediscussion { + my ($r,$newdiscussions,$unread,$res_title,$rowColor1,$rowColor2) = @_; + my %lt = &Apache::lonlocal::texthash( + 'loca' => 'Location', + 'type' => 'Type', + 'numn' => 'Number of new posts', + 'noun' => 'No unread posts in course discussions', + ); + my $rowColor; + if (@{$newdiscussions} > 0) { + $r->print(''); + @{$newdiscussions} = sort { &cmp_title($a,$b,$res_title) } + @{$newdiscussions}; + my $rowNum = 0; + foreach my $ressymb (@{$newdiscussions}) { + my $forum_title = $$unread{$ressymb}{'title'}; + my $type = 'Resource'; + my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb); + if ($feedurl =~ /bulletinboard/) { + $type = 'Bulletin Board'; + } + my $unreadnum = keys(%{$$unread{$ressymb}}); + $unreadnum = $unreadnum - 2; + if ($unreadnum > 0) { + if ($rowNum %2 == 1) { + $rowColor = $rowColor1; + } else { + $rowColor = $rowColor2; + } + $r->print(''); + $rowNum ++; + } + } + } else { + $r->print(''); + } +} + +sub display_coursenormalmail { + my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_; + my $rowColor; + if ($msgcount > 0) { + $r->print(''); + my $rowNum = 0; + my $mailcount = 1; + foreach my $msg (@{$newmsgs}) { + if ($rowNum %2 == 1) { + $rowColor = $rowColor1; + } else { + $rowColor = $rowColor2; + } + $r->print(''); + $rowNum ++; + $mailcount ++; + } + } else { + $r->print(''); + } +} + +sub display_coursecritmail { + my ($r,$critmsgcount,$critmsgs,$rowColor1,$rowColor2) = @_; + my $rowColor; + if ($critmsgcount > 0) { + $r->print(''); + my $rowNum = 0; + my $mailcount = 1; + foreach my $msg (@{$critmsgs}) { + if ($rowNum %2 == 1) { + $rowColor = $rowColor1; + } else { + $rowColor = $rowColor2; + } + $r->print(''); + $rowNum ++; + $mailcount ++; + } + } else { + $r->print(''); + } } sub cmp_title { - my ($atitle,$btitle) = (lc($_[0]->compTitle),lc($_[1]->compTitle)); + my ($a,$b,$res_title) = @_; + my ($atitle,$btitle) = (lc($$res_title{$a}),lc($$res_title{$b})); $atitle=~s/^\s*//; $btitle=~s/^\s*//; return $atitle cmp $btitle; } +sub get_display_settings { + my $udom = $env{'user.domain'}; + my $uname = $env{'user.name'}; + my $cid = $env{'request.course.id'}; + my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid); + my ($tmp) = keys(%settings); + if ($tmp=~/^error:/) { + %settings = (); + unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') { + &logthis('Error retrieving whatsnew settings: '.$tmp.' for '. + $uname.':'.$udom.' for course: '.$cid); + } + } + return %settings; +} + +sub start_box { + my ($r,$tabbg,$show,$heading,$caller) = @_; + my %lt = &Apache::lonlocal::texthash( + chth => 'Change thresholds?', + chin => 'Change interval?', + ); + my $showhide; + if ($$show{$caller}) { + $showhide = 'Hide'; + + } else { + $showhide = 'Show'; + } + + $r->print(' +
+ + +
+ + +
+ + + + + + '); + my $rowNum =0; + foreach my $type (@thresholditems) { + my $parameter = 'internal.threshold_'.$type; +# onchange is javascript to automatically check the 'Set' button. + my $onchange = 'onFocus="javascript:window.document.forms'. + "['thresholdform'].elements['".$parameter."_setparmval']". + '.checked=true;"'; + if ($rowNum %2 == 1) { + $rowColor = $rowColor1; + } else { + $rowColor = $rowColor2; + } + $r->print(' + + + + + '); + $rowNum ++; + } + $r->print('
Threshold NameCurrent valueChange?
'.$threshold_titles{$type}.''.&Apache::lonhtmlcommon::textbox($parameter.'_value', + $threshold{$type}, + 10,$onchange).'' + .&Apache::lonhtmlcommon::checkbox($parameter.'_setparmval'). + '
+
+ + '); +} + +sub display_launcher { + my ($r,$action,$checkallowed,$tabbg,$rowColor1,$rowColor2,$show, + $headings,$res_title,$tograde,$ungraded,$bombs,$bombed,$changed, + $warnings,$triggered,$newdiscussions,$unread,$msgcount,$newmsgs, + $critmsgcount,$critmsgs,$interval) = @_; + + if ($$checkallowed{$action}) { + &start_box($r,$tabbg,$show,$headings,$action); + if ($$show{$action}) { + if ($action eq 'handgrading') { # UNGRADED ITEMS + &display_handgrade($r,$tograde,$rowColor1,$rowColor2, + $ungraded); + } elsif ($action eq 'haserrors') { # BOMBS + &display_haserrors($r,$bombs,$rowColor1,$rowColor2,$bombed, + $res_title); + } elsif ($action eq 'versionchanges') { # VERSION CHANGES + &display_versionchanges($r,$changed,$res_title,$rowColor1, + $rowColor2,$interval); + + } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS + &display_abovethreshold($r,$warnings,$triggered,$res_title, + $rowColor1,$rowColor2); + } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION + &display_coursediscussion($r,$newdiscussions,$unread, + $res_title); + } elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES + &display_coursenormalmail($r,$msgcount,$newmsgs,$rowColor1, + $rowColor2); + } elsif ($action eq 'coursecritmail') { # CRITICAL MESSAGES + &display_coursecritmail($r,$critmsgcount,$critmsgs,$rowColor1, + $rowColor2); + } + } + &end_box($r); + } + return; } sub getitems { - my ($unread,$ungraded,$bombed,$triggered,$newdiscussions,$tograde,$bombs,$warnings,$rowColor1,$rowColor2) = @_; + my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions, + $tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs, + $res_title,$show,$starttime) = @_; my $navmap = Apache::lonnavmaps::navmap->new(); - my @allres=$navmap->retrieveResources(); - my %discussiontime = &Apache::lonnet::dump('discussiontimes', - $env{'course.'.$env{'request.course.id'}.'.domain'}, - $env{'course.'.$env{'request.course.id'}.'.num'}); - my %lastread = &Apache::lonnet::dump('nohist_'.$env{'request.course.id'}.'_discuss',$env{'user.domain'},$env{'user.name'},'lastread'); - my %lastreadtime = (); - my @discussions = (); - my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist(); - - my %resourcetracker = &Apache::lonnet::dump('nohist_resourcetracker', - $env{'course.'.$env{'request.course.id'}.'.domain'}, - $env{'course.'.$env{'request.course.id'}.'.num'}); + # force retrieve Resource to seed the part id cache we'll need it later + my @allres=$navmap->retrieveResources(undef,sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;}); + my %lastreadtime; + my %resourcetracker; + +# Resource version changes + if ($$show{'versionchanges'}) { + &checkversions($cdom,$crs,$navmap,$changed,$starttime); + } - my $diffcheck = 0; - my $triescheck = 0; - my $warningnum = 0; - foreach my $key (keys(%lastread)) { - my $newkey = $key; - $newkey =~ s/_lastread$//; - $lastreadtime{$newkey} = $lastread{$key}; + if ($$show{'coursediscussions'}) { + my %lastread = &Apache::lonnet::dump('nohist_'. + $env{'request.course.id'}.'_discuss', + $env{'user.domain'},$env{'user.name'},'lastread'); + foreach my $key (keys(%lastread)) { + my $newkey = $key; + $newkey =~ s/_lastread$//; + $lastreadtime{$newkey} = $lastread{$key}; + } + } + + if ($$show{'abovethreshold'}) { + %resourcetracker = &Apache::lonnet::dump('nohist_resourcetracker', + $cdom,$crs); } + + my $warningnum = 0; foreach my $resource (@allres) { my $result = ''; my $applies = 0; @@ -456,139 +458,268 @@ sub getitems { %{$$triggered{$symb}} = (); $$triggered{$symb}{numparts} = 0; my $title = $resource->compTitle(); + $$res_title{$symb} = $title; my $ressymb = $resource->wrap_symb(); + # Check for unread discussion postings - if (defined($discussiontime{$ressymb})) { - push(@discussions,$ressymb); - my $prevread = 0; - my $unreadcount = 0; - %{$$unread{$ressymb}} = (); - $$unread{$ressymb}{'title'} = $title; - $$unread{$ressymb}{'symb'} = $symb; - if (defined($lastreadtime{$ressymb})) { - $prevread = $lastreadtime{$ressymb}; - } - my %contrib = &Apache::lonnet::restore($ressymb,$env{'request.course.id'}, - $env{'course.'.$env{'request.course.id'}.'.domain'}, - $env{'course.'.$env{'request.course.id'}.'.num'}); - if ($contrib{'version'}) { - for (my $id=1;$id<=$contrib{'version'};$id++) { - unless (($contrib{'hidden'}=~/\.$id\./) || ($contrib{'deleted'}=~/\.$id\./)) { - if ($prevread <$contrib{$id.':timestamp'}) { - $$unread{$ressymb}{$unreadcount} = $id.': '.$contrib{$id.':subject'}; - $unreadcount ++; - } - } - } - } - if ($unreadcount) { push(@{$newdiscussions}, $ressymb); } - } + if ($$show{'coursediscussion'}) { + &check_discussions($cdom,$crs,$resource,$symb,$ressymb,$title, + $newdiscussions,$unread,\%lastreadtime); + } # Check for ungraded problems if ($resource->is_problem()) { - my $ctr = 0; - my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); - my ($partlist,$handgrade,$responseType) = &Apache::grades::response_type($url,$symb); - foreach my $student (keys(%$classlist)) { - my ($uname,$udom) = split(/:/,$student); - my %status=&Apache::grades::student_gradeStatus($url,$symb,$udom,$uname,$partlist); - my $submitted = 0; - my $ungraded = 0; - foreach (keys(%status)) { - $submitted = 1 if ($status{$_} ne 'nothing'); - $ungraded = 1 if ($status{$_} =~ /^ungraded/); - my ($foo,$partid,$foo1) = split(/\./,$_); - if ($status{'resource.'.$partid.'.submitted_by'} ne '') { - $submitted = 0; + if ($$show{'handgrading'}) { + &check_handgraded($resource,$symb,$title,$cdom,$crs,$ungraded, + $tograde); + } + } + +# Check for bombs + if ($$show{'haserrors'}) { + &check_bombed($resource,$symb,$title,$bombs,$bombed); + } + +# Maxtries and degree of difficulty for problem parts, unless handgradeable + if ($$show{'abovethreshold'}) { + &check_thresholds($resource,$symb,\%resourcetracker,$triggered, + $threshold,$warnings,$warningnum,$rowColor1,$rowColor2); + } + + } +} + +sub check_discussions { + my ($cdom,$crs,$resource,$symb,$ressymb,$title,$newdiscussions,$unread, + $lastreadtime) = @_; +# Check for unread discussion postings + if ($resource->hasDiscussion()) { + my $prevread = 0; + my $unreadcount = 0; + %{$$unread{$ressymb}} = (); + $$unread{$ressymb}{'title'} = $title; + $$unread{$ressymb}{'symb'} = $symb; + if (defined($$lastreadtime{$ressymb})) { + $prevread = $$lastreadtime{$ressymb}; + } + my %contrib = &Apache::lonnet::restore($ressymb, + $env{'request.course.id'},$cdom,$crs); + if ($contrib{'version'}) { + for (my $id=1;$id<=$contrib{'version'};$id++) { + unless (($contrib{'hidden'}=~/\.$id\./) || + ($contrib{'deleted'}=~/\.$id\./)) { + if ($prevread <$contrib{$id.':timestamp'}) { + $$unread{$ressymb}{$unreadcount} = $id.': '.$contrib{$id.':subject'}; + $unreadcount ++; } } - next if (!$submitted || !$ungraded); - $ctr ++; } - if ($ctr) { - $$ungraded{$symb}{count} = $ctr; + } + if ($unreadcount) { push(@{$newdiscussions}, $ressymb); } + } +} + +sub check_handgraded { + my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_; + if ($resource->is_problem()) { + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); + my $partlist=$resource->parts(); + my $handgradeable; + foreach my $part (@$partlist) { + if ($resource->handgrade($part) eq 'yes') { + $handgradeable=1; last; + } + } + if ($handgradeable) { + my @ungraded = &Apache::bridgetask::get_queue_symb_status( + 'gradingqueue',$symb,$cdom,$cnum); + if (@ungraded > 0) { + $$ungraded{$symb}{count} = scalar(@ungraded); $$ungraded{$symb}{title} = $title; push(@{$tograde}, $symb); } } + } +} -# Check for bombs - if ($resource->getErrors()) { - my $errors = $resource->getErrors(); - my @bombs = split(/,/, $errors); - my $errorcount = scalar(@bombs); - my $errorlink = ''; - $$bombed{$symb}{errorcount} = $errorcount; - $$bombed{$symb}{errorlink} = $errorlink; - push(@{$bombs}, $symb); - } -# Compile maxtries and degree of difficulty for problem parts - my @parts = @{$resource->parts()}; - my %stats; - my $warning = 0; - my $rowColor; - foreach my $part (@parts) { - %{$stats{$part}} = (); - my ($attempts,$users,$corrects,$degdiff,$av_attempts); - if (exists($resourcetracker{$symb."\0".$part."\0attempts"})) { - $attempts = $resourcetracker{$symb."\0".$part."\0attempts"}; - } - if (exists($resourcetracker{$symb."\0".$part."\0users"})) { - $users = $resourcetracker{$symb."\0".$part."\0users"}; - } - if (exists($resourcetracker{$symb."\0".$part."\0correct"})) { - $corrects = $resourcetracker{$symb."\0".$part."\0correct"}; - } - if ($attempts > 0) { - $degdiff = 1 - ($corrects/$attempts); - $degdiff = sprintf("%.2f",$degdiff); - } - if ($users > 0) { - $av_attempts = $attempts/$users; - } - if (($degdiff ne '' && $degdiff >= $diffcheck) || ($av_attempts ne '' && $av_attempts >= $triescheck)) { - $stats{$part}{degdiff} = $degdiff; - $stats{$part}{attempts} = $av_attempts; - $stats{$part}{users} = $users; - $warning = 1; - } +sub check_bombed { + my ($resource,$symb,$title,$bombs,$bombed) = @_; + if ($resource->getErrors()) { + my $errors = $resource->getErrors(); + $errors =~ s/^,//; + my @bombs = split(/,/, $errors); + my $errorcount = scalar(@bombs); + my $errorlink = ''. + $title.''; + $$bombed{$symb}{errorcount} = $errorcount; + $$bombed{$symb}{errorlink} = $errorlink; + push(@{$bombs}, $symb); + } +} + +sub check_thresholds { + my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings, + $warningnum,$rowColor1,$rowColor2) = @_; +# Compile maxtries and degree of difficulty for problem parts, unless handgradeable + my @parts = @{$resource->parts()}; + my %stats; + my %lastreset = (); + my $warning = 0; + my $rowColor; + foreach my $part (@parts) { + if ($resource->handgrade($part) eq 'yes') { + next; } - if ($warning) { - if ($warningnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; + %{$stats{$part}} = (); + my ($attempts,$users,$corrects,$degdiff,$av_attempts); + if (exists($$resourcetracker{$symb."\0".$part."\0attempts"})) { + $attempts = $$resourcetracker{$symb."\0".$part."\0attempts"}; + } + if (exists($$resourcetracker{$symb."\0".$part."\0users"})) { + $users = $$resourcetracker{$symb."\0".$part."\0users"}; + } + if (exists($$resourcetracker{$symb."\0".$part."\0correct"})) { + $corrects = $$resourcetracker{$symb."\0".$part."\0correct"}; + } + if ($attempts > 0) { + $degdiff = 1 - ($corrects/$attempts); + $degdiff = sprintf("%.2f",$degdiff); + } + if ($users > 0) { + $av_attempts = $attempts/$users; + $av_attempts = sprintf("%.2f",$av_attempts); + } + 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; + $stats{$part}{users} = $users; + $lastreset{$part} = $$resourcetracker{$symb."\0".$part."\0resettime"}; + if ($lastreset{$part}) { + $lastreset{$part} = &Apache::lonnavmaps::timeToHumanString($lastreset{$part}); } - $$triggered{$symb}{title} = $resource->title; - foreach my $part (@parts) { - if (exists($stats{$part}{users})) { - if ($$triggered{$symb}{numparts}) { - $$triggered{$symb}{text} .= '
part - '.$part.'single part
part - '.$part.''.$stats{$part}{users}.''.$stats{$part}{attempts}.''.$stats{$part}{degdiff}.'
single part'.$stats{$part}{users}.''.$stats{$part}{attempts}.''.$stats{$part}{degdiff}.''.$lastreset{$part}.'
'.$lt{'prna'}.''.$lt{'nmun'}.'
'.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'

  '.$lt{'nopr'}.'  

'.$lt{'reso'}.''.$lt{'nmer'}.'
'.$$bombed{$bomb}{errorlink}.''.$$bombed{$bomb}{errorcount}.'

'.$lt{'noer'}.'

'.$lt{'reso'}.''.$lt{'part'}.''.$lt{'nust'}.''.$lt{'avat'}.''.$lt{'dedi'}.''.$lt{'lare'}.''.$lt{'reco'}.'
'.$$triggered{$res}{title}.'

'); + } else { + $r->print('

'.$lt{'nopr'}.'

'.$lt{'reso'}.''.$lt{'revd'}.''.$lt{'newv'}.''.$lt{'veru'}.'
'.$$res_title{$item}.''.$$changed{$item}{'revdate'}.''.$$changed{$item}{'current'}.''.$$changed{$item}{'version'}.'

'.$lt{'noup'}.' '.$interval.'

'.$lt{'loca'}. + ''.$lt{'type'}. + ''.$lt{'numn'}. + '
'.$forum_title.' '.$type.''.$unreadnum.' 

 '. + $lt{'noun'}.'

'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'
'.$mailcount.'.  '.$msg->{'shortsub'}.'    '.$msg->{'from'}.'@'.$msg->{'fromdom'}.' '.$msg->{'sendtime'}.'

'.&mt('No new course messages').'

'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'
'.$mailcount.'.  '.$msg->{'shortsub'}.'    '.$msg->{'from'}.'@'.$msg->{'fromdom'}.' '.$msg->{'sendtime'}.'

'.&mt('No unread critical messages in course').'

+ + + +
+ + + + '); + if (($caller eq 'abovethreshold') && ($$show{$caller})) { + $r->print(' + + + '); + } elsif (($caller eq 'versionchanges') && ($$show{$caller})) { + $r->print(' + + + '); + } + $r->print(' + + + +
+ + + + + +
'.$$heading{$caller}.''.$showhide.'
+
'.$lt{'chth'}.'
'.$lt{'chin'}.'
+ +'); + return; +} + +sub end_box { + my ($r) = shift; + $r->print(' +
+
+

'); + return; +} + 1;