--- loncom/interface/lonwhatsnew.pm	2005/06/01 19:24:50	1.15
+++ loncom/interface/lonwhatsnew.pm	2005/06/09 18:41:08	1.21
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.15 2005/06/01 19:24:50 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.21 2005/06/09 18:41:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::loncoursedata();
 use Apache::lonnavmaps();
+use Apache::lonuserstate;
 use Apache::Constants qw(:common :http);
 use Time::Local;
 
@@ -165,6 +166,7 @@ sub display_actions_box() {
     my @tograde = ();
     my @bombs = ();
     my @warnings = ();
+    my %res_title = ();
 
     my $domain=&Apache::loncommon::determinedomain();
     my $function;
@@ -185,10 +187,14 @@ sub display_actions_box() {
     my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
 
     unless ($env{'request.course.id'}) {
-        $r->print('<br /><b><center>You are accessing an invalid course</center></b><br /><br />');
+        $r->print('<br /><b><center>You are accessing an invalid course.</center></b><br /><br />');
         return;
     }
 
+    my ($furl,$ferr)=
+           &Apache::lonuserstate::readmap($cdom.'/'.$crs);
+    $r->print('<font size="+1"><a href="'.$furl.'">Go to first resource</a></font><a href="/adm/preferences?action=changecourseinit"></font><br />Change your preferences</a> to suppress display of this screen when accessing courses as Course Coordinator in the future.<br /><hr />');
+
     my $result;
 
     if ($command eq 'reset') {
@@ -201,7 +207,7 @@ sub display_actions_box() {
     }
 
     &get_curr_thresholds(\%threshold,$cdom,$crs);
-    &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs);
+    &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,%res_title);
     my ($msgcount,$critmsgcount) = &getmail(\@newmsgs,\@critmsgs);
 
     $r->print('<br /><table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">');
@@ -255,7 +261,7 @@ END
      my $bombnum = 0;
      if (@bombs > 0) {
         $r->print('<tr bgcolor="#cccccc"><td><b><small>Resource</small></b></td><td align="right"><b><small>Number of errors</small></b></td></tr>');
-#        @bombs = sort { &cmp_title($a,$b) } @bombs;
+        @bombs = sort { &cmp_title($a,$b,\%res_title) } @bombs;
         foreach my $bomb (@bombs) {
             if ($bombnum %2 == 1) {
                  $rowColor = $rowColor1;
@@ -284,11 +290,11 @@ END
                </tr>
                 <tr>
                 <td bgcolor="#ffffff">
-                 <table width="100%" cellspacing="0" cellpadding="0" border="0">
+                 <table width="100%" cellspacing="2" cellpadding="2" border="0">
 END
     my $warningnum = 0;
     if (@warnings > 0) {
-#        @warnings = sort { &cmp_title($a,$b) } @warnings;
+        @warnings = sort { &cmp_title($a,$b,\%res_title) } @warnings;
         $r->print('<form name="reset_tracking" method="post">'.
                  '  <input type="hidden" name="action" value="reset" />'."\n");
         $r->print('<tr bgcolor="#cccccc"><td><b><small>Resource</small></b></td><td align="right"><b><small>Part</small></b></td><td align="right"><b><small>Num. students</small></b></td><td align="right"><b><small>Av. Attempts</small></b></td><td align="right"><b><small>Deg. Diff</small></b></td><td align="right"><b><small>Last Reset</small></b></td><td align="right"><b><small>Reset Count?</small></b></td></tr>');
@@ -331,7 +337,7 @@ END
                                                                                   
     if (@newdiscussions > 0) {
         $r->print('<tr bgcolor="#cccccc"><td><b><small>Location</small></b></td><td><b><small>Type</small></b><td align="right"><b><small>Number of new posts</small></b></td></tr>');
-#        @newdiscussions = sort { &cmp_title($a,$b) } @newdiscussions;
+        @newdiscussions = sort { &cmp_title($a,$b,\%res_title) } @newdiscussions;
         my $rowNum = 0;
         foreach my $ressymb (@newdiscussions) {
             my $forum_title = $unread{$ressymb}{'title'};
@@ -380,7 +386,7 @@ END
             } else {
                 $rowColor = $rowColor2;
             }
-            $r->print('<tr bgcolor="'.$rowColor.'"><td valign="top"><small>'.$mailcount.'. &nbsp;<small></td><td valign="top"><small><a href="/adm/mail?">'.$msg->{'shortsub'}.'</a>&nbsp; &nbsp;</small></td><td valign="top"><small>&nbsp;'.$msg->{'from'}.'@'.$msg->{'fromdom'}.'&nbsp;</small></td><td valign="top"><small>'.$msg->{'sendtime'}.'</small></td></tr>');
+            $r->print('<tr bgcolor="'.$rowColor.'"><td valign="top"><small>'.$mailcount.'. &nbsp;<small></td><td valign="top"><small><a href="/adm/communicate">'.$msg->{'shortsub'}.'</a>&nbsp; &nbsp;</small></td><td valign="top"><small>&nbsp;'.$msg->{'from'}.'@'.$msg->{'fromdom'}.'&nbsp;</small></td><td valign="top"><small>'.$msg->{'sendtime'}.'</small></td></tr>');
             $rowNum ++;
             $mailcount ++;
         }
@@ -496,7 +502,7 @@ sub display_config_box() {
 }
 
 sub getitems {
-    my ($unread,$ungraded,$bombed,$triggered,$newdiscussions,$tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs) = @_;
+    my ($unread,$ungraded,$bombed,$triggered,$newdiscussions,$tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs,$res_title) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
     my @allres=$navmap->retrieveResources();
     my %discussiontime = &Apache::lonnet::dump('discussiontimes',$cdom,$crs);
@@ -508,7 +514,6 @@ sub getitems {
 
     my %resourcetracker =  &Apache::lonnet::dump('nohist_resourcetracker',
                $cdom,$crs);
-    my %res_title;
     my $warningnum = 0;
     foreach my $key (keys(%lastread)) {
         my $newkey = $key;
@@ -524,10 +529,10 @@ sub getitems {
         %{$$triggered{$symb}} = ();
         $$triggered{$symb}{numparts} = 0;
         my $title = $resource->compTitle();
-        $res_title{$symb} = $title;
+        $$res_title{$symb} = $title;
         my $ressymb = $resource->wrap_symb();
 # Check for unread discussion postings
-        if (defined($discussiontime{$ressymb})) {
+	if ($resource->hasDiscussion()) {
             push(@discussions,$ressymb);
             my $prevread = 0;
             my $unreadcount = 0;
@@ -556,7 +561,14 @@ sub getitems {
         if ($resource->is_problem()) {
             my $ctr = 0;
             my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
-            my ($partlist,$handgrade,$responseType) = &Apache::grades::response_type($url,$symb);
+            my ($partlist,$handgrade,$responseType) = 
+		&Apache::grades::response_type($url,$symb);
+	    my $handgradeable;
+	    foreach my $value (values(%{$handgrade})) {
+		if ($value eq 'yes') { $handgradeable=1; last; }
+	    }
+	    next if (!$handgradeable);
+ 
             foreach my $student (keys(%$classlist)) {
                 my ($uname,$udom) = split(/:/,$student);
                 my %status=&Apache::grades::student_gradeStatus($url,$symb,$udom,$uname,$partlist);
@@ -617,13 +629,13 @@ sub getitems {
             }
             if ($users > 0) {
                 $av_attempts = $attempts/$users;
+                $av_attempts = sprintf("%.2f",$av_attempts);
             }
             if ((($degdiff ne '' && $degdiff >= $$threshold{'degdiff'}) || ($av_attempts ne '' && $av_attempts >= $$threshold{'av_attempts'})) && ($users >= $$threshold{'numstudents'})) {
                 $stats{$part}{degdiff} = $degdiff;
                 $stats{$part}{attempts} = $av_attempts;
                 $stats{$part}{users} = $users;
-                my %resethash = &Apache::lonnet::restore($symb,'nohist_resourcetracker',$cdom,$crs);
-                $lastreset{$part} = &get_counter_resets(\%resethash,$part);
+		$lastreset{$part} = $resourcetracker{$symb."\0".$part."\0resettime"};
                 $warning = 1;
             }
         }
@@ -664,22 +676,6 @@ sub getitems {
     }
 }
 
-sub get_counter_resets {
-    my ($resethash,$part) = @_;
-    my $lastreset = 'None';
-    if ($$resethash{'version'}) {
-        for (my $version=1;$version<=$$resethash{'version'};$version++) {
-            if (exists($$resethash{$version.':'.$part."\0".'prev_attempts'})) {
-                $lastreset = $$resethash{$version.':timestamp'};
-            }
-        }
-    }
-    unless ($lastreset eq 'None') {
-        $lastreset = localtime($lastreset);
-    }
-    return $lastreset;
-}
-
 sub get_curr_thresholds {
     my ($threshold,$cdom,$crs) = @_;
     my %coursesettings = &Apache::lonnet::dump('environment',
@@ -706,22 +702,20 @@ sub process_reset {
                      );
     my @resets = ();
     my %titles = ();
-    foreach my $key (keys %env) {
+    foreach my $key (keys(%env)) {
         next if ($key !~ /^form\.reset_(.+)$/);
         my $title = &Apache::lonnet::unescape($env{'form.title_'.$1});
         my $reset_item = &Apache::lonnet::unescape($1);
         my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item);
-        my %resethash = ();
         my %aggregates = ();
-        my ($symb,$part) = split/\0/,$reset_item;
+        my ($symb,$part) = split(/\0/,$reset_item);
         foreach my $type (@agg_types) {
             $aggregates{$reset_item."\0".$type} = 0;
-            $resethash{$part."\0".'prev_'.$type} = $curr_aggregates{$reset_item."\0".$type};
         }  
+	$aggregates{$reset_item."\0".'resettime'} = time;
         my $putresult = &Apache::lonnet::put('nohist_resourcetracker',\%aggregates,
                           $dom,$crs);
         if ($putresult eq 'ok') {
-            my $storeresult = &Apache::lonnet::cstore(\%resethash,$symb,'nohist_resourcetracker',$dom,$crs);
             $result .= $title.' -part '.$part.': ';
             my %new_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item);
             foreach my $type (@agg_types) {
@@ -824,7 +818,8 @@ sub getmail {
 }
 
 sub cmp_title {
-    my ($atitle,$btitle) = (lc($_[0]->compTitle),lc($_[1]->compTitle));
+    my ($a,$b,$res_title) = @_;
+    my ($atitle,$btitle) = (lc($$res_title{$a}),lc($$res_title{$b}));
     $atitle=~s/^\s*//;
     $btitle=~s/^\s*//;
     return $atitle cmp $btitle;