--- loncom/interface/lonwhatsnew.pm 2005/12/15 13:38:58 1.38 +++ loncom/interface/lonwhatsnew.pm 2010/02/28 22:38:11 1.101 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.38 2005/12/15 13:38:58 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.101 2010/02/28 22:38:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,9 +36,13 @@ use Apache::lonlocal; use Apache::loncoursedata(); use Apache::lonnavmaps(); use Apache::lonuserstate; +use Apache::lonuserutils; use Apache::Constants qw(:common :http); use Time::Local; use GDBM_File; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; +use HTML::Entities; #---------------------------- # handler @@ -52,51 +56,99 @@ sub handler { $r->send_http_header; return OK; } - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['command']); + &Apache::loncommon::get_unprocessed_cgi( + $ENV{'QUERY_STRING'},['command','refpage']); my $command = $env{'form.command'}; + my $refpage = $env{'form.refpage'}; - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - 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"; + my %checkallowed = ( coursenormalmail => 1, + coursecritmail => 1, ); + foreach my $perm_check (['whn','whatsnew',1], + ['pch','coursediscussion',1], + ['mgr','handgrading',1], + ['vgr','abovethreshold',1], + ['opa','haserrors',1], + ['mdc','versionchanges',0], + ['vcl','newroles',1], + ['vcl','oldroles',1], + ) { + my ($perm,$key,$check_section) = @{ $perm_check }; + my $scope = $env{'request.course.id'}; + if (!($checkallowed{$key} = &Apache::lonnet::allowed($perm,$scope))) { + $scope .= '/'.$env{'request.course.sec'}; + if ( $check_section ) { + $checkallowed{$key} = &Apache::lonnet::allowed($perm,$scope); + } + if ($checkallowed{$key}) { + $checkallowed{$key.'_section'} = $env{'request.course.sec'}; + } + } + } + + if ( ! $env{'request.course.fn'} || ! $checkallowed{'whatsnew'}) { + # Not in a course, or no whn priv in course + $env{'user.error.msg'}="/adm/whatsnew::whn:0:0:Cannot display what's new page"; return HTTP_NOT_ACCEPTABLE; } - 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, - ); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; $r->print(&display_header($command,\%checkallowed)); &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew', - text=>"Display Action Items"}); - if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { + text=>"What's New?"}); + if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=chgthreshold', + ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage, text=>"Change thresholds"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Course Action Items','Course_Action_Items_Thresholds')); - } elsif (($command eq 'chginterval') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { + ("What's New?",#'Course_Action_Items_Thresholds' + )); + } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage, + text=>"Change interval"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + ("What's New?",#'Course_Action_Items_Intervals' + )); + } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=chginterval', + ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage, + text=>"Change discussion display"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + ("What's New?",#'Course_Action_Items_Intervals' + )); + } elsif ($command eq 'courseinit') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage, + text=>"Course initialization preference"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + ("What's New?",#'Course_Action_Items_Initialization' + )); + } elsif ($command eq 'chgoldroleinterval' && $checkallowed{'oldroles'}) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/whatsnew?command=chgoldroleinterval&refpage='.$refpage, text=>"Change interval"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Course Action Items','Course_Action_Items_Intervals')); + ("What's New?",#'Course_Action_Items_Intervals' + )); + } elsif ($command eq 'chgnewroleinterval' && $checkallowed{'newroles'}) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/whatsnew?command=chgnewroleinterval&refpage='.$refpage, + text=>"Change interval"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + ("What's New?",#'Course_Action_Items_Intervals' + )); } else { $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Course Action Items','Course_Action_Items_Display')); + ("What's New?",#'Course_Action_Items_Display' + )); } - &display_main_box($r,$command,\%checkallowed); + &display_main_box($r,$command,$refpage,\%checkallowed); return OK; } @@ -107,44 +159,77 @@ sub handler { #------------------------------ sub display_main_box { - my ($r,$command,$checkallowed) = @_; + my ($r,$command,$refpage,$checkallowed) = @_; my $domain=&Apache::loncommon::determinedomain(); - my $tabbg=&Apache::loncommon::designparm('coordinator.tabbg',$domain); + my $function = &Apache::loncommon::get_users_function(); + my $lctype = lc(&Apache::loncommon::course_type()); $r->print('
'); - my %threshold_titles = ( + my %threshold_titles = &Apache::lonlocal::texthash ( av_attempts => 'Average number of attempts', degdiff => 'Degree of difficulty', numstudents => 'Total number of students with submissions', ); - + my %versions = ( + -1 => "version changes since start of $lctype", + 2592000 => 'version changes since last month', + 604800 => 'version changes since last week', + 86400 => 'version changes since yesterday', + ); + my %newroles = ( + -1 => "roles which have become active since start of $lctype", + 2592000 => 'roles which have become active since last month', + 604800 => 'roles which have become active since last week', + 86400 => 'roles which have become active since yesterday', + ); + my %oldroles = ( + -1 => "roles which expired since start of $lctype", + 2592000 => 'roles which expired since last month', + 604800 => 'roles which expired since last week', + 86400 => 'roles which expired since yesterday', + ); my %interval_titles = ( - -1 => 'since start of course', - 2592000 => 'since last month', - 604800 => 'since last week', - 86400 => 'since yesterday', + versions => \%versions, + newroles => \%newroles, + oldroles => \%oldroles, ); - + my %initpage = &Apache::lonlocal::texthash ( + firstres => "first resource in the $lctype", + whatsnew => "What's New Page", + 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') && - (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { - &display_threshold_config($r,$command,$tabbg,\%threshold_titles, + if (($command eq 'chgthreshold') + && $checkallowed->{'abovethreshold'}) { + &display_threshold_config($r,$refpage,\%threshold_titles, $cdom,$crs); - } elsif (($command eq 'chginterval') && - (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) { - &display_interval_config($r,\%interval_titles); + } elsif (($command eq 'chginterval') + && $checkallowed->{'versionchanges'}) { + &display_interval_config($r,$refpage,\%interval_titles,'versions'); + } elsif (($command eq 'chgdisc') + && $checkallowed->{'coursediscussion'}) { + &display_discussion_config($r,$refpage); + } elsif ($command eq 'courseinit') { + &courseinit_config($r,$refpage,\%initpage); + } elsif (($command eq 'chgnewroleinterval') + && $checkallowed->{'newroles'}) { + &display_interval_config($r,$refpage,\%interval_titles,'newroles'); + } elsif (($command eq 'chgoldroleinterval') + && $checkallowed->{'oldroles'}) { + &display_interval_config($r,$refpage,\%interval_titles,'oldroles'); } else { - &display_actions_box($r,$command,\%threshold_titles,\%interval_titles, - $cdom,$crs,$checkallowed); + &display_actions_box($r,$command,$refpage,\%threshold_titles, + \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); } + my $end_page = &Apache::loncommon::end_page(); $r->print(<

- - +$end_page END_OF_BLOCK } @@ -155,37 +240,36 @@ END_OF_BLOCK # up the HTML #------------------------------- -sub display_header{ +sub display_header { my ($command,$checkallowed) = @_; - my $html=&Apache::lonxml::xmlbegin(); - my $bodytag=&Apache::loncommon::bodytag('Course Action Items'); + my $scripttag; - unless ($command eq 'chgthreshold' || $command eq 'chginterval') { + unless ($command eq 'chgthreshold' || $command eq 'chginterval' || + $command eq 'chgoldroleinterval' || $command eq 'chgnewroleinterval') { $scripttag = <<"END"; '; } - return(< -Course Action Items -$scripttag - -$bodytag -ENDHEAD + my $course_type=&Apache::loncommon::course_type(); + return &Apache::loncommon::start_page("What's New?", + $scripttag); } #------------------------------- @@ -195,22 +279,21 @@ ENDHEAD # #------------------------------- -sub display_actions_box() { - my ($r,$command,$threshold_titles,$interval_titles,$cdom,$crs, - $checkallowed) = @_; - my $rowColor1 = "#ffffff"; - my $rowColor2 = "#eeeeee"; - +sub display_actions_box { + my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage, + $cdom,$crs,$checkallowed) = @_; my $udom = $env{'user.domain'}; my $uname = $env{'user.name'}; my $cid = $env{'request.course.id'}; - + my $crstype = &Apache::loncommon::course_type(); + my $lctype = lc($crstype); + my %stulabel = ( + 'Course' => 'students', + 'Community' => 'members', + ); my %lt = &Apache::lonlocal::texthash( - 'yacc' => 'You are accessing an invalid course.', + 'yacc' => 'You are accessing an invalid course', 'gtfr' => 'Go to first resource', - 'chyp' => 'Change your preferences', - 'tsup' => 'to suppress display of this screen when accessing'. - ' this course in the future.', 'hial' => 'Hide all', 'shal' => 'Show all', ); @@ -228,98 +311,173 @@ sub display_actions_box() { my @warnings = (); my $msgcount = 0; my $critmsgcount = 0; - + my $expirecount; + my %expired; + my $activecount; + my %activated; my %res_title = (); my %show = (); my $needitems = 0; my $boxcount = 0; - my $domain=&Apache::loncommon::determinedomain(); - my $function; - if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { - $function='coordinator'; - } - if ($env{'request.role'}=~/^(su|dc|ad|li)/) { - $function='admin'; + my $result; + if ($command eq 'newcourseinit') { + $result = &store_courseinit_setting($uname,$udom,$cid,$initpage); } - my %threshold = ( - av_attempts => 2, - degdiff => 0.5, - numstudents => 2, - ); + my %threshold = (); + my %pagedesc = &Apache::lonlocal::texthash ( + firstres => 'First resource', + whatsnew => "What's New Page", + userpref => 'user preference', + coursespecific => $lctype.' only', + default => 'default', + ); - my $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain); - my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); + my ($initcontrol,$initdisp) = &curr_courseinit(); + my $currinit = $pagedesc{$initdisp}.' ('.$pagedesc{$initcontrol}.')'; unless ($cid) { - $r->print('
'.$lt{'yacc'}.'


'); + $r->print('

'.$lt{'yacc'}.'

'); return; } - if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db', + my $header = ''; + if ($refpage eq 'start') { + if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db', &GDBM_READER(),0640)) { - my $furl=$bighash{'first_url'}; - $r->print(''.$lt{'gtfr'}. - ''. - '
'.$lt{'chyp'}.'
'.$lt{'tsup'}.'

'); - untie(%bighash); - } - - my $result; - + my $furl=&HTML::Entities::encode($bighash{'first_url'},'"<>&'); + untie(%bighash); + $header .= ''.$lt{'gtfr'}. + '
'; + } + } + $header .= &mt('Page set to be displayed after you have selected a role in this '.$lctype).'.' + .' ' + .&mt('Currently: [_1].',''.$currinit.'') + .'  ' + .&mt('[_1]Change[_2] for just [_3]this '.$lctype.'[_4] or for [_5]all your courses/communities[_6].' + ,'' + ,'' + ,'' + ,'' + ,'' + ,'') + .' '; + + $r->print(&Apache::loncommon::head_subbox($header)); + if ($command eq 'reset') { $result = &process_reset($cdom,$crs); } elsif ($command eq 'update') { - $result = &process_update($cdom,$crs,$threshold_titles); + $result = &process_update($uname,$udom,$threshold_titles); } elsif ($command eq 'newinterval') { $result = &store_interval_setting($uname,$udom,$cid,$interval_titles); + } elsif ($command eq 'newdiscconf') { + $result = &store_discussion_setting($uname,$udom,$cid); } my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed); unless ($store_result eq 'ok') { - &Apache::lonnet::logthis('Error storing whatsnew settings: '. - $store_result.' for '.'user '.$uname.':'.$udom.' in course '.$cid); - $result .= &mt('Unable to store visibility settings due to [_1]', - $store_result); + &Apache::lonnet::logthis('Error saving whatsnew settings: '. + $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid); + $result .= '' + .&mt('Unable to save visibility settings due to [_1]', + $store_result) + .''; } if ($result) { - $r->print($result.'
'); + $r->print($result.'
'); } $r->rflush(); - + my (%timediff,%interval); my %display_settings = &get_display_settings($uname,$udom,$cid); - my $timediff = $display_settings{$cid.':interval'}; - unless (defined($timediff)) { $timediff = 604800; } - my $now = time; - my $interval = $$interval_titles{$timediff}; - if ($timediff == -1) { - $timediff = time; - } - my $starttime = $now - $timediff; - my $countunread = 1; + $timediff{'versions'} = $display_settings{$cid.':interval'}; + unless (defined($timediff{'versions'})) { $timediff{'versions'} = 604800; } + $interval{'versions'} = $interval_titles->{'versions'}->{$timediff{'versions'}}; 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 messages', - coursecritmail => 'New critical messages in course', + coursediscussion => 'Unread '.$lctype.' discussion posts', + handgrading => 'Problems requiring handgrading', + haserrors => 'Problems with errors', + coursenormalmail => 'New '.$lctype.' messages', + coursecritmail => 'New critical messages in '.$lctype, ); + if ($timediff{'versions'} == -1) { + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since start of '.$lctype); + } elsif ($timediff{'versions'} == 2592000) { + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since last month'); + } elsif ($timediff{'versions'} == 604800) { + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since last week'); + } elsif ($timediff{'versions'} == 86400) { + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since yesterday'); + } + + $timediff{'oldroles'} = $display_settings{$cid.':oldroleinterval'}; + unless (defined($timediff{'oldroles'})) { $timediff{'oldroles'} = 604800; } + $interval{'oldroles'} = $interval_titles->{'oldroles'}->{$timediff{'oldroles'}}; + + if ($timediff{'oldroles'} == -1) { + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since start of '.$lctype); + } elsif ($timediff{'oldroles'} == 2592000) { + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since last month'); + } elsif ($timediff{'oldroles'} == 604800) { + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since last week'); + } elsif ($timediff{'oldroles'} == 86400) { + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since yesterday'); + } + + $timediff{'newroles'} = $display_settings{$cid.':newroleinterval'}; + unless (defined($timediff{'newroles'})) { $timediff{'newroles'} = 604800; } + $interval{'newroles'} = $interval_titles->{'newroles'}->{$timediff{'newroles'}}; + + if ($timediff{'newroles'} == -1) { + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since start of '.$lctype); + } elsif ($timediff{'newroles'} == 2592000) { + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since last month'); + } elsif ($timediff{'newroles'} == 604800) { + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since last week'); + } elsif ($timediff{'newroles'} == 86400) { + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since yesterday'); + } + + my $now = time; + if ($timediff{'versions'} == -1) { + $timediff{'versions'} = time; + } + my $starttime = $now - $timediff{'versions'}; + + if ($timediff{'newroles'} == -1) { + $timediff{'newroles'} = time; + } + my $activatedstart = $now - $timediff{'newroles'}; + + if ($timediff{'oldroles'} == -1) { + $timediff{'oldroles'} = time; + } + my $expiredstart = $now - $timediff{'oldroles'}; + + my $countunread = $display_settings{$cid.':countunread'}; + unless (defined($countunread)) { + $countunread = 'on'; + } if ($$checkallowed{'abovethreshold'}) { - &get_curr_thresholds(\%threshold,$cdom,$crs); + &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs); } - $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'}; + $headings{'abovethreshold'} = + &mt('(Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2]) [_3] and total number of '.$stulabel{$crstype}.' with submissions ≥ [_4]', + $threshold{'av_attempts'},$threshold{'degdiff'}, + '
',$threshold{'numstudents'}); - my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail'); + my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles'); foreach my $key (keys(%{$checkallowed})) { + if ($key =~ /_section$/) { next; } $show{$key} = 0; if ($$checkallowed{$key}) { unless ($display_settings{$cid.':'.$key} eq 'hide') { @@ -329,7 +487,8 @@ sub display_actions_box() { } foreach my $item (@actionorder) { - unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail') { + unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail' || + $item eq 'newroles' || $item eq 'oldroles') { if ($show{$item}) { $needitems = 1; last; @@ -337,47 +496,59 @@ sub display_actions_box() { } } + my $itemserror; if ($needitems) { - &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%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); } if ($show{'coursenormalmail'}) { - &getnormalmail(\@newmsgs); + $msgcount = &getnormalmail(\@newmsgs); } if ($show{'coursecritmail'}) { - &getcritmail(\@critmsgs); + $critmsgcount = &getcritmail(\@critmsgs); + } + if ($show{'oldroles'}) { + $expirecount = &getexpired(\%expired,$expiredstart,'previous'); + } + if ($show{'newroles'}) { + $activecount = &getactivated(\%activated,$activatedstart,'active'); } - $r->print(qq|$lt{'hial'}   $lt{'shal'}
\n|); foreach my $item (keys(%{$checkallowed})) { + if ($item =~ /_section$/) { next; } if ($$checkallowed{$item}) { $r->print(''."\n"); } } - $r->print('

- -
'); + $r->print('
'); my $displayed = 0; - my $totalboxes = keys(%{$checkallowed}); - my $halfway = int($totalboxes/2) + $totalboxes%2; + my $totalboxes = 0; + foreach my $key (keys(%{$checkallowed})) { + if ($key =~ /_section$/) { next; } + if ($key eq 'whatsnew' ) { next; } # whatsnew check creates no box + if ($$checkallowed{$key}) { + $totalboxes ++; + } + } + my $halfway = 4; +# my $halfway = int($totalboxes/2) + $totalboxes%2; foreach my $actionitem (@actionorder) { if ($$checkallowed{$actionitem}) { if ($displayed == $halfway) { - $r->print(' '); + $r->print(' '); } - &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,$countunread); + &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); $displayed ++; } } $r->print(' -
-
- '); + +'); } #------------------------------- @@ -388,63 +559,50 @@ sub display_actions_box() { #------------------------------- sub display_threshold_config { - my ($r,$command,$tabbg,$threshold_titles,$cdom,$crs) = @_; + my ($r,$refpage,$threshold_titles,$cdom,$crs) = @_; + my $uname = $env{'user.name'}; + my $udom = $env{'user.dom'}; + my $cid = $env{'request.course.id'}; my %threshold = (); my $rowColor1 = "#ffffff"; my $rowColor2 = "#eeeeee"; my $rowColor; my @thresholditems = ("av_attempts","degdiff","numstudents"); - my %threshold_titles = ( + my %threshold_titles = &Apache::lonlocal::texthash( av_attempts => 'Average number of attempts', degdiff => 'Degree of difficulty', numstudents => 'Total number of students with submissions', ); - &get_curr_thresholds(\%threshold,$cdom,$crs); + &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs); - $r->print('
- - - '."\n"; - } + my $resetname = 'reset_'.&escape($symb."\0".$part); + my $resettitle = 'title_'.&escape($symb."\0".$part); if (@parts > 1) { - $$triggered{$symb}{text} .= ' - '; + $$triggered{$symb}{text}[$partcount] = ' + '; } else { - $$triggered{$symb}{text} .= ' - '; + $$triggered{$symb}{text}[$partcount] = ' + '; } - $$triggered{$symb}{text} .= ' - - - - - - '; - $$triggered{$symb}{numparts} ++; + $$triggered{$symb}{text}[$partcount] .= ' + + + + + '; + $partcount ++; } + $$triggered{$symb}{numparts} = $partcount; } 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'}; + my ($threshold,$uname,$udom,$cid,$cdom,$crs) = @_; + # set default values + %$threshold = (av_attempts => 2, + degdiff => 0.5, + numstudents => 2 + ); + my %thresholdsettings = &Apache::lonnet::dump('nohist_whatsnew',$udom, + $uname,$cid.':threshold'); + my $thresholdcount = 0; + my ($tmp) = %thresholdsettings; + unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { + foreach my $item (keys %{$threshold}) { + if (exists($thresholdsettings{$cid.':threshold_'.$item})) { + $$threshold{$item} = + $thresholdsettings{$cid.':threshold_'.$item}; + $thresholdcount ++; + } + } } - if (exists($coursesettings{'internal.threshold_degdiff'})) { - $$threshold{'degdiff'} = $coursesettings{'internal.threshold_degdiff'}; + if ($thresholdcount == 3) { + return; } - if (exists($coursesettings{'internal.threshold_numstudents'})) { - $$threshold{'numstudents'} = $coursesettings{'internal.threshold_numstudents'}; + my %coursesettings = &Apache::lonnet::dump('environment', + $cdom,$crs,'internal.threshold'); + my ($temp) = %coursesettings; + unless ($temp =~ /^(con_lost|error|no_such_host)/i) { + foreach my $item (keys %{$threshold}) { + unless (exists($thresholdsettings{$cid.':threshold_'.$item})) { + if (exists($coursesettings{'internal.threshold_'.$item})) { + $$threshold{$item} = + $coursesettings{'internal.threshold_'.$item}; + } + } + } } + return; } -sub get_curr_interval { - my ($uname,$udom,$cid); - my $interval; - my %settings = &Apache::lonnet::dump('nohist_whatsnew',$uname,$udom,$cid,':interval'); +sub get_current { + my ($uname,$udom,$cid,$caller) = @_; + my $currvalue; + my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid. + ':'.$caller); my ($tmp) = %settings; - if ($tmp =~ /^Error/) { - &logthis(); - } else { - $interval = $settings{$cid.':interval'}; + unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { + $currvalue = $settings{$cid.':'.$caller}; } - return $interval; + return $currvalue; } sub process_reset { my ($dom,$crs) = @_; - my $result = 'Counters reset for following problems (and parts):
'; + my $result = ''.&mt('Counters reset for following problems (and parts):'). + '
'; my @agg_types = ('attempts','users','correct'); - my %agg_titles = ( + my %agg_titles = &Apache::lonlocal::texthash ( attempts => 'Number of submissions', users => 'Students with submissions', correct => 'Number of correct submissions', @@ -815,8 +1105,8 @@ sub process_reset { 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 $title = &unescape($env{'form.title_'.$1}); + my $reset_item = &unescape($1); my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item); my %aggregates = (); my ($symb,$part) = split(/\0/,$reset_item); @@ -842,29 +1132,29 @@ sub process_reset { } sub process_update { - my ($dom,$crs,$threshold_titles) = @_; - my $setoutput = 'Changes to threshold(s) for problem tracking:
'; + 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; my $value = $env{'form.'.$name.'_value'}; - if ($name && defined($value)) { - my $put_result = &Apache::lonnet::put('environment', - {$name=>$value},$dom,$crs); + if ($name && defined($value) && ($value ne '')) { + my $put_result = &Apache::lonnet::put('nohist_whatsnew', + {$name=>$value},$udom,$uname); - my ($shortname) = ($name =~ /^internal\.threshold_(.+)$/); + my ($shortname) = ($name =~ /^\Q$env{'request.course.id'}\E:threshold_(.+)$/); if ($put_result eq 'ok') { - $setoutput.=&mt('Set threshold for [_1] to [_2]', + $setoutput.= &Apache::lonhtmlcommon::confirm_success(&mt('Set threshold for [_1] to [_2]', ''.$$threshold_titles{$shortname}.'', - ''.$value.'').'
'; + ''.$value.'').'
'); } else { - $setoutput.=&mt('Unable to set threshold for [_1] to [_2] due to [_3].', + $setoutput.= &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set threshold for [_1] to [_2] due to [_3].', ''.$name.'',''.$value.'', - ''.$put_result.'').'
'; + ''.$put_result.'').'
',1); } } } - return $setoutput; + return &Apache::loncommon::confirmwrapper($setoutput); } sub getnormalmail { @@ -874,19 +1164,17 @@ sub getnormalmail { my @messages = sort(&Apache::lonnet::getkeys('nohist_email')); foreach my $message (@messages) { - my $msgid=&Apache::lonnet::escape($message); + 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/) { - my $numsendtime = $sendtime; - $sendtime = &Apache::lonlocal::locallocaltime($sendtime); if ($status eq 'new') { - $msgcount ++; + $sendtime = &Apache::lonlocal::locallocaltime($sendtime); + $msgcount ++; if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$newmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -912,13 +1200,11 @@ sub getcritmail { &Apache::lonmsg::unpackmsgid($msgid); if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { if (defined($sendtime) && $sendtime!~/error/) { - my $numsendtime = $sendtime; $sendtime = &Apache::lonlocal::locallocaltime($sendtime); $critmsgcount ++; if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$critmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -932,15 +1218,211 @@ sub getcritmail { return $critmsgcount; } +sub getexpired { + my ($rolechgs,$rolechgtime,$status) = @_; + my $expirecount = &getrolechanges($rolechgs,$rolechgtime,$status); + return $expirecount; +} + +sub getactivated { + 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(); + my $context = 'course'; + my ($permission,$allowed) = + &Apache::lonuserutils::get_permission($context); + my $viewablesec = &Apache::lonuserutils::viewable_section($permission); + my %changes=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum); + my (%stucounted,%advcounted); + my $activatedcount = 0; + if (keys(%changes) > 0) { + foreach my $chg (sort { $b <=> $a } (keys(%changes))) { + if (ref($changes{$chg}) eq 'HASH') { + my $timestamp = $changes{$chg}{'exe_time'}; + if ($timestamp) { + if ($rolechgtime > 0) { + if ($timestamp < $rolechgtime) { + last; + } + } + 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); + 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 { + $advcounted{$uname.':'.$udom.':'.$role.':'.$section} = $start.':'.$end; + } + my %chginfo = ( + 'section' => $section, + 'uname' => $uname, + 'udom' => $udom, + 'role' => $role, + 'status' => $status, + ); + $activatedcount ++; + push (@{$rolechgs->{$timestamp}},\%chginfo); + } + } + } + } + } + $activatedcount += &getrolechanges($rolechgs,$rolechgtime,$status,\%stucounted,\%advcounted); + return $activatedcount; +} + +sub getrolechanges { + my ($rolechgs,$rolechgtime,$status,$stucountref,$advcountref) = @_; + my (%stucounted,%advcounted); + if (ref($stucountref) eq 'HASH') { + %stucounted = %{$stucountref}; + } + if (ref($advcountref) eq 'HASH') { + %advcounted = %{$advcountref}; + } + my $withsec = 1; + my $hidepriv = 1; + my $context = 'course'; + my @statuses = ($status); + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $now = time(); + 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 (($end == 0) || ($end > $start)) { + if ($start <= $now) { + if ($end && $end < $now) { + if ($rolechgtime > 0) { + if ($end > $rolechgtime) { + $userstatus = 'previous'; + } + } 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); + } + } + my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef, + \@statuses,undef,undef,$withsec,$hidepriv); + foreach my $item (keys(%advrolehash)) { + my ($userstatus,$eventtime); + my ($uname,$udom,$role,$section) = split(/:/,$item,-1); + my ($start,$end) = split(/:/,$advrolehash{$item}); + if ($start eq '-1' && $end eq '-1') { + next; + } else { + if ($status eq 'active') { + if (exists($advcounted{$item})) { + next; + } + } + if (($end == 0) || ($end > $start)) { + if ($start <= $now) { + if ($end && $end < $now) { + if ($rolechgtime > 0) { + if ($end > $rolechgtime) { + $userstatus = 'previous'; + } + } 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 '') && ($section ne '')) { + next if ($viewablesec ne $section); + } + my %chginfo = ( + 'section' => $section, + 'uname' => $uname, + 'udom' => $udom, + 'role' => $role, + 'status' => $userstatus, + ); + $rolechgcount ++; + push (@{$rolechgs->{$eventtime}},\%chginfo); + } + return $rolechgcount; +} 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 { + unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { if (keys(%changes) > 0) { foreach my $key (sort(keys(%changes))) { if ($changes{$key} > $starttime) { @@ -977,63 +1459,66 @@ sub checkversions { } sub display_handgrade { - my ($r,$tograde,$rowColor1,$rowColor2,$ungraded) = @_; - my $rowColor; + my ($r,$tograde,$ungraded,$itemserror) = @_; my %lt = &Apache::lonlocal::texthash( 'prna' => 'Problem Name', 'nmun' => 'Number ungraded', 'nopr' => 'No problems require handgrading', ); if (@{$tograde} > 0) { - $r->print(''); + $r->print(''); my $rowNum = 0; foreach my $res (@{$tograde}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } + $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='.&Apache::lonnet::escape($res); - - $r->print(''); - $rowNum ++; + $linkurl .= '?symb='.&escape($res); + if ($$ungraded{$res}{'enclink'}) { + $linkurl = + $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'}; + } + $r->print(''); } + } elsif ($itemserror) { + $r->print(''); } else { - $r->print(''); + $r->print(''); } } sub display_haserrors { - my ($r,$bombs,$rowColor1,$rowColor2,$bombed,$res_title) = @_; + my ($r,$bombs,$bombed,$res_title,$itemserror) = @_; 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(''); + $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 ++; + my $css_class = $bombnum%2?' class="LC_odd_row"':''; + $r->print(''); } + } elsif ($itemserror) { + $r->print(''); } else { - $r->print(''); + $r->print(''); } return; } sub display_abovethreshold { - my ($r,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_; + my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', part => 'Part', @@ -1045,169 +1530,254 @@ sub display_abovethreshold { 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(''); + ' '."\n". + ' '. + "\n"); + $r->print(''. + ''. + ''. + ''. + ''); + my $row; foreach my $res (@{$warnings}) { - if ($warningnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } + $row++; 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 ++; + $linkurl .= '?symb='.&escape($res); + if ($$triggered{$res}{'enclink'}) { + $linkurl = + $$triggered{$res}{'enclink'}.'?symb='.$$triggered{$res}{'encsymb'}; + } + my $css_class = $row%2?' class="LC_odd_row"':''; + $r->print(''. + ''); + if (ref($$triggered{$res}{text}) eq 'ARRAY') { + $r->print($$triggered{$res}{text}[0]); + } + $r->print(''); + if (ref($$triggered{$res}{text}) eq 'ARRAY') { + if (@{$$triggered{$res}{text}} > 1) { + for (my $i=1; $i<@{$$triggered{$res}{text}}; $i++) { + $r->print(''. + $$triggered{$res}{text}[$i].''); + } + } + } } - $r->print(''); + } elsif ($itemserror) { + $r->print(''); } else { - $r->print(''); + $r->print(''); } } sub display_versionchanges { - my ($r,$changed,$res_title,$rowColor1,$rowColor2,$interval) = @_; + my ($r,$changed,$res_title,$interval,$itemserror) = @_; 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(''); - - + $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; - } + $changenum ++; + my $css_class = $changenum%2?' class="LC_odd_row"':''; my ($map,$id,$url)=&Apache::lonnet::decode_symb($item); my $linkurl=&Apache::lonnet::clutter($url); - $linkurl .= '?symb='.&Apache::lonnet::escape($item); + $linkurl .= '?symb='.&escape($item); - $r->print(''); - $changenum ++; + $r->print(''); + } + } elsif ($itemserror) { + $r->print(''); + } else { + $r->print(''); + } + return; +} + +sub display_rolechanges { + my ($r,$chgcount,$changed,$interval,$crstype) = @_; + my $now = time(); + my %lt = &Apache::lonlocal::texthash( + 'user' => 'User', + 'tich' => 'Time of change', + 'role' => 'Role', + 'sec' => 'Section', + 'status' => 'Status', + ); + if ($chgcount) { + $r->print(''. + ''. + ''. + ''. + ''. + ''); + if (ref($changed) eq 'HASH') { + my @changes = sort { $b <=> $a } (keys(%{$changed})); + my $changenum = 0; + foreach my $item (@changes) { + if (ref($changed->{$item}) eq 'ARRAY') { + foreach my $chg (@{$changed->{$item}}) { + if (ref($chg) eq 'HASH') { + my $section; + my $role = + &Apache::lonnet::plaintext($chg->{'role'},$crstype); + my $status = &mt($chg->{'status'}); + if ($chg->{'section'} eq '') { + $section = &mt('none'); + } else { + $section = $chg->{'section'}; + } + my $uname = $chg->{'uname'}; + my $udom = $chg->{'udom'}; + $changenum ++; + my $css_class = $changenum%2?' class="LC_odd_row"':''; + my $link = + &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom); + $r->print(''. + ''. + ''. + ''. + ''. + ''); + } + } + } + } } } else { - $r->print(''); + $r->print(''); } return; } sub display_coursediscussion { - my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1, - $rowColor2) = @_; + my ($r,$newdiscussions,$unread,$countunread,$res_title,$itemserror) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); my %lt = &Apache::lonlocal::texthash( 'loca' => 'Location', 'type' => 'Type', 'numn' => 'Number of new posts', - 'noun' => 'No unread posts in course discussions', + 'noun' => 'No unread posts in '.$lctype.' discussions', 'tmlp' => 'Time of last post', ); - my $rowColor; if (@{$newdiscussions} > 0) { - $r->print(''. - ''); + $r->print(''); + if ($countunread eq 'on') { + $r->print(''. + ''); } else { - $r->print(''); + $r->print(''); } $r->print("\n"); @{$newdiscussions} = sort { &cmp_title($a,$b,$res_title) } @{$newdiscussions}; my $rowNum = 0; foreach my $ressymb (@{$newdiscussions}) { + $rowNum ++; my $forum_title = $$unread{$ressymb}{'title'}; my $type = 'Resource'; my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb); + my $disclink = $feedurl.'?symb='.$$unread{$ressymb}{symb}; if ($feedurl =~ /bulletinboard/) { - $type = 'Bulletin Board'; + $type = 'Discussion Board'; } - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; + if ($$unread{$ressymb}{'enclink'}) { + $disclink = $$unread{$ressymb}{'enclink'}.'?symb='.$$unread{$ressymb}{'encsymb'}; } + my $css_class = $rowNum%2?' class="LC_odd_row"':''; my $lastpost = &Apache::lonnavmaps::timeToHumanString( $$unread{$ressymb}{'lastpost'}); - $r->print(''); - if ($countunread) { + $r->print(''); + if ($countunread eq 'on') { my $unreadnum = $$unread{$ressymb}{'unreadcount'}; - $r->print(''); + $r->print(''); } else { - $r->print(''); + $r->print(''); } $r->print("\n"); - $rowNum ++; } + } elsif ($itemserror) { + $r->print(''); } else { - $r->print(''); + $r->print(''); } } sub display_coursenormalmail { - my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_; - my $rowColor; + my ($r,$msgcount,$newmsgs) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); if ($msgcount > 0) { - $r->print(''); - my $rowNum = 0; - my $mailcount = 1; + $r->print(''); + my $mailcount = 0; foreach my $msg (@{$newmsgs}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(''); - $rowNum ++; $mailcount ++; + my $css_class = $mailcount%2?' class="LC_odd_row"':''; + $r->print(''); } } else { - $r->print(''); + $r->print(''); } } sub display_coursecritmail { - my ($r,$critmsgcount,$critmsgs,$rowColor1,$rowColor2) = @_; - my $rowColor; + my ($r,$critmsgcount,$critmsgs) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); if ($critmsgcount > 0) { - $r->print(''); - my $rowNum = 0; - my $mailcount = 1; + $r->print(''); + my $mailcount = 0; foreach my $msg (@{$critmsgs}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(''); - $rowNum ++; $mailcount ++; + my $css_class = $mailcount%2?' class="LC_odd_row"':''; + $r->print(''); } } else { - $r->print(''); + $r->print(''); } } @@ -1223,11 +1793,12 @@ sub get_display_settings { my ($uname,$udom,$cid) = @_; my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid); my ($tmp) = keys(%settings); - if ($tmp=~/^error:/) { + if ($tmp=~ /^(con_lost|error|no_such_host)/i) { %settings = (); - unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') { - &logthis('Error retrieving whatsnew settings: '.$tmp.' for '. - $uname.':'.$udom.' for course: '.$cid); + unless ($tmp =~ /^error: 2 /) { + my $lctype = lc(&Apache::loncommon::course_type()); + &Apache::lonnet::logthis('Error retrieving whatsnew settings: '. + $tmp.' for '.$uname.':'.$udom.' for '.$lctype.': '.$cid); } } return %settings; @@ -1238,6 +1809,7 @@ sub store_display_settings { my %whatsnew_settings; my $result; foreach my $key (keys(%{$checkallowed})) { + if ($key =~ /_section$/) { next; } if (exists($env{'form.display_'.$key})) { unless ($env{'form.display_'.$key} eq '') { $whatsnew_settings{$cid.':'.$key} = $env{'form.display_'.$key}; @@ -1257,71 +1829,171 @@ sub store_interval_setting { my ($uname,$udom,$cid,$interval_titles) = @_; my %interval_settings = (); my $result; - if (defined($env{'form.interval'})) { - $interval_settings{$cid.':interval'} = $env{'form.interval'}; + my $context = $env{'form.intervaltype'}; + if ($env{'form.interval'} ne '') { + if ($context eq 'oldroles') { + $interval_settings{$cid.':oldroleinterval'} = $env{'form.interval'}; + } elsif ($context eq 'newroles') { + $interval_settings{$cid.':newroleinterval'} = $env{'form.interval'}; + } else { + $interval_settings{$cid.':interval'} = $env{'form.interval'}; + } my $outcome = &Apache::lonnet::put('nohist_whatsnew', \%interval_settings,$udom,$uname); if ($outcome eq 'ok') { - $result = &mt('Interval set to version changes [_1]', - ''.$$interval_titles{$env{'form.interval'}}.'
'); + if (ref($interval_titles->{$context}) eq 'HASH') { + $result = &Apache::lonhtmlcommon::confirm_success(&mt('New filter setting: [_1].',''. + $interval_titles->{$context}->{$env{'form.interval'}}.'').'
'); + } + } else { + my $lctype = lc(&Apache::loncommon::course_type()); + &Apache::lonnet::logthis('Error saving whatsnew '.$context.' interval setting'. + ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set interval to [_1] due to [_2].', + ''.$interval_titles->{$context}->{$env{'form.interval'}}.'', + ''.$outcome.''),1); + } + } + return &Apache::loncommon::confirmwrapper($result); +} +sub store_discussion_setting { + my ($uname,$udom,$cid) = @_; + my %discussion_settings; + my $result; + if (defined($env{'form.countunread'})) { + $discussion_settings{$cid.':countunread'} = $env{'form.countunread'}; + my $outcome = &Apache::lonnet::put('nohist_whatsnew', + \%discussion_settings,$udom,$uname); + if ($outcome eq 'ok') { + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Count unread posts in discussions display set to [_1]', + ''.&mt($env{'form.countunread'}).'').'
'); + + } else { + my $lctype = lc(&Apache::loncommon::course_type()); + &Apache::lonnet::logthis('Error saving whatsnew countunread setting'. + ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set "number unread posts display" to [_1]'. + ' due to [_2].', + ''.&mt($env{'form.countunread'}).'', + ''.$outcome.''),1); + } + } + return &Apache::loncommon::confirmwrapper($result); +} + +sub store_courseinit_setting { + my ($uname,$udom,$cid,$initpage) = @_; + my %courseinit_settings; + my $page_control; + my $result; + if (defined($env{'form.courseinit_control'})) { + if ($env{'form.courseinit_control'} eq 'userpref') { + $courseinit_settings{$cid.':courseinit'} = ''; + $page_control = 'global preferences'; } else { - &Apache::lonnet::logthis('Error storing whatsnew interval setting'. - ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid); - $result = &mt('Unable to set interval to [_1] due to [_2].', - ''.$$interval_titles{$env{'form.interval'}}.'', - ''.$outcome.'.
'); + if (defined($env{'form.courseinit_page'})) { + $courseinit_settings{$cid.':courseinit'} = + $env{'form.courseinit_page'}; + $page_control = 'course specific setting'; + } + } + if ($page_control) { + my $lctype = lc(&Apache::loncommon::course_type()); + my $outcome = &Apache::lonnet::put('nohist_whatsnew', + \%courseinit_settings,$udom,$uname); + if ($outcome eq 'ok') { + if ($page_control eq 'global preferences') { + $result = &Apache::lonhtmlcommon::confirm_success(&mt("Page displayed after role selection in $lctype now set by [_1]user's global preferences[_2].",'','')); + } else { + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Page displayed after role selection in this '.$lctype.' set to [_1].' + ,''.$$initpage{$env{'form.courseinit_page'}}.'')); + } + } else { + &Apache::lonnet::logthis('Error saving whatsnew courseinit '. + 'setting: '.$outcome.' for '.$uname. + ':'.$udom.' in '.$lctype.' '.$cid); + if ($page_control eq 'global preferences') { + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set control of page display to [_1]'. + ' due to [_2].', + ''.$page_control.'', + ''.$outcome.''),1); + } else { + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set page display, after role selection, for this '.$lctype.' to [_1] due to [_2].' + ,''.$$initpage{$env{'form.courseinit_page'}}.'' + ,''.$outcome.''),1); + } + } } } - return $result; + return &Apache::loncommon::confirmwrapper($result); } sub start_box { - my ($r,$tabbg,$show,$heading,$caller) = @_; + my ($r,$show,$heading,$caller,$refpage) = @_; my %lt = &Apache::lonlocal::texthash( chth => 'Change thresholds?', chin => 'Change interval?', + chop => 'Change options?', ); my $showhide; if ($$show{$caller}) { $showhide = 'Hide'; + 'display_'.$caller.",'hide'".');">'. + &mt('Hide').''; } else { $showhide = 'Show'; + 'display_'.$caller.",'show'".');">'. + &mt('Show').''; } $r->print(' -
- - -
- - -
- - - - - - '); - my $rowNum =0; + $r->print('
'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''."\n". + ''."\n". + ''."\n". + &Apache::loncommon::end_data_table_header_row()); foreach my $type (@thresholditems) { - my $parameter = 'internal.threshold_'.$type; + my $parameter = $env{'request.course.id'}.':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(' - - - '."\n". + ' - - '); - $rowNum ++; + 10,$onchange).''."\n". + ''."\n". + &Apache::loncommon::end_data_table_row()); } - $r->print('
Threshold NameCurrent valueChange?
'.&mt('Threshold Name').''.&mt('Current value').''.&mt('Change?').'
'.$threshold_titles{$type}.''.&Apache::lonhtmlcommon::textbox($parameter.'_value', + $r->print(&Apache::loncommon::start_data_table_row()."\n". + ''.$threshold_titles{$type}.''.&Apache::lonhtmlcommon::textbox($parameter.'_value', $threshold{$type}, - 10,$onchange).'' - .&Apache::lonhtmlcommon::checkbox($parameter.'_setparmval'). - '
'. + &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval'). + '
-
+ $r->print(&Apache::loncommon::end_data_table()."\n". + '
+ '); } @@ -456,59 +614,212 @@ sub display_threshold_config { #------------------------------- sub display_interval_config { - my ($r,$interval_titles) = @_; - my $current = &get_curr_interval($env{'user.name'}, - $env{'user.domain'},$env{'request.course.id'}); - $r->print('
'.&mt('Choose the time window to use for display of version changes for resources in the course.')); + my ($r,$refpage,$interval_titles,$context) = @_; + my $setting = 'interval'; + if ($context eq 'oldroles') { + $setting = 'oldroleinterval'; + } elsif ($context eq 'newroles') { + $setting = 'newroleinterval'; + } + my $lctype = lc(&Apache::loncommon::course_type()); + my $current = &get_current($env{'user.name'},$env{'user.domain'}, + $env{'request.course.id'},$setting); + if ($context eq 'oldroles') { + $r->print('
'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' expired.').'
'); + } elsif ($context eq 'newroles') { + $r->print('
'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' became available.').'
'); + } else { + $r->print('
'.&mt('Choose the time window to use to display resources in the '.$lctype.' with version changes.').'
'); + } unless ($current eq '') { - $r->print(' '.&mt('Current value is ').$$interval_titles{$current}.'

'); + if (ref($interval_titles->{$context}) eq 'HASH') { + $r->print(' '.&mt('Current value is "[_1]".',''. + $interval_titles->{$context}->{$current}.'').'
'); + } } - $r->print('

+ $r->print('
+ +'. +&mt('Display:').'   
'); + &mt('Save').'" />'); return; } +#---------------------------------------------- +# display_discussion_config +# +# Display the discussion display setting screen +# +#---------------------------------------------- + +sub display_discussion_config { + my ($r,$refpage) = @_; + my $current = &get_current($env{'user.name'},$env{'user.domain'}, + $env{'request.course.id'},'countunread'); + if ($current eq '') { + $current = 'on'; + } + my %opposite = ( + 'on' => 'off', + 'off' => 'on', + ); + $r->print(''); + $r->print('
' + .&mt('Choose whether or not to display a count of the number of new posts for each resource or discussion board which has unread posts.') + .'
' + .&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.'.') + ); + $r->print('

+
+ + + +'); + $r->print('
+ '. + (' ' x7). + ' +
'); + return; +} + +#--------------------------------------------------- +# courseinit_config +# +# Set page displayed when course loads after +# selecting a role in the course from the roles page. +# +#--------------------------------------------------- + +sub courseinit_config { + my ($r,$refpage,$initpage) = @_; + my ($control,$current) = &curr_courseinit(); + my @chgstate = ('userpref','coursespecific'); + my @chgentry = ('firstres','whatsnew'); + my $lctype = lc(&Apache::loncommon::course_type()); + my %lt = &Apache::lonlocal::texthash( + 'chwp' => "Choose which page will be displayed when you enter this $lctype after selecting a role.", + 'cuva' => 'Current value is determined by', + 'anis' => 'and is set to display', + 'padc' => 'Page display controlled by', + 'chce' => 'Choose '.$lctype.' entry', + 'moce' => 'Save', + ); + $r->print(<<"END"); +
$lt{'chwp'} +
$lt{'cuva'}: +$$initpage{$control} $lt{'anis'} +$$initpage{$current}.

+
+ + +$lt{'padc'}:   +END + foreach my $choice (@chgstate) { + my $chkstring; + if ($choice eq $control) { + $chkstring = ' checked="checked" '; + } + $r->print(''); + } + $r->print('

'.&mt('If').' '.$$initpage{'coursespecific'}. + ' -
'.$lt{'chce'}.": \n"); + foreach my $choice (@chgentry) { + my $chkstring; + if (($choice eq $current) && ($control eq 'coursespecific')) { + $chkstring = ' checked="checked" '; + } + $r->print(''); + } + $r->print('

'); + return; +} + +sub curr_courseinit { + my $current = &get_current($env{'user.name'},$env{'user.domain'}, + $env{'request.course.id'},'courseinit'); + my $control; + if ($current) { + $control = 'coursespecific'; + } else { + $control = 'userpref'; + my %userenv = &Apache::lonnet::get('environment', + ['course_init_display']); + if (exists($userenv{'course_init_display'})) { + $current = $userenv{'course_init_display'}; + } + unless ($current) { + $current = 'whatsnew'; + } + } + return ($control,$current); +} + 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,$countunread) = @_; + my ($r,$action,$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) = @_; if ($$checkallowed{$action}) { - &start_box($r,$tabbg,$show,$headings,$action); + &start_box($r,$show,$headings,$action,$refpage,$action); if ($$show{$action}) { if ($action eq 'handgrading') { # UNGRADED ITEMS - &display_handgrade($r,$tograde,$rowColor1,$rowColor2, - $ungraded); + &display_handgrade($r,$tograde,$ungraded,$itemserror); } elsif ($action eq 'haserrors') { # BOMBS - &display_haserrors($r,$bombs,$rowColor1,$rowColor2,$bombed, - $res_title); + &display_haserrors($r,$bombs,$bombed,$res_title,$itemserror); } elsif ($action eq 'versionchanges') { # VERSION CHANGES - &display_versionchanges($r,$changed,$res_title,$rowColor1, - $rowColor2,$interval); - + &display_versionchanges($r,$changed,$res_title,$interval->{'versions'},$itemserror); } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS - &display_abovethreshold($r,$warnings,$triggered,$res_title, - $rowColor1,$rowColor2); + &display_abovethreshold($r,$refpage,$warnings,$triggered, + $res_title,$itemserror); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, - $countunread,$res_title,$rowColor1,$rowColor2); + $countunread,$res_title,$itemserror); } elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES - &display_coursenormalmail($r,$msgcount,$newmsgs,$rowColor1, - $rowColor2); + &display_coursenormalmail($r,$msgcount,$newmsgs); } elsif ($action eq 'coursecritmail') { # CRITICAL MESSAGES - &display_coursecritmail($r,$critmsgcount,$critmsgs,$rowColor1, - $rowColor2); + &display_coursecritmail($r,$critmsgcount,$critmsgs); + } elsif ($action eq 'newroles') { # ACTIVATED ROLES + &display_rolechanges($r,$activecount,$activated,$interval->{'newroles'}, + $crstype); + } elsif ($action eq 'oldroles') { # EXPIRED ROLES + &display_rolechanges($r,$expirecount,$expired,$interval->{'oldroles'}, + $crstype); } } &end_box($r); @@ -518,13 +829,16 @@ sub display_launcher { sub getitems { my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions, - $tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs, - $res_title,$show,$starttime,$countunread) = @_; + $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show, + $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].','','').'
'; + return $itemserror; + } # 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; my $discussiontime; @@ -533,23 +847,11 @@ sub getitems { &checkversions($cdom,$crs,$navmap,$changed,$starttime); } - if ($$show{'coursediscussion'}) { - 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; @@ -558,14 +860,18 @@ sub getitems { %{$$ungraded{$symb}} = (); %{$$triggered{$symb}} = (); $$triggered{$symb}{numparts} = 0; + if ($resource->encrypted()) { + $$triggered{$symb}{'enclink'} = $resource->link(); + $$triggered{$symb}{'encsymb'} = $resource->shown_symb(); + } my $title = $resource->compTitle(); $$res_title{$symb} = $title; my $ressymb = $resource->wrap_symb(); # Check if there are unread discussion postings if ($$show{'coursediscussion'}) { - &check_discussions($cdom,$crs,$resource,$symb,$ressymb,$title, - $newdiscussions,$unread); + &check_discussions($resource,$symb,$ressymb,$title, + $newdiscussions,$unread,$countunread); } # Check for ungraded problems @@ -583,78 +889,37 @@ sub getitems { # Maxtries and degree of difficulty for problem parts, unless handgradeable if ($$show{'abovethreshold'}) { - &check_thresholds($resource,$symb,\%resourcetracker,$triggered, - $threshold,$warnings,$warningnum,$rowColor1,$rowColor2); + &check_thresholds($resource,$symb,\%resourcetracker, + $triggered,$threshold,$warnings); } } - my $hasdiscussion = @{$newdiscussions}; - if ($$show{'coursediscussion'} && $hasdiscussion) { # Get time of last post; - $discussiontime = $navmap->{DISCUSSION_TIME}; - foreach my $ressymb (@{$newdiscussions}) { - $$unread{$ressymb}{'lastpost'} = $$discussiontime{$ressymb}; - } - if ($countunread) { #Get count of unread postings for each resource - my $discussiondata = $navmap->get_discussion_data(); - foreach my $ressymb (@{$newdiscussions}) { - &get_discussions($cdom,$crs,$discussiondata,$ressymb, - $unread,\%lastreadtime); - } - } - } + return; } sub check_discussions { - my ($cdom,$crs,$resource,$symb,$ressymb,$title,$newdiscussions, - $unread) = @_; - if ($resource->hasDiscussion()) { - %{$$unread{$ressymb}} = (); - $$unread{$ressymb}{'title'} = $title; - $$unread{$ressymb}{'symb'} = $symb; - push(@{$newdiscussions}, $ressymb); - } -} + my ($resource,$symb,$ressymb,$title,$newdiscussions,$unread, + $countunread) = @_; -sub get_discussions { - my ($cdom,$crs,$discussiondata,$ressymb,$unread,$lastreadtime) = @_; - my $prevread = 0; - my $unreadcount = 0; - if (defined($$lastreadtime{$ressymb})) { - $prevread = $$lastreadtime{$ressymb}; - } - my $version = $$discussiondata{'version:'.$ressymb}; - if ($version) { - my $hiddenflag = 0; - my $deletedflag = 0; - my ($hidden,$deleted); - for (my $id=$version; $id>0; $id--) { - my $vkeys=$$discussiondata{$id.':keys:'.$ressymb}; - my @keys=split(/:/,$vkeys); - if (grep/^hidden$/,@keys) { - unless ($hiddenflag) { - $hidden = $$discussiondata{$id.':'.$ressymb.':hidden'}; - $hiddenflag = 1; - } - } elsif (grep/^deleted$/,@keys) { - unless ($deletedflag) { - $deleted = $$discussiondata{$id.':'.$ressymb.':deleted'}; - $deletedflag = 1; - } - } else { - unless (($hidden =~/\.$id\./) || ($deleted =~/\.$id\./)) { - if ($prevread <$$discussiondata{$id.':'.$ressymb.':timestamp'}) { - $unreadcount ++; - $$unread{$ressymb}{$unreadcount} = $id.': '. - $$discussiondata{$id.':'.$ressymb.':subject'}; - } - } - } - } - $$unread{$ressymb}{'unreadcount'} = $unreadcount; + if (!$resource->hasDiscussion()) { return; } + + %{$$unread{$ressymb}} = (); + $$unread{$ressymb}{'title'} = $title; + $$unread{$ressymb}{'symb'} = $symb; + if ($resource->encrypted()) { + $$unread{$ressymb}{'enclink'} = $resource->link(); + $$unread{$ressymb}{'encsymb'} = $resource->shown_symb(); + } + push(@{$newdiscussions}, $ressymb); + + $$unread{$ressymb}{'lastpost'} = $resource->last_post_time(); + + if ($countunread eq 'on') { + $$unread{$ressymb}{'unreadcount'} = + $resource->discussion_info('unread'); } } - sub check_handgraded { my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_; if ($resource->is_problem()) { @@ -672,7 +937,11 @@ sub check_handgraded { if (@ungraded > 0) { $$ungraded{$symb}{count} = scalar(@ungraded); $$ungraded{$symb}{title} = $title; - push(@{$tograde}, $symb); + if ($resource->encrypted()) { + $$ungraded{$symb}{'enclink'} = $resource->link(); + $$ungraded{$symb}{'encsymb'} = $resource->shown_symb(); + } + push(@{$tograde},$symb); } } } @@ -686,7 +955,7 @@ sub check_bombed { my @bombs = split(/,/, $errors); my $errorcount = scalar(@bombs); my $errorlink = ''. + &escape($bombs[0]).'">'. $title.''; $$bombed{$symb}{errorcount} = $errorcount; $$bombed{$symb}{errorlink} = $errorlink; @@ -695,18 +964,22 @@ sub check_bombed { } sub check_thresholds { - my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings, - $warningnum,$rowColor1,$rowColor2) = @_; + my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_; # 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 ($resource->is_anonsurvey($part)) { + next; + } + if ($resource->is_survey($part)) { + next; + } %{$stats{$part}} = (); my ($attempts,$users,$corrects,$degdiff,$av_attempts); if (exists($$resourcetracker{$symb."\0".$part."\0attempts"})) { @@ -738,75 +1011,92 @@ sub check_thresholds { } } if ($warning) { - if ($warningnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } $$triggered{$symb}{title} = $resource->title; + my $partcount = 0; + @{$$triggered{$symb}{text}} = (); 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} .= '
part - '.$part.''.&mt('part - ').$part.'single part'.&mt('single part').''.$stats{$part}{users}.''.$stats{$part}{attempts}.''.$stats{$part}{degdiff}.''.$lastreset{$part}.'
'.$stats{$part}{users}.''.$stats{$part}{attempts}.''.$stats{$part}{degdiff}.''.$lastreset{$part}.'
'.$lt{'prna'}.''.$lt{'nmun'}.'
'. + $lt{'prna'}.''. + $lt{'nmun'}.'
'.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'
'.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'
'.$itemserror.'

  '.$lt{'nopr'}.'  

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

'.$lt{'noer'}.'

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

'); + $r->print('

'.$itemserror.'

'.$lt{'nopr'}.'

'.$lt{'nopr'}.'
'.$lt{'reso'}.''.$lt{'revd'}.''.$lt{'newv'}.''.$lt{'veru'}.'
'. + $lt{'reso'}.''.$lt{'revd'}.''. + $lt{'newv'}.''. + $lt{'veru'}.'
'.$$res_title{$item}.''.$$changed{$item}{'revdate'}.''.$$changed{$item}{'current'}.''.$$changed{$item}{'version'}.'
'. + $$res_title{$item}.''. + $$changed{$item}{'revdate'}.''. + $$changed{$item}{'current'}.''. + $$changed{$item}{'version'}.'
'.$itemserror.'
' + .&mt('No '.$interval).'
'.$lt{'tich'}.''.$lt{'user'}.''.$lt{'role'}.''.$lt{'sec'}.''.$lt{'status'}.'
'.&Apache::lonlocal::locallocaltime($item).''.$link.''.$role.''.$section.''.$status.'

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

' + .&mt('There are no '.$interval).'
'.$lt{'loca'}. - ''.$lt{'type'}. - ''); - if ($countunread) { - $r->print(''.$lt{'tmlp'}.''.$lt{'numn'}. - '
'. + $lt{'loca'}.''. + $lt{'type'}.''.$lt{'tmlp'}.''.$lt{'numn'}.''.$lt{'tmlp'}. - ''.$lt{'tmlp'}.'
'.$forum_title.' '.$type.' '.$forum_title.' '.&mt($type).' '.$lastpost.''. - '',$unreadnum.' '.$lastpost.''. + $unreadnum.' '.$lastpost.''.$lastpost.'
'.$itemserror.'

 '. - $lt{'noun'}.'

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

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

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

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

'. + &mt('No unread critical messages in '.$lctype). + '
+
-
- - - - '); + + + '); if (($caller eq 'abovethreshold') && ($$show{$caller})) { - $r->print(' + if ($$show{$caller}) { + $r->print(' - + '); + } } elsif (($caller eq 'versionchanges') && ($$show{$caller})) { - $r->print(' + if ($$show{$caller}) { + $r->print(' - + '); + } + } elsif ($caller eq 'coursediscussion') { + if ($$show{$caller}) { + $r->print(' + + + '); + } + } elsif (($caller eq 'newroles') && ($$show{$caller})) { + if ($$show{$caller}) { + $r->print(' + + + '); + } + } elsif (($caller eq 'oldroles') && ($$show{$caller})) { + if ($$show{$caller}) { + $r->print(' + + + '); + } } - $r->print(' + $r->print(' -
- - - - - -
'.$$heading{$caller}.''.$showhide.'
-
'.$$heading{$caller}.''.$showhide.'
'.$lt{'chth'}.''.$lt{'chth'}.'
'.$lt{'chin'}.''.$lt{'chin'}.'
'.$lt{'chop'}.'
'.$lt{'chin'}.'
'.$lt{'chin'}.'
- + -
+ '); return; } @@ -1329,9 +2001,6 @@ sub start_box { sub end_box { my ($r) = shift; $r->print(' -
-