--- loncom/interface/lonwhatsnew.pm 2007/09/26 12:34:19 1.73 +++ loncom/interface/lonwhatsnew.pm 2012/02/08 17:07:02 1.101.2.1.2.1 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.73 2007/09/26 12:34:19 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.101.2.1.2.1 2012/02/08 17:07:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,11 +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 @@ -68,6 +70,9 @@ sub handler { ['vgr','abovethreshold',1], ['opa','haserrors',1], ['mdc','versionchanges',0], + ['vcl','newroles',1], + ['vcl','oldroles',1], + ['whn','crslogin',1], ) { my ($perm,$key,$check_section) = @{ $perm_check }; my $scope = $env{'request.course.id'}; @@ -84,7 +89,7 @@ sub handler { 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"; + $env{'user.error.msg'}="/adm/whatsnew:whn:0:0:Cannot display what's new page"; return HTTP_NOT_ACCEPTABLE; } @@ -96,7 +101,7 @@ sub handler { &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew', - text=>"Display Action Items"}); + text=>"What's New?"}); if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage, @@ -125,6 +130,27 @@ sub handler { $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 + ("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' + )); + } elsif ($command eq 'chgcrslogininterval' && $checkallowed{'crslogin'}) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/whatsnew?command=chgcrslogininterval&refpage='.$refpage, + text=>"Change interval"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + ("What's New?",#'Course_Action_Items_Intervals' + )); } else { $r->print(&Apache::lonhtmlcommon::breadcrumbs ("What's New?",#'Course_Action_Items_Display' @@ -152,17 +178,39 @@ sub display_main_box { degdiff => 'Degree of difficulty', numstudents => 'Total number of students with submissions', ); - - my %interval_titles = &Apache::lonlocal::texthash ( - -1 => "since start of $lctype", - 2592000 => 'since last month', - 604800 => 'since last week', - 86400 => 'since yesterday', + 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 %crslogins = ( + -1 => 'last logins for anyone who has ever logged in', + 2592000 => 'last logins for users in last 30 days', + 604800 => 'last logins for users in last 7 days', + 86400 => 'last logins for users in last 24 hours', + ); + my %interval_titles = ( + versions => \%versions, + newroles => \%newroles, + oldroles => \%oldroles, + crslogin => \%crslogins, ); - my %initpage = &Apache::lonlocal::texthash ( firstres => "first resource in the $lctype", - whatsnew => "what's new? page", + whatsnew => "What's New Page", userpref => 'your general user preferences', coursespecific => "specific setting for this $lctype", ); @@ -175,12 +223,21 @@ sub display_main_box { $cdom,$crs); } elsif (($command eq 'chginterval') && $checkallowed->{'versionchanges'}) { - &display_interval_config($r,$refpage,\%interval_titles); + &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'); + } elsif (($command eq 'chgcrslogininterval') + && $checkallowed->{'crslogin'}) { + &display_interval_config($r,$refpage,\%interval_titles,'crslogin'); } else { &display_actions_box($r,$command,$refpage,\%threshold_titles, \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); @@ -205,12 +262,15 @@ sub display_header { my ($command,$checkallowed) = @_; my $scripttag; - unless ($command eq 'chgthreshold' || $command eq 'chginterval') { + unless ($command eq 'chgthreshold' || $command eq 'chginterval' || + $command eq 'chgoldroleinterval' || + $command eq 'chgnewroleinterval' || $command eq 'chgcrslogininterval') { $scripttag = <<"END"; '; } my $course_type=&Apache::loncommon::course_type(); - return &Apache::loncommon::start_page($course_type.' Action Items', + return &Apache::loncommon::start_page("What's New?", $scripttag); } @@ -249,7 +355,7 @@ sub display_actions_box { my $lctype = lc($crstype); my %stulabel = ( 'Course' => 'students', - 'Group' => 'members', + 'Community' => 'members', ); my %lt = &Apache::lonlocal::texthash( 'yacc' => 'You are accessing an invalid course', @@ -271,7 +377,12 @@ sub display_actions_box { my @warnings = (); my $msgcount = 0; my $critmsgcount = 0; - + my $expirecount; + my %expired; + my $activecount; + my %activated; + my %loggedin; + my $logincount; my %res_title = (); my %show = (); my $needitems = 0; @@ -285,7 +396,7 @@ sub display_actions_box { my %threshold = (); my %pagedesc = &Apache::lonlocal::texthash ( firstres => 'First resource', - whatsnew => "What's New? page", + whatsnew => "What's New Page", userpref => 'user preference', coursespecific => $lctype.' only', default => 'default', @@ -299,19 +410,30 @@ sub display_actions_box { return; } + 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'}; + my $furl=&HTML::Entities::encode($bighash{'first_url'},'"<>&'); untie(%bighash); - $r->print(''.$lt{'gtfr'}. - '
'); + $header .= ''.$lt{'gtfr'}. + '
'; } } - $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype). - '. '.&mt('Currently: [_1]',$currinit).'.  '. - &mt('Change for just this '.$lctype.'',$refpage).' '. - &mt('or for all your courses.',$refpage).'
'); + $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); @@ -328,49 +450,119 @@ sub display_actions_box { unless ($store_result eq 'ok') { &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); + $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 = $display_settings{$cid.':countunread'}; - unless (defined($countunread)) { - $countunread = 'on'; - } + $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 '.$lctype.' discussion posts', - handgrading => 'Problems requiring handgrading', - haserrors => 'Problems with errors', - versionchanges => 'Resources in '.$lctype.' with version changes '.$interval, + coursediscussion => 'Unread '.$lctype.' discussion posts', + handgrading => 'Problems requiring handgrading', + haserrors => 'Problems with errors', coursenormalmail => 'New '.$lctype.' messages', - coursecritmail => 'New critical messages in '.$lctype, + 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'); + } + + $timediff{'crslogin'} = $display_settings{$cid.':crslogininterval'}; + unless (defined($timediff{'crslogin'})) { $timediff{'crslogin'} = 604800; } + $interval{'crslogin'} = $interval_titles->{'crslogin'}->{$timediff{'crslogin'}}; + + if ($timediff{'crslogin'} == -1) { + $headings{'crslogin'} = &mt('Last login for anyone who has ever logged in'); + } elsif ($timediff{'crslogin'} == 2592000) { + $headings{'crslogin'} = &mt('Last login for users in last 30 days'); + } elsif ($timediff{'crslogin'} == 604800) { + $headings{'crslogin'} = &mt('Last login for users in last 7 days'); + } elsif ($timediff{'crslogin'} == 86400) { + $headings{'crslogin'} = &mt('Last login for users in last 24 hours'); + } + + 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'}; + + if ($timediff{'crslogin'} == -1) { + $timediff{'crslogin'} = time; + } + + my $crsloginstart = $now - $timediff{'crslogin'}; + + my $countunread = $display_settings{$cid.':countunread'}; + unless (defined($countunread)) { + $countunread = 'on'; + } if ($$checkallowed{'abovethreshold'}) { &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs); } $headings{'abovethreshold'} = - &mt('Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2]
and total number of '.$stulabel{$crstype}.' with submissions ≥ [_3]', + &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'}); + '
',$threshold{'numstudents'}); - my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail'); + my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin'); foreach my $key (keys(%{$checkallowed})) { if ($key =~ /_section$/) { next; } @@ -383,7 +575,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; @@ -391,8 +584,9 @@ sub display_actions_box { } } + my $itemserror; if ($needitems) { - &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); + $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); } if ($show{'coursenormalmail'}) { $msgcount = &getnormalmail(\@newmsgs); @@ -400,7 +594,15 @@ sub display_actions_box { if ($show{'coursecritmail'}) { $critmsgcount = &getcritmail(\@critmsgs); } - + if ($show{'oldroles'}) { + $expirecount = &getexpired(\%expired,$expiredstart,'previous'); + } + if ($show{'newroles'}) { + $activecount = &getactivated(\%activated,$activatedstart,'active'); + } + if ($show{'crslogin'}) { + $logincount = &getloggedin($cdom,$crs,\%loggedin,$crsloginstart); + } $r->print(qq|$lt{'hial'}   $lt{'shal'}
\n|); @@ -422,13 +624,14 @@ sub display_actions_box { $totalboxes ++; } } - my $halfway = int($totalboxes/2) + $totalboxes%2; + my $halfway = 4; +# my $halfway = int($totalboxes/2) + $totalboxes%2; foreach my $actionitem (@actionorder) { if ($$checkallowed{$actionitem}) { if ($displayed == $halfway) { $r->print(' '); } - &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread); + &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,\%interval,$countunread,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror,\%loggedin,$logincount); $displayed ++; } } @@ -488,7 +691,7 @@ sub display_threshold_config { &Apache::loncommon::end_data_table_row()); } $r->print(&Apache::loncommon::end_data_table()."\n". - '
+ '
'); @@ -502,28 +705,51 @@ sub display_threshold_config { #------------------------------- sub display_interval_config { - my ($r,$refpage,$interval_titles) = @_; + 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'},'interval'); - $r->print('
'.&mt('Choose the time window to use for display of version changes for resources in the '.$lctype.'.')); + $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.').'
'); + } elsif ($context eq 'crslogin') { + $r->print('
'.&mt('Choose the time window to use to display the last login by a user in the '.$lctype).'
'); + } 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 [_1]',''. - $$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; } @@ -553,7 +779,13 @@ function toggle_countunread(choice) { document.discussionswitch.submit(); } '); - $r->print('
'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'
'.&mt("This can increase the time taken to gather data for the 'What's New?' page by a few seconds.").'  '.&mt("Currently set to $current.")); + $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('

@@ -562,10 +794,10 @@ function toggle_countunread(choice) { '); $r->print('
-         - '. + (' ' x7). + '
'); @@ -592,7 +824,7 @@ sub courseinit_config { 'anis' => 'and is set to display', 'padc' => 'Page display controlled by', 'chce' => 'Choose '.$lctype.' entry', - 'moce' => 'Modify '.$lctype.' entry', + 'moce' => 'Save', ); $r->print(<<"END");
$lt{'chwp'} @@ -653,27 +885,38 @@ sub display_launcher { my ($r,$action,$refpage,$checkallowed,$show,$headings,$res_title, $tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered, $newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs, - $interval,$countunread) = @_; + $interval,$countunread,$expired,$expirecount,$activated,$activecount, + $crstype,$itemserror,$loggedin,$logincount) = @_; if ($$checkallowed{$action}) { &start_box($r,$show,$headings,$action,$refpage,$action); if ($$show{$action}) { if ($action eq 'handgrading') { # UNGRADED ITEMS - &display_handgrade($r,$tograde,$ungraded); + &display_handgrade($r,$tograde,$ungraded,$itemserror); } elsif ($action eq 'haserrors') { # BOMBS - &display_haserrors($r,$bombs,$bombed,$res_title); + &display_haserrors($r,$bombs,$bombed,$res_title,$itemserror); } elsif ($action eq 'versionchanges') { # VERSION CHANGES - &display_versionchanges($r,$changed,$res_title,$interval); + &display_versionchanges($r,$changed,$res_title,$interval->{'versions'},$itemserror); } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS &display_abovethreshold($r,$refpage,$warnings,$triggered, - $res_title); + $res_title,$itemserror); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, - $countunread,$res_title); + $countunread,$res_title,$itemserror); } elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES &display_coursenormalmail($r,$msgcount,$newmsgs); } elsif ($action eq 'coursecritmail') { # CRITICAL MESSAGES &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); + } elsif ($action eq 'crslogin') { #LAST LOGIN + &display_crslogins($r,$logincount,$loggedin,$interval->{'crslogin'}, + $crstype); + } } &end_box($r); @@ -686,6 +929,10 @@ sub getitems { $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;}); @@ -744,6 +991,7 @@ sub getitems { } } + return; } sub check_discussions { @@ -823,6 +1071,9 @@ sub check_thresholds { if ($resource->handgrade($part) eq 'yes') { next; } + if ($resource->is_anonsurvey($part)) { + next; + } if ($resource->is_survey($part)) { next; } @@ -866,10 +1117,10 @@ sub check_thresholds { my $resettitle = 'title_'.&escape($symb."\0".$part); if (@parts > 1) { $$triggered{$symb}{text}[$partcount] = ' - part - '.$part.''; + '.&mt('part - ').$part.''; } else { $$triggered{$symb}{text}[$partcount] = ' - single part'; + '.&mt('single part').''; } $$triggered{$symb}{text}[$partcount] .= ' '.$stats{$part}{users}.' @@ -979,7 +1230,7 @@ sub process_reset { sub process_update { my ($uname,$udom,$threshold_titles) = @_; - my $setoutput = 'Changes to threshold(s) for problem tracking:
'; + my $setoutput = ''.&mt('Changes to threshold(s) for problem tracking:').'

'; foreach (keys %env) { next if ($_!~/^form\.(.+)\_setparmval$/); my $name = $1; @@ -990,17 +1241,17 @@ sub process_update { 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 { @@ -1015,10 +1266,9 @@ sub getnormalmail { &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'); } @@ -1047,7 +1297,6 @@ 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 '') { @@ -1066,6 +1315,238 @@ 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 getloggedin { + my ($cdom,$crs,$lastlogins,$starttime) = @_; + my $context = 'course'; + my ($permission,$allowed) = + &Apache::lonuserutils::get_permission($context); + my $viewablesec = &Apache::lonuserutils::viewable_section($permission); + my %crslogins=&Apache::lonnet::dump('nohist_crslastlogin',$cdom,$crs); + my $logincount = 0; + my ($tmp) = keys(%crslogins); + unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { + if (keys(%crslogins) > 0) { + foreach my $key (keys(%crslogins)) { + my ($uname,$udom,$section,$role) = split(/:/,$key); + my $eventtime = $crslogins{$key}; + if ($eventtime > $starttime) { + if (($viewablesec ne '') && ($section ne '')) { + next if ($viewablesec ne $section); + } + my %chginfo = ( + 'section' => $section, + 'uname' => $uname, + 'udom' => $udom, + 'role' => $role, + ); + $logincount ++; + push (@{$lastlogins->{$eventtime}},\%chginfo); + } + } + } + } + return $logincount; +} sub checkversions { my ($cdom,$crs,$navmap,$changed,$starttime) = @_; @@ -1083,7 +1564,7 @@ sub checkversions { 'lastrevisiondate'); $revdate = &Apache::lonlocal::locallocaltime($revdate); my $linkurl=&Apache::lonnet::clutter($key); - my $usedversion=$navmap->usedVersion('version_'.$linkurl); + my $usedversion=$navmap->usedVersion($linkurl); my @resources = $navmap->getResourceByUrl($linkurl,1); if (($usedversion) && ($usedversion ne 'mostrecent')) { $version = $usedversion; @@ -1108,7 +1589,7 @@ sub checkversions { } sub display_handgrade { - my ($r,$tograde,$ungraded) = @_; + my ($r,$tograde,$ungraded,$itemserror) = @_; my %lt = &Apache::lonlocal::texthash( 'prna' => 'Problem Name', 'nmun' => 'Number ungraded', @@ -1131,13 +1612,15 @@ sub display_handgrade { } $r->print(''.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.''); } + } elsif ($itemserror) { + $r->print(''.$itemserror.''); } else { $r->print(''.$lt{'nopr'}.''); } } sub display_haserrors { - my ($r,$bombs,$bombed,$res_title) = @_; + my ($r,$bombs,$bombed,$res_title,$itemserror) = @_; my $bombnum = 0; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', @@ -1156,6 +1639,8 @@ sub display_haserrors { ''. $$bombed{$bomb}{errorcount}.''); } + } elsif ($itemserror) { + $r->print(''.$itemserror.''); } else { $r->print(''.$lt{'noer'}.''); } @@ -1163,7 +1648,7 @@ sub display_haserrors { } sub display_abovethreshold { - my ($r,$refpage,$warnings,$triggered,$res_title) = @_; + my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', part => 'Part', @@ -1219,19 +1704,20 @@ sub display_abovethreshold { } } $r->print('
'); + } elsif ($itemserror) { + $r->print(''.$itemserror.''); } else { $r->print(''.$lt{'nopr'}.''); } } sub display_versionchanges { - my ($r,$changed,$res_title,$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', ); if (keys(%{$changed}) > 0) { $r->print(''. @@ -1253,15 +1739,160 @@ sub display_versionchanges { $$changed{$item}{'current'}.''. $$changed{$item}{'version'}.''); } + } elsif ($itemserror) { + $r->print(''.$itemserror.''); + } else { + $r->print('' + .&mt('No '.$interval).''); + } + 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(''. + ''.$lt{'tich'}.''. + ''.$lt{'user'}.''. + ''.$lt{'role'}.''. + ''.$lt{'sec'}.''. + ''.$lt{'status'}.''); + 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(''. + ''.&Apache::lonlocal::locallocaltime($item).''. + ''.$link.''. + ''.$role.''. + ''.$section.''. + ''.$status.''); + } + } + } + } + } + } else { + $r->print('' + .&mt('There are no '.$interval).''); + } + return; +} + +sub display_crslogins { + my ($r,$logincount,$loggedin,$interval,$crstype) = @_; + my %lt = &Apache::lonlocal::texthash( + 'user' => 'User', + 'role' => 'Role', + 'sec' => 'Section', + 'number' => 'Total number of logins', + ); + if ($logincount) { + + my $hdr = ''. + ''.$lt{'user'}.''. + ''.$lt{'role'}.''. + ''.$lt{'sec'}.''. + ''. + ''.$lt{'number'}.''. + ''.$lt{'role'}.''. + ''.$lt{'sec'}; + my (%bylastname,%counts); + if (ref($loggedin) eq 'HASH') { + my @logins = sort { $b <=> $a } (keys(%{$loggedin})); + my $numlogin = 0; + foreach my $item (@logins) { + if (ref($loggedin->{$item}) eq 'ARRAY') { + foreach my $user (@{$loggedin->{$item}}) { + if (ref($user) eq 'HASH') { + my $section; + my $role = + &Apache::lonnet::plaintext($user->{'role'},$crstype); + my $status = &mt($user->{'status'}); + if ($user->{'section'} eq '') { + $section = &mt('none'); + } else { + $section = $user->{'section'}; + } + $counts{$user->{'role'}}{$section} ++; + my $uname = $user->{'uname'}; + my $udom = $user->{'udom'}; + my $fullname = &Apache::loncommon::plainname($uname,$udom,'lastname'); + my $link = + &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom); + push(@{$bylastname{$fullname}}, + ''.$link.''. + ''.$role.''. + ''.$section.''); + } + } + } + } + my $table; + foreach my $person (sort(keys(%bylastname))) { + if (ref($bylastname{$person}) eq 'ARRAY') { + foreach my $item (@{$bylastname{$person}}) { + $numlogin ++; + my $css_class = $numlogin%2?' class="LC_odd_row"':''; + $table .= '