--- loncom/interface/lonwhatsnew.pm 2010/08/09 23:39:43 1.98.2.2 +++ loncom/interface/lonwhatsnew.pm 2010/01/28 22:37:18 1.99.2.2 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.98.2.2 2010/08/09 23:39:43 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.99.2.2 2010/01/28 22:37:18 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -72,7 +72,6 @@ sub handler { ['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'}; @@ -144,13 +143,6 @@ sub handler { $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' @@ -196,17 +188,10 @@ sub display_main_box { 604800 => 'roles which expired since last week', 86400 => 'roles which expired since yesterday', ); - my %crslogins = ( - -1 => 'last login for anyone who has ever logged in', - 2592000 => 'last login for users in last 30 days', - 604800 => 'last login for users in last 7 days', - 86400 => 'last login 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", @@ -235,9 +220,6 @@ sub display_main_box { } 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); @@ -263,8 +245,7 @@ sub display_header { my $scripttag; unless ($command eq 'chgthreshold' || $command eq 'chginterval' || - $command eq 'chgoldroleinterval' || - $command eq 'chgnewroleinterval' || $command eq 'chgcrslogininterval') { + $command eq 'chgoldroleinterval' || $command eq 'chgnewroleinterval') { $scripttag = <<"END"; <script type="text/javascript"> function change_display(caller,change) { @@ -283,51 +264,6 @@ END } $scripttag.='document.visible.submit(); } - -function togglelogins() { - var total = document.visible.logincount.value; - var sumrow = document.visible.loginrow.value; - if (total == 0) { - return; - } - var showlogindetails = 0; - for (var i=0; i<document.visible.logindetails.length; i++) { - if (document.visible.logindetails[i].checked) { - showlogindetails = document.visible.logindetails[i].value; - } - } - var detval = "none"; - var sumval = ""; - if (showlogindetails == 1) { - detval = ""; - sumval = "none"; - } - for (var j=0; j<total; j++) { - var counter = j+1; - var itemid = "logindet_"+counter; - personele = document.getElementById(itemid); - if (personele != null) { - personele.style.display = detval; - } - } - var detheaderele = document.getElementById("logintitledet"); - if (detheaderele != null) { - detheaderele.style.display = detval; - } - for (var k=0; k<sumrow; k++) { - var counter = k+1; - var itemid = "loginsum_"+counter; - logincatele = document.getElementById(itemid); - if (logincatele != null) { - logincatele.style.display = sumval; - } - } - var sumheaderele = document.getElementById("logintitlesum"); - if (sumheaderele != null) { - sumheaderele.style.display = sumval; - } - return; -} </script> '; } @@ -346,7 +282,6 @@ function togglelogins() { sub display_actions_box { my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage, $cdom,$crs,$checkallowed) = @_; - my $custommenu = &Apache::loncommon::needs_gci_custom(); my $udom = $env{'user.domain'}; my $uname = $env{'user.name'}; my $cid = $env{'request.course.id'}; @@ -380,8 +315,6 @@ sub display_actions_box { my %expired; my $activecount; my %activated; - my %loggedin; - my $logincount; my %res_title = (); my %show = (); my $needitems = 0; @@ -410,17 +343,16 @@ sub display_actions_box { } my $header = ''; - if (($refpage eq 'start') && (!$custommenu)) { + if ($refpage eq 'start') { if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db', &GDBM_READER(),0640)) { my $furl=&HTML::Entities::encode($bighash{'first_url'},'"<>&'); untie(%bighash); - $header .= '<b><a href="'.$furl.'">'.$lt{'gtfr'}. - '</a></b><br />'; + $r->print('<span style="font-size: larger;"><a href="'.$furl.'">'.$lt{'gtfr'}. + '</a></span><br />'); } } - unless ($custommenu) { - $header .= &mt('Page set to be displayed after you have selected a role in this '.$lctype).'.' + $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).'.' .' <span class="LC_nobreak">' .&mt('Currently: [_1].','<i>'.$currinit.'</i>') .' ' @@ -431,10 +363,9 @@ sub display_actions_box { ,'</a>' ,'<a href="/adm/preferences?action=changecourseinit&refpage='.$refpage.'">' ,'</a>') - .' </span>'; + .' </span><br /><hr />'); - $r->print(&Apache::loncommon::head_subbox($header)); - } + $r->print($header); if ($command eq 'reset') { $result = &process_reset($cdom,$crs); @@ -514,20 +445,6 @@ sub display_actions_box { $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; @@ -542,15 +459,8 @@ sub display_actions_box { 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'; @@ -564,12 +474,7 @@ sub display_actions_box { $threshold{'av_attempts'},$threshold{'degdiff'}, '<br />',$threshold{'numstudents'}); - my @actionorder; - if ($custommenu) { - @actionorder = ('coursenormalmail','coursecritmail','newroles','oldroles','crslogin'); - } else { - @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles'); - } + my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles'); foreach my $key (keys(%{$checkallowed})) { if ($key =~ /_section$/) { next; } @@ -607,10 +512,6 @@ sub display_actions_box { if ($show{'newroles'}) { $activecount = &getactivated(\%activated,$activatedstart,'active'); } - if ($show{'crslogin'}) { - $logincount = &getloggedin($cdom,$crs,\%loggedin,$crsloginstart); - } - $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|); @@ -621,7 +522,7 @@ sub display_actions_box { } } - $r->print('<input type="hidden" name="refpage" value="'.$refpage.'" /><table class="LC_double_column"><tr><td class="LC_left_col">'); + $r->print('<input type="hidden" name="refpage" value="'.$refpage.'" /></form><table class="LC_double_column"><tr><td class="LC_left_col">'); my $displayed = 0; my $totalboxes = 0; @@ -634,20 +535,17 @@ sub display_actions_box { } my $halfway = 4; # my $halfway = int($totalboxes/2) + $totalboxes%2; - if ($custommenu) { - $halfway = 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,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror,\%loggedin,$logincount); + &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,\%interval,$countunread,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror); $displayed ++; } } $r->print(' - </td></form> + </td> </tr> </table> '); @@ -730,8 +628,6 @@ sub display_interval_config { $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 />'); - } elsif ($context eq 'crslogin') { - $r->print('<br />'.&mt('Choose the time window to use to display the last login by a user in the '.$lctype).'<br />'); } else { $r->print('<br />'.&mt('Choose the time window to use to display resources in the '.$lctype.' with version changes.').'<br />'); } @@ -897,7 +793,7 @@ sub display_launcher { $tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered, $newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs, $interval,$countunread,$expired,$expirecount,$activated,$activecount, - $crstype,$itemserror,$loggedin,$logincount) = @_; + $crstype,$itemserror) = @_; if ($$checkallowed{$action}) { &start_box($r,$show,$headings,$action,$refpage,$action); @@ -924,10 +820,6 @@ sub display_launcher { } 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); @@ -1238,7 +1130,7 @@ sub process_reset { sub process_update { my ($uname,$udom,$threshold_titles) = @_; - my $setoutput = '<b>'.&mt('Changes to threshold(s) for problem tracking:').'</b><br />'; + my $setoutput = '<b>'.&mt('Changes to threshold(s) for problem tracking:').'</b><br/><br />'; foreach (keys %env) { next if ($_!~/^form\.(.+)\_setparmval$/); my $name = $1; @@ -1249,17 +1141,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]', '<b>'.$$threshold_titles{$shortname}.'</b>', - '<b>'.$value.'</b>').'<br />'; + '<b>'.$value.'</b>').'<br />'); } 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].', '<b>'.$name.'</b>','<b>'.$value.'</b>', - '<tt>'.$put_result.'</tt>').'<br />'; + '<tt>'.$put_result.'</tt>').'<br />',1); } } } - return $setoutput; + return &Apache::loncommon::confirmwrapper($setoutput); } sub getnormalmail { @@ -1525,39 +1417,6 @@ sub getrolechanges { 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) = @_; my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs); @@ -1814,90 +1673,6 @@ sub display_rolechanges { } 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) { - $r->print('<tr class="LC_info_row" style="display:none" id="logintitledet">'. - '<td class="LC_left_item">'.$lt{'user'}.'</td>'. - '<td class="LC_left_item">'.$lt{'role'}.'</td>'. - '<td class="LC_left_item">'.$lt{'sec'}.'</td></tr>'. - '<tr class="LC_info_row" id="logintitlesum">'. - '<td class="LC_left_item">'.$lt{'number'}.'</td>'. - '<td class="LC_left_item">'.$lt{'role'}.'</td>'. - '<td class="LC_left_item">'.$lt{'sec'}.'</td></tr>'); - 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}}, - '<td>'.$link.'</td>'. - '<td>'.$role.'</td>'. - '<td>'.$section.'</td>'); - } - } - } - } - 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"':''; - $r->print('<tr'.$css_class.' style="display:none;" id="logindet_'.$numlogin.'">'.$item.'</td></tr>'); - } - } - } - my $numrow = 0; - foreach my $role (sort(keys(%counts))) { - my $showrole = &Apache::lonnet::plaintext($role,$crstype); - if (ref($counts{$role}) eq 'HASH') { - foreach my $sec (sort { $b <=> $a } (keys(%{$counts{$role}}))) { - $numrow ++; - my $css_class = $numrow%2?' class="LC_odd_row"':''; - $r->print('<tr '.$css_class.' id="loginsum_'.$numrow.'">'. - '<td>'.$counts{$role}{$sec}.'</td>'. - '<td>'.$showrole.'</td>'. - '<td>'.$sec.'</td></tr>'); - } - } - } - $r->print('<input type="hidden" name="logincount" value="'.$numlogin. - '" /><input type="hidden" name="loginrow" value="'.$numrow. - '" />'); - } - } else { - $r->print('<tr class="LC_empty_row"><td>'. - &mt('There are no '.$interval). - '<input type="hidden" name="logincount" value="'.$logincount. - '." /></td></tr>'); - } - return; -} sub display_coursediscussion { my ($r,$newdiscussions,$unread,$countunread,$res_title,$itemserror) = @_; @@ -2059,8 +1834,6 @@ sub store_interval_setting { $interval_settings{$cid.':oldroleinterval'} = $env{'form.interval'}; } elsif ($context eq 'newroles') { $interval_settings{$cid.':newroleinterval'} = $env{'form.interval'}; - } elsif ($context eq 'crslogin') { - $interval_settings{$cid.':crslogininterval'} = $env{'form.interval'}; } else { $interval_settings{$cid.':interval'} = $env{'form.interval'}; } @@ -2068,19 +1841,19 @@ sub store_interval_setting { \%interval_settings,$udom,$uname); if ($outcome eq 'ok') { if (ref($interval_titles->{$context}) eq 'HASH') { - $result = &mt('New filter setting: [_1].','<b>'. - $interval_titles->{$context}->{$env{'form.interval'}}.'</b>').'<br />'; + $result = &Apache::lonhtmlcommon::confirm_success(&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 '.$context.' interval setting'. ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); - $result = &mt('Unable to set interval to [_1] due to [_2].', + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set interval to [_1] due to [_2].', '<b>'.$interval_titles->{$context}->{$env{'form.interval'}}.'</b>', - '<tt>'.$outcome.'</tt>.<br />'); + '<tt>'.$outcome.'</tt>'),1); } } - return $result; + return &Apache::loncommon::confirmwrapper($result); } sub store_discussion_setting { @@ -2092,20 +1865,20 @@ sub store_discussion_setting { my $outcome = &Apache::lonnet::put('nohist_whatsnew', \%discussion_settings,$udom,$uname); if ($outcome eq 'ok') { - $result = &mt('Count unread posts in discussions display set to [_1]', - '<b>'.&mt($env{'form.countunread'}).'</b>').'<br />'; + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Count unread posts in discussions display set to [_1]', + '<b>'.&mt($env{'form.countunread'}).'</b>').'<br />'); } else { my $lctype = lc(&Apache::loncommon::course_type()); &Apache::lonnet::logthis('Error saving whatsnew countunread setting'. ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); - $result = &mt('Unable to set "number unread posts display" to [_1]'. + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set "number unread posts display" to [_1]'. ' due to [_2].', '<b>'.&mt($env{'form.countunread'}).'</b>', - '<tt>'.$outcome.'</tt>.<br />'); + '<tt>'.$outcome.'</tt>'),1); } } - return $result; + return &Apache::loncommon::confirmwrapper($result); } sub store_courseinit_setting { @@ -2130,30 +1903,29 @@ 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 [_1]user's global preferences[_2].",'<b>','</b>'); + $result = &Apache::lonhtmlcommon::confirm_success(&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 [_1].' - ,'<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>'); + $result = &Apache::lonhtmlcommon::confirm_success(&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 '. 'setting: '.$outcome.' for '.$uname. ':'.$udom.' in '.$lctype.' '.$cid); if ($page_control eq 'global preferences') { - $result = &mt('Unable to set control of page display to [_1]'. + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set control of page display to [_1]'. ' due to [_2].', '<b>'.$page_control.'</b>', - '<tt>'.$outcome.'</tt>.<br />'); + '<tt>'.$outcome.'</tt>'),1); } else { - $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to [_1] due to [_2].' + $result = &Apache::lonhtmlcommon::confirm_success(&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 />'; + ,'<tt>'.$outcome.'</tt>'),1); } } } } - return $result; + return &Apache::loncommon::confirmwrapper($result); } sub start_box { @@ -2216,15 +1988,7 @@ sub start_box { <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgoldroleinterval&refpage='.$refpage.'">'.$lt{'chin'}.'</a></td> </tr>'); } - } elsif (($caller eq 'crslogin') && ($$show{$caller})) { - if ($$show{$caller}) { - $r->print(' - <tr> - <td class="LC_subheader" align="left"><span class="LC_nobreak"><label><input type="radio" name="logindetails" value="0" checked="checked" onclick="javascript:togglelogins();" /> '.&mt('Summary').'</label><label><input type="radio" name="logindetails" value="1" onclick="javascript:togglelogins();" /> '.&mt('Details').'</label></span></td><td class="LC_subheader"><a href="/adm/whatsnew?command=chgcrslogininterval&refpage='.$refpage.'">'.$lt{'chin'}.'</a></td> - </tr>'); - } } - $r->print(' <tr> <td colspan="2">