--- loncom/interface/lonwhatsnew.pm 2008/03/11 00:44:09 1.75 +++ loncom/interface/lonwhatsnew.pm 2009/10/26 22:30:50 1.95 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.75 2008/03/11 00:44:09 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.95 2009/10/26 22:30:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,7 @@ 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; @@ -68,6 +69,8 @@ sub handler { ['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'}; @@ -96,7 +99,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 +128,20 @@ 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' + )); } else { $r->print(&Apache::lonhtmlcommon::breadcrumbs ("What's New?",#'Course_Action_Items_Display' @@ -152,17 +169,32 @@ 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 %interval_titles = ( + versions => \%versions, + newroles => \%newroles, + oldroles => \%oldroles, ); - 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 +207,18 @@ 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'); } else { &display_actions_box($r,$command,$refpage,\%threshold_titles, \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); @@ -205,12 +243,13 @@ 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') { $scripttag = <<"END"; <script type="text/javascript"> function change_display(caller,change) { caller.value = change; - document.visible.submit(); + document.visible.submit(); } function changeAll(change) { @@ -228,7 +267,7 @@ 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 +288,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 +310,10 @@ 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; @@ -285,7 +327,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', @@ -310,15 +352,15 @@ sub display_actions_box { } $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).'.' .' <span class="LC_nobreak">' - .&mt('Currently: <i>[_1]</i>',$currinit) - .'. ' -# &mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&refpage=[_1]">this '.$lctype.'</a>',$refpage).' '. -# &mt('or for all <a href="/adm/preferences?action=changecourseinit&refpage=[_1]">your courses</a>.',$refpage).'</span><br /><hr />'); - .&mt('<b>Change</b> for just [_1]this course[_2]' - .' or for all [_3]your courses[_2].' + .&mt('Currently: [_1].','<i>'.$currinit.'</i>') + .' ' + .&mt('[_1]Change[_2] for just [_3]this [_4] or for all [_5]your courses/communities[_6].' + ,'<b>' + ,'</b>' ,'<a href="/adm/whatsnew?command=courseinit&refpage='.$refpage.'">' - ,'</a>' - ,'<a href="/adm/preferences?action=changecourseinit&refpage='.$refpage.'">') + ,$lctype.'</a>' + ,'<a href="/adm/preferences?action=changecourseinit&refpage='.$refpage.'">' + ,'</a>') .' </span><br /><hr />'); if ($command eq 'reset') { @@ -341,44 +383,92 @@ sub display_actions_box { } if ($result) { - $r->print($result.'<hr width="100%" />'); + $r->print($result.'<hr />'); } $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'); + } + + 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,$uname,$udom,$cid,$cdom,$crs); } $headings{'abovethreshold'} = - &mt('Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2] <br /> 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'}); + '<br />',$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; } @@ -391,7 +481,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; @@ -399,8 +490,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); @@ -408,7 +500,12 @@ 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'); + } $r->print(qq|<a href="javascript:changeAll('hide');">$lt{'hial'}</a> <a href="javascript:changeAll('show');">$lt{'shal'}</a> <form method="post" name="visible" action="/adm/whatsnew">\n|); @@ -430,13 +527,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('</td><td> </td><td class="LC_right_col" >'); } - &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); $displayed ++; } } @@ -496,7 +594,7 @@ sub display_threshold_config { &Apache::loncommon::end_data_table_row()); } $r->print(&Apache::loncommon::end_data_table()."\n". - '<br /><input type="submit" name="threshold" value="'.&mt('Make changes').'" /> + '<br /><input type="submit" name="threshold" value="'.&mt('Save').'" /> <input type="hidden" name="command" value="update" /> <input type="hidden" name="refpage" value="'.$refpage.'" /> </form>'); @@ -510,28 +608,49 @@ 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('<br />'.&mt('Choose the time window to use for display of version changes for resources in the '.$lctype.'.').'<br />'); + $env{'request.course.id'},$setting); + if ($context eq 'oldroles') { + $r->print('<br />'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' expired.').'<br />'); + } elsif ($context eq 'newroles') { + $r->print('<br />'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' became available.').'<br />'); + } else { + $r->print('<br />'.&mt('Choose the time window to use to display resources in the '.$lctype.' with version changes.').'<br />'); + } unless ($current eq '') { - $r->print(' '.&mt('Current value is [_1].','<b>'. - $$interval_titles{$current}.'</b>')); + if (ref($interval_titles->{$context}) eq 'HASH') { + $r->print(' '.&mt('Current value is "[_1]".','<b>'. + $interval_titles->{$context}->{$current}.'</b>').'<br />'); + } } - $r->print('<br /><br /> + $r->print('<br /> <form method="post" name="intervalswitch" action="/adm/whatsnew"> <input type="hidden" name="command" value="newinterval" /> -<input type="hidden" name="refpage" value="'.$refpage.'" /> +<input type="hidden" name="intervaltype" value="'.$context.'" /> +<input type="hidden" name="refpage" value="'.$refpage.'" />'. +&mt('Display:').' <select name="interval"> +<option value="" selected="selected">'.&mt('Select').'</option> '); - foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles})))) { - $r->print('<option value="'.$key.'">'.&mt('Version changes').' '.$$interval_titles{$key}. - '</option>'."\n"); + if (ref($interval_titles) eq 'HASH') { + if (ref($interval_titles->{$context}) eq 'HASH') { + foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}})))) { + $r->print('<option value="'.$key.'">'.&mt($interval_titles->{$context}->{$key}). + '</option>'."\n"); + } + } } $r->print('</select> <input type="submit" name="display" value="'. - &mt('Change interval').'" /></form>'); + &mt('Save').'" /></form>'); return; } @@ -561,7 +680,13 @@ function toggle_countunread(choice) { document.discussionswitch.submit(); } </script>'); - $r->print('<br />'.&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.').'<br />'.&mt("This can increase the time taken to gather data for the '<i>What's New?</i>' page by a few seconds.").' '.&mt("Currently set to <b>$current</b>.")); + $r->print('<br />' + .&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.') + .'<br />' + .&mt("This can increase the time taken to gather data for the [_1]What's New Page[_2] by a few seconds.",'<i>','</i>') + .' ' + .&mt('Currently set to [_1].','<b>'.$current.'</b>.') + ); $r->print('<br /><br /> <form method="post" name="discussionswitch" action="/adm/whatsnew"> <input type="hidden" name="command" value="newdiscconf" /> @@ -571,9 +696,9 @@ function toggle_countunread(choice) { $r->print('<br/> <input type="button" name="display" value="'. &mt('Change to [_1]',&mt($opposite{$current})).'" - onclick="javascript:toggle_countunread('."'change'".')" /> -   - <input type="button" name="nochange" value="'. + onclick="javascript:toggle_countunread('."'change'".')" />'. + (' ' x7). + '<input type="button" name="nochange" value="'. &mt("No change").'" onclick="javascript:toggle_countunread('."'unchanged'".')" /> </form>'); @@ -600,7 +725,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"); <br />$lt{'chwp'} @@ -661,27 +786,34 @@ 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) = @_; 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); } } &end_box($r); @@ -694,6 +826,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 = '<span class="LC_warning">'.&mt('An error occurred retrieving information about the course.').'<br />'.&mt('It is recommended that you [_1]re-select the course[_2].','<a href="/adm/roles">','</a>').'</span>'; + 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;}); @@ -752,6 +888,7 @@ sub getitems { } } + return; } sub check_discussions { @@ -1024,9 +1161,9 @@ sub getnormalmail { 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'); } @@ -1074,6 +1211,205 @@ 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) = @_; @@ -1116,7 +1452,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', @@ -1139,13 +1475,15 @@ sub display_handgrade { } $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.$$ungraded{$res}{title}.'</a></td><td class="LC_right_item">'.$$ungraded{$res}{count}.'</td></tr>'); } + } elsif ($itemserror) { + $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>'); } else { $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>'); } } 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', @@ -1164,6 +1502,8 @@ sub display_haserrors { '</td><td class="LC_right_item">'. $$bombed{$bomb}{errorcount}.'</td></tr>'); } + } elsif ($itemserror) { + $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>'); } else { $r->print('<tr class="LC_empty_row"><td>'.$lt{'noer'}.'</td></tr>'); } @@ -1171,7 +1511,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', @@ -1227,19 +1567,20 @@ sub display_abovethreshold { } } $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></td></tr></form>'); + } elsif ($itemserror) { + $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>'); } else { $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>'); } } 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('<tr class="LC_info_row"><td class="LC_left_item">'. @@ -1261,15 +1602,74 @@ sub display_versionchanges { $$changed{$item}{'current'}.'</td><td>'. $$changed{$item}{'version'}.'</td></tr>'); } + } elsif ($itemserror) { + $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>'); + } else { + $r->print('<tr class="LC_empty_row"><td>' + .&mt('No '.$interval).'</td></tr>'); + } + 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('<tr class="LC_info_row">'. + '<td class="LC_left_item">'.$lt{'tich'}.'</td>'. + '<td class="LC_left_item">'.$lt{'user'}.'</td>'. + '<td class="LC_left_item">'.$lt{'role'}.'</td>'. + '<td class="LC_left_item">'.$lt{'sec'}.'</td>'. + '<td class="LC_left_item">'.$lt{'status'}.'</td></tr>'); + 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('<tr'.$css_class.'>'. + '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'. + '<td>'.$link.'</td>'. + '<td>'.$role.'</td>'. + '<td>'.$section.'</td>'. + '<td>'.$status.'</td></tr>'); + } + } + } + } + } } else { - $r->print('<tr class="LC_empty_row"><td>'.$lt{'noup'}. - ' '.$interval.'</td></tr>'); + $r->print('<tr class="LC_empty_row"><td>' + .&mt('There are no '.$interval).'</td></tr>'); } return; } sub display_coursediscussion { - my ($r,$newdiscussions,$unread,$countunread,$res_title) = @_; + my ($r,$newdiscussions,$unread,$countunread,$res_title,$itemserror) = @_; my $lctype = lc(&Apache::loncommon::course_type()); my %lt = &Apache::lonlocal::texthash( 'loca' => 'Location', @@ -1299,7 +1699,7 @@ sub display_coursediscussion { my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb); my $disclink = $feedurl.'?symb='.$$unread{$ressymb}{symb}; if ($feedurl =~ /bulletinboard/) { - $type = 'Bulletin Board'; + $type = 'Discussion Board'; } if ($$unread{$ressymb}{'enclink'}) { $disclink = $$unread{$ressymb}{'enclink'}.'?symb='.$$unread{$ressymb}{'encsymb'}; @@ -1317,6 +1717,8 @@ sub display_coursediscussion { } $r->print("</tr>\n"); } + } elsif ($itemserror) { + $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>'); } else { $r->print('<tr class="LC_empty_row"><td>'.$lt{'noun'}.'</td></tr>'); } @@ -1334,12 +1736,12 @@ sub display_coursenormalmail { foreach my $msg (@{$newmsgs}) { $mailcount ++; my $css_class = $mailcount%2?' class="LC_odd_row"':''; - $r->print('<tr'.$css_class.'><td>'.$mailcount. - '. </td><td><a href="/adm/email?display='. - $msg->{'msgid'}.'">'. - $msg->{'shortsub'}.'</a> </td><td> '. - $msg->{'from'}.':'.$msg->{'fromdom'}.' </td><td>'. - $msg->{'sendtime'}.'</td></tr>'); + $r->print('<tr'.$css_class.'><td>'.$mailcount + .'. </td><td><a href="/adm/email?display=' + .$msg->{'msgid'}.'">' + .$msg->{'shortsub'}.'</a> </td><td> ' + .$msg->{'from'}.':'.$msg->{'fromdom'}.' </td><td>' + .$msg->{'sendtime'}.'</td></tr>'); } } else { $r->print('<tr class="LC_empty_row"><td>'. @@ -1420,20 +1822,28 @@ 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]', - '<b>'.$$interval_titles{$env{'form.interval'}}.'</b>').'<br />'; - + if (ref($interval_titles->{$context}) eq 'HASH') { + $result = &mt('New filter setting: [_1].','<b>'. + $interval_titles->{$context}->{$env{'form.interval'}}.'</b>').'<br />'; + } } else { my $lctype = lc(&Apache::loncommon::course_type()); - &Apache::lonnet::logthis('Error saving whatsnew interval setting'. + &Apache::lonnet::logthis('Error saving whatsnew '.$context.' interval setting'. ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result = &mt('Unable to set interval to [_1] due to [_2].', - '<b>'.$$interval_titles{$env{'form.interval'}}.'</b>', + '<b>'.$interval_titles->{$context}->{$env{'form.interval'}}.'</b>', '<tt>'.$outcome.'</tt>.<br />'); } } @@ -1487,9 +1897,10 @@ sub store_courseinit_setting { \%courseinit_settings,$udom,$uname); if ($outcome eq 'ok') { if ($page_control eq 'global preferences') { - $result = &mt("Page displayed after role selection in $lctype now set by <b>user's global preferences</b>."); + $result = &mt("Page displayed after role selection in $lctype now set by [_1]user's global preferences[_2].",'<b>','</b>'); } else { - $result = &mt('Page displayed after role selection in this '.$lctype.' set to <b>[_2]</b>',$lctype,$$initpage{$env{'form.courseinit_page'}}); + $result = &mt('Page displayed after role selection in this '.$lctype.' set to [_1].' + ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>'); } } else { &Apache::lonnet::logthis('Error saving whatsnew courseinit '. @@ -1501,8 +1912,10 @@ sub store_courseinit_setting { '<b>'.$page_control.'</b>', '<tt>'.$outcome.'</tt>.<br />'); } else { - $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to <b>[_2]</b> due to <tt>[_3]</tt>.<br />', - $$initpage{$env{'form.courseinit_page'}},$outcome); + $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to [_1] due to [_2].' + ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>' + ,'<tt>'.$outcome.'</tt>') + .'<br />'; } } } @@ -1556,6 +1969,20 @@ sub start_box { <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgdisc&refpage='.$refpage.'">'.$lt{'chop'}.'</a></td> </tr>'); } + } elsif (($caller eq 'newroles') && ($$show{$caller})) { + if ($$show{$caller}) { + $r->print(' + <tr> + <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgnewroleinterval&refpage='.$refpage.'">'.$lt{'chin'}.'</a></td> + </tr>'); + } + } elsif (($caller eq 'oldroles') && ($$show{$caller})) { + if ($$show{$caller}) { + $r->print(' + <tr> + <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgoldroleinterval&refpage='.$refpage.'">'.$lt{'chin'}.'</a></td> + </tr>'); + } } $r->print(' <tr>