--- loncom/interface/lonwhatsnew.pm	2012/02/08 17:07:02	1.101.2.1.2.1
+++ loncom/interface/lonwhatsnew.pm	2011/04/15 13:57:18	1.104
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.101.2.1.2.1 2012/02/08 17:07:02 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.104 2011/04/15 13:57:18 bisitz 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 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",
@@ -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,11 +245,9 @@ 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">
-// <![CDATA[
 function change_display(caller,change) {
     caller.value = change;
     document.visible.submit();
@@ -284,52 +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>
 ';
     }
@@ -381,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;
@@ -513,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;
@@ -543,12 +461,6 @@ sub display_actions_box {
     }
     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';
@@ -562,7 +474,7 @@ sub display_actions_box {
 	    $threshold{'av_attempts'},$threshold{'degdiff'},
 	    '<br />',$threshold{'numstudents'});
 
-    my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin');
+    my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles');
 
     foreach my $key (keys(%{$checkallowed})) {
 	if ($key =~ /_section$/) { next; }
@@ -600,9 +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>
      &nbsp;&nbsp;<a href="javascript:changeAll('show');">$lt{'shal'}</a>
      <form method="post" name="visible" action="/adm/whatsnew">\n|);
@@ -631,7 +540,7 @@ sub display_actions_box {
             if ($displayed == $halfway) {
                 $r->print('</td><td>&nbsp;</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 ++; 
         }
     }
@@ -719,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 />');
     }
@@ -886,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);
@@ -913,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);
@@ -1515,39 +1418,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);
@@ -1603,13 +1473,13 @@ sub display_handgrade {
         foreach my $res (@{$tograde}) {
             $rowNum ++;
             my $css_class = $rowNum%2?' class="LC_odd_row"':'';
-            my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
-            my $linkurl=&Apache::lonnet::clutter($url);
-            $linkurl .= '?symb='.&escape($res);
+            my $linkurl='/adm/grades';
             if ($$ungraded{$res}{'enclink'}) {
-                $linkurl = 
-                    $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'};
-            } 
+                $linkurl.='?symb='.$$ungraded{$res}{'encsymb'};
+            } else {
+                $linkurl.='?symb='.&escape($res);
+            }
+            $linkurl.='&command=ungraded';
             $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) {
@@ -1804,92 +1674,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) {
-
-        my $hdr = '<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'};
-        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>');
-                        }
-                    }
-                }
-            }
-            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 .= '<tr'.$css_class.' style="display:none;"  id="logindet_'.$numlogin.'">'.$item.'</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"':'';
-                        $table .= '<tr '.$css_class.' id="loginsum_'.$numrow.'">'.
-                                  '<td>'.$counts{$role}{$sec}.'</td>'.
-                                  '<td>'.$showrole.'</td>'.
-                                  '<td>'.$sec.'</td></tr>';
-                   }
-                }
-            }
-            $r->print($hdr.'<input type="hidden" name="logincount" value="'.$numlogin.
-                      '" /><input type="hidden" name="loginrow" value="'.$numrow.
-                      '" /></td></tr>'.$table);
-        }
-    } 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) = @_;
@@ -2051,8 +1835,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'};
         }
@@ -2207,15 +1989,7 @@ sub start_box {
                 <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgoldroleinterval&amp;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();" />&nbsp;'.&mt('Summary').'</label><label><input type="radio" name="logindetails" value="1" onclick="javascript:togglelogins();" />&nbsp;'.&mt('Details').'</label></span></td><td class="LC_subheader"><a href="/adm/whatsnew?command=chgcrslogininterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
-              </tr>');
-        }
-    }
-
+     }
     $r->print('
               <tr>
                <td colspan="2">