[BACK]Return to lonwhatsnew.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonwhatsnew.pm between versions 1.16 and 1.27

version 1.16, 2005/06/03 19:33:37 version 1.27, 2005/07/15 06:11:16
Line 35  use Apache::lonhtmlcommon(); Line 35  use Apache::lonhtmlcommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::loncoursedata();  use Apache::loncoursedata();
 use Apache::lonnavmaps();  use Apache::lonnavmaps();
   use Apache::lonuserstate;
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
 use Time::Local;  use Time::Local;
   use GDBM_File;
   
 #----------------------------  #----------------------------
 # handler  # handler
Line 177  sub display_actions_box() { Line 179  sub display_actions_box() {
     }      }
   
     my %threshold = (      my %threshold = (
                       av_attempts => 0,                        av_attempts => 2,
                       degdiff => 0.01,                        degdiff => 0.5,
                       numstudents => 0,                        numstudents => 2,
                      );                       );
   
     my $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);      my $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
     my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);      my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
   
     unless ($env{'request.course.id'}) {      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;          return;
     }      }
       if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
       &GDBM_READER(),0640)) {
    my $furl=$bighash{'first_url'};
    $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 />');
    untie(%bighash);
       }
   
     my $result;      my $result;
   
Line 200  sub display_actions_box() { Line 208  sub display_actions_box() {
     if ($result) {      if ($result) {
         $r->print($result.'<hr width="100%" />');          $r->print($result.'<hr width="100%" />');
     }      }
       $r->rflush();
   
     &get_curr_thresholds(\%threshold,$cdom,$crs);      &get_curr_thresholds(\%threshold,$cdom,$crs);
     &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,%res_title);      &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,%res_title);
Line 259  END Line 268  END
         @bombs = sort { &cmp_title($a,$b,\%res_title) } @bombs;          @bombs = sort { &cmp_title($a,$b,\%res_title) } @bombs;
         foreach my $bomb (@bombs) {          foreach my $bomb (@bombs) {
             if ($bombnum %2 == 1) {              if ($bombnum %2 == 1) {
                  $rowColor = $rowColor1;   $rowColor = $rowColor1;
             } else {              } else {
                 $rowColor = $rowColor2;                  $rowColor = $rowColor2;
             }              }
Line 381  END Line 390  END
             } else {              } else {
                 $rowColor = $rowColor2;                  $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 ++;              $rowNum ++;
             $mailcount ++;              $mailcount ++;
         }          }
Line 499  sub display_config_box() { Line 508  sub display_config_box() {
 sub getitems {  sub getitems {
     my ($unread,$ungraded,$bombed,$triggered,$newdiscussions,$tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs,$res_title) = @_;      my ($unread,$ungraded,$bombed,$triggered,$newdiscussions,$tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs,$res_title) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
     my @allres=$navmap->retrieveResources();      # 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;});
     my %discussiontime = &Apache::lonnet::dump('discussiontimes',$cdom,$crs);      my %discussiontime = &Apache::lonnet::dump('discussiontimes',$cdom,$crs);
     my %lastread = &Apache::lonnet::dump('nohist_'.$env{'request.course.id'}.      my %lastread = &Apache::lonnet::dump('nohist_'.$env{'request.course.id'}.
                 '_discuss',$env{'user.domain'},$env{'user.name'},'lastread');                  '_discuss',$env{'user.domain'},$env{'user.name'},'lastread');
Line 527  sub getitems { Line 537  sub getitems {
         $$res_title{$symb} = $title;          $$res_title{$symb} = $title;
         my $ressymb = $resource->wrap_symb();          my $ressymb = $resource->wrap_symb();
 # Check for unread discussion postings  # Check for unread discussion postings
         if (defined($discussiontime{$ressymb})) {   if ($resource->hasDiscussion()) {
             push(@discussions,$ressymb);              push(@discussions,$ressymb);
             my $prevread = 0;              my $prevread = 0;
             my $unreadcount = 0;              my $unreadcount = 0;
Line 556  sub getitems { Line 566  sub getitems {
         if ($resource->is_problem()) {          if ($resource->is_problem()) {
             my $ctr = 0;              my $ctr = 0;
             my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);              my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
             my ($partlist,$handgrade,$responseType) = &Apache::grades::response_type($url,$symb);      my $partlist=$resource->parts();
             foreach my $student (keys(%$classlist)) {      my $handgradeable;
                 my ($uname,$udom) = split(/:/,$student);      foreach my $part (@$partlist) {
                 my %status=&Apache::grades::student_gradeStatus($url,$symb,$udom,$uname,$partlist);   if ($resource->handgrade($part) eq 'yes') {
                 my $submitted = 0;      $handgradeable=1; last;
                 my $ungraded = 0;   }
                 foreach (keys(%status)) {      }
                     $submitted = 1 if ($status{$_} ne 'nothing');      if ($handgradeable) {
                     $ungraded = 1 if ($status{$_} =~ /^ungraded/);   foreach my $student (keys(%$classlist)) {
                     my ($foo,$partid,$foo1) = split(/\./,$_);      my ($uname,$udom) = split(/:/,$student);
                     if ($status{'resource.'.$partid.'.submitted_by'} ne '') {      my %status=&Apache::grades::student_gradeStatus($url,$symb,$udom,$uname,$partlist);
                         $submitted = 0;      my $submitted = 0;
                     }      my $ungraded = 0;
                 }      foreach (keys(%status)) {
                 next if (!$submitted || !$ungraded);   $submitted = 1 if ($status{$_} ne 'nothing');
                 $ctr ++;   $ungraded = 1 if ($status{$_} =~ /^ungraded/);
             }   my ($foo,$partid,$foo1) = split(/\./,$_);
             if ($ctr) {   if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
                 $$ungraded{$symb}{count} = $ctr;      $submitted = 0;
                 $$ungraded{$symb}{title} = $title;   }
                 push(@{$tograde}, $symb);      }
             }      next if (!$submitted || !$ungraded);
       $ctr ++;
    }
    if ($ctr) {
       $$ungraded{$symb}{count} = $ctr;
       $$ungraded{$symb}{title} = $title;
       push(@{$tograde}, $symb);
    }
       }
         }          }
   
 # Check for bombs  # Check for bombs
         if ($resource->getErrors()) {          if ($resource->getErrors()) {
             my $errors = $resource->getErrors();              my $errors = $resource->getErrors();
             $errors =~ s/^,//;      $errors =~ s/^,//;
             my @bombs = split(/,/, $errors);              my @bombs = split(/,/, $errors);
             my $errorcount = scalar(@bombs);              my $errorcount = scalar(@bombs);
             my $errorlink = '<a href="/adm/email?display='.              my $errorlink = '<a href="/adm/email?display='.
Line 623  sub getitems { Line 641  sub getitems {
                 $stats{$part}{degdiff} = $degdiff;                  $stats{$part}{degdiff} = $degdiff;
                 $stats{$part}{attempts} = $av_attempts;                  $stats{$part}{attempts} = $av_attempts;
                 $stats{$part}{users} = $users;                  $stats{$part}{users} = $users;
                 my %resethash = &Apache::lonnet::restore($symb,'nohist_resourcetracker',$cdom,$crs);   $lastreset{$part} = $resourcetracker{$symb."\0".$part."\0resettime"};
                 $lastreset{$part} = &get_counter_resets(\%resethash,$part);  
                 $warning = 1;                  $warning = 1;
             }              }
         }          }
Line 665  sub getitems { Line 682  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 {  sub get_curr_thresholds {
     my ($threshold,$cdom,$crs) = @_;      my ($threshold,$cdom,$crs) = @_;
     my %coursesettings = &Apache::lonnet::dump('environment',      my %coursesettings = &Apache::lonnet::dump('environment',
Line 707  sub process_reset { Line 708  sub process_reset {
                      );                       );
     my @resets = ();      my @resets = ();
     my %titles = ();      my %titles = ();
     foreach my $key (keys %env) {      foreach my $key (keys(%env)) {
         next if ($key !~ /^form\.reset_(.+)$/);          next if ($key !~ /^form\.reset_(.+)$/);
         my $title = &Apache::lonnet::unescape($env{'form.title_'.$1});          my $title = &Apache::lonnet::unescape($env{'form.title_'.$1});
         my $reset_item = &Apache::lonnet::unescape($1);          my $reset_item = &Apache::lonnet::unescape($1);
         my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item);          my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item);
         my %resethash = ();  
         my %aggregates = ();          my %aggregates = ();
         my ($symb,$part) = split/\0/,$reset_item;          my ($symb,$part) = split(/\0/,$reset_item);
         foreach my $type (@agg_types) {          foreach my $type (@agg_types) {
             $aggregates{$reset_item."\0".$type} = 0;              $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,          my $putresult = &Apache::lonnet::put('nohist_resourcetracker',\%aggregates,
                           $dom,$crs);                            $dom,$crs);
         if ($putresult eq 'ok') {          if ($putresult eq 'ok') {
             my $storeresult = &Apache::lonnet::cstore(\%resethash,$symb,'nohist_resourcetracker',$dom,$crs);  
             $result .= $title.' -part '.$part.': ';              $result .= $title.' -part '.$part.': ';
             my %new_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item);              my %new_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item);
             foreach my $type (@agg_types) {              foreach my $type (@agg_types) {
Removed from v.1.16  
changed lines
  Added in v.1.27

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>