--- loncom/interface/lonwhatsnew.pm 2005/04/11 15:33:46 1.8
+++ loncom/interface/lonwhatsnew.pm 2005/12/22 22:39:49 1.38.2.2
@@ -1,5 +1,5 @@
#
-# $Id: lonwhatsnew.pm,v 1.8 2005/04/11 15:33:46 albertel Exp $
+# $Id: lonwhatsnew.pm,v 1.38.2.2 2005/12/22 22:39:49 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,8 +35,10 @@ use Apache::lonhtmlcommon();
use Apache::lonlocal;
use Apache::loncoursedata();
use Apache::lonnavmaps();
+use Apache::lonuserstate;
use Apache::Constants qw(:common :http);
use Time::Local;
+use GDBM_File;
#----------------------------
# handler
@@ -54,34 +56,48 @@ sub handler {
my $command = $env{'form.command'};
- if ($command eq '') {
- $command = "info";
- }
-
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- $r->print(&display_header());
- if (! (($env{'request.course.fn'}) && (&Apache::lonnet::allowed('vsa',$env{'request.course.id'})))) {
- # Not in a course, or not allowed to modify parms
- $env{'user.error.msg'}="/adm/whatsnew:vsa:0:0:Cannot display student activity";
+ if (! (($env{'request.course.fn'}) && (&Apache::lonnet::allowed('bre',$env{'request.course.id'})))) {
+ # Not in a course, or not allowed to view action items
+ $env{'user.error.msg'}="/adm/whatsnew:bre:0:0:Cannot display what's new screen";
return HTTP_NOT_ACCEPTABLE;
}
+ my %checkallowed = (
+ coursediscussion => &Apache::lonnet::allowed('pch',$env{'request.course.id'}),
+ handgrading => &Apache::lonnet::allowed('mgr',$env{'request.course.id'}),
+ abovethreshold => &Apache::lonnet::allowed('vgr',$env{'request.course.id'}),
+ haserrors => &Apache::lonnet::allowed('opa',$env{'request.course.id'}),
+ versionchanges => &Apache::lonnet::allowed('opa',$env{'request.course.id'}),
+ coursenormalmail => 1,
+ coursecritmail => 1,
+ );
+
+ $r->print(&display_header($command,\%checkallowed));
+
&Apache::lonhtmlcommon::clear_breadcrumbs();
- if ($command eq 'config') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/whatsnew',
+ text=>"Display Action Items"});
+ if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/whatsnew?command=config',
- text=>"Configure display"});
+ ({href=>'/adm/whatsnew?command=chgthreshold',
+ text=>"Change thresholds"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Course Action Items','Course_Action_Items_Config'));
- } else {
+ (undef,'Course Action Items','Course_Action_Items_Thresholds'));
+ } elsif (($command eq 'chginterval') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/whatsnew?command=info',
- text=>"Display Action Items"});
+ ({href=>'/adm/whatsnew?command=chginterval',
+ text=>"Change interval"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs
+ (undef,'Course Action Items','Course_Action_Items_Intervals'));
+ } else {
$r->print(&Apache::lonhtmlcommon::breadcrumbs
(undef,'Course Action Items','Course_Action_Items_Display'));
}
- &display_main_box($r,$command);
+ &display_main_box($r,$command,\%checkallowed);
+ return OK;
}
#------------------------------
@@ -91,33 +107,39 @@ sub handler {
#------------------------------
sub display_main_box {
- my ($r,$command) = @_;
+ my ($r,$command,$checkallowed) = @_;
my $domain=&Apache::loncommon::determinedomain();
- my $tabbg=&Apache::loncommon::designparm('coordinator.tabbg',$domain);
- my $selconfig;
- my $selinfo;
- if ($command eq 'config') {
- $selinfo = 'selected="selected"';
- } else {
- $selconfig = 'selected="selected"';
- }
- my $picker = ('
-
');
-
+ my $function = &Apache::loncommon::get_users_function();
+ my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
+
$r->print('');
-
- if ($command eq 'config') {
- &display_config_box($r,$picker);
+
+ my %threshold_titles = (
+ av_attempts => 'Average number of attempts',
+ degdiff => 'Degree of difficulty',
+ numstudents => 'Total number of students with submissions',
+ );
+
+ my %interval_titles = (
+ -1 => 'since start of course',
+ 2592000 => 'since last month',
+ 604800 => 'since last week',
+ 86400 => 'since yesterday',
+ );
+
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+ if (($command eq 'chgthreshold') &&
+ (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
+ &display_threshold_config($r,$command,$tabbg,\%threshold_titles,
+ $cdom,$crs);
+ } elsif (($command eq 'chginterval') &&
+ (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {
+ &display_interval_config($r,\%interval_titles);
} else {
- &display_actions_box($r,$picker);
+ &display_actions_box($r,$tabbg,$command,\%threshold_titles,
+ \%interval_titles,$cdom,$crs,$checkallowed);
}
$r->print(<
@@ -136,12 +158,36 @@ END_OF_BLOCK
#-------------------------------
sub display_header{
+ my ($command,$checkallowed) = @_;
my $html=&Apache::lonxml::xmlbegin();
my $bodytag=&Apache::loncommon::bodytag('Course Action Items');
+ my $scripttag;
+ unless ($command eq 'chgthreshold' || $command eq 'chginterval') {
+ $scripttag = <<"END";
+
+';
+ }
return(<
Course Action Items
+$scripttag
$bodytag
ENDHEAD
@@ -155,337 +201,689 @@ ENDHEAD
#-------------------------------
sub display_actions_box() {
- my ($r,$picker) = @_;
+ my ($r,$tabbg,$command,$threshold_titles,$interval_titles,
+ $cdom,$crs,$checkallowed) = @_;
my $rowColor1 = "#ffffff";
my $rowColor2 = "#eeeeee";
- my $rowColor;
+
+ my $udom = $env{'user.domain'};
+ my $uname = $env{'user.name'};
+ my $cid = $env{'request.course.id'};
+
+ my %lt = &Apache::lonlocal::texthash(
+ 'yacc' => 'You are accessing an invalid course.',
+ 'gtfr' => 'Go to first resource',
+ 'chyp' => 'Change your preferences',
+ 'tsup' => 'to suppress display of this screen when accessing'.
+ ' this course in the future.',
+ 'hial' => 'Hide all',
+ 'shal' => 'Show all',
+ );
my %unread = ();
my %ungraded = ();
my %bombed = ();
+ my %triggered = ();
+ my %changed = ();
my @newmsgs = ();
my @critmsgs = ();
my @newdiscussions = ();
my @tograde = ();
my @bombs = ();
+ my @warnings = ();
+ my $msgcount = 0;
+ my $critmsgcount = 0;
- my $domain=&Apache::loncommon::determinedomain();
- my $function;
- if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
- $function='coordinator';
+ my %res_title = ();
+ my %show = ();
+ my $needitems = 0;
+ my $boxcount = 0;
+
+ my %threshold = (
+ av_attempts => 2,
+ degdiff => 0.5,
+ numstudents => 2,
+ );
+
+ unless ($cid) {
+ $r->print(' '.$lt{'yacc'}.'
');
+ return;
+ }
+
+ if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
+ &GDBM_READER(),0640)) {
+ my $furl=$bighash{'first_url'};
+ $r->print(''.$lt{'gtfr'}.
+ ''.
+ ' '.$lt{'chyp'}.' '.$lt{'tsup'}.'
');
+ untie(%bighash);
}
- if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
- $function='admin';
+
+ my $result;
+
+ if ($command eq 'reset') {
+ $result = &process_reset($cdom,$crs);
+ } elsif ($command eq 'update') {
+ $result = &process_update($cdom,$crs,$threshold_titles);
+ } elsif ($command eq 'newinterval') {
+ $result = &store_interval_setting($uname,$udom,$cid,$interval_titles);
}
- my $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
- my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
+ my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed);
- &getitems(\%unread,\%ungraded,\%bombed,\@newdiscussions,\@tograde,\@bombs);
- my ($msgcount,$critmsgcount) = &getmail(\@newmsgs,\@critmsgs);
+ unless ($store_result eq 'ok') {
+ &Apache::lonnet::logthis('Error storing whatsnew settings: '.
+ $store_result.' for '.'user '.$uname.':'.$udom.' in course '.$cid);
+ $result .= &mt('Unable to store visibility settings due to [_1]',
+ $store_result);
+ }
- unless ($env{'request.course.id'}) {
- $r->print(' You are accessing an invalid course
');
- return;
+ if ($result) {
+ $r->print($result.' ');
}
+ $r->rflush();
- $r->print(''.$picker.'
');
-## UNREAD COURSE DISCUSSION POSTS ##
- $r->print(<<"END");
-
-
-
-
- Unread course discussion posts: |
-
-
-
-
-END
+ 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 = 1;
+
+ my %headings = &Apache::lonlocal::texthash(
+ coursediscussion => 'Unread course discussion posts',
+ handgrading => 'Problems requiring handgrading',
+ haserrors => 'Problems with errors',
+ versionchanges => 'Resources in course with version changes '.$interval,
+ coursenormalmail => 'New course messages',
+ coursecritmail => 'New critical messages in course',
+ );
- if (@newdiscussions > 0) {
- $r->print('Location | Type | Number of new posts | ');
-# @newdiscussions = sort { &cmp_title($a,$b) } @newdiscussions;
- my $rowNum = 0;
- foreach my $ressymb (@newdiscussions) {
- my $forum_title = $unread{$ressymb}{'title'};
- my $type = 'Resource';
- my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb);
- if ($feedurl =~ /bulletinboard/) {
- $type = 'Bulletin Board';
- }
- my $unreadnum = keys(%{$unread{$ressymb}});
- $unreadnum = $unreadnum - 2;
- if ($unreadnum > 0) {
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
- $r->print(''.$forum_title.': | '.$type.' | '.$unreadnum.' | ');
- $rowNum ++;
+ if ($$checkallowed{'abovethreshold'}) {
+ &get_curr_thresholds(\%threshold,$cdom,$crs);
+ }
+
+ $headings{'abovethreshold'} = &mt('Problems with av. attempts').' ≥ '.$threshold{'av_attempts'}.' '.&mt('or deg. difficulty').' ≥ '.$threshold{'degdiff'}.' '.&mt('and total number of students with submissions').' ≥ '.$threshold{'numstudents'};
+
+ my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail');
+
+ foreach my $key (keys(%{$checkallowed})) {
+ $show{$key} = 0;
+ if ($$checkallowed{$key}) {
+ unless ($display_settings{$cid.':'.$key} eq 'hide') {
+ $show{$key} = 1;
}
}
- } else {
- $r->print(' No unread posts in course discussions
| ');
}
- $r->print(' | | ');
-
-## UNGRADED ITEMS ##
- $r->print(<
-
-
-
- Problems requiring handgrading: |
-
-
-
-END
- if (@tograde > 0) {
- $r->print('Problem Name | Number ungraded | ');
- my $rowNum = 0;
- foreach my $res (@tograde) {
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
+ foreach my $item (@actionorder) {
+ unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail') {
+ if ($show{$item}) {
+ $needitems = 1;
+ last;
}
- my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
- my $linkurl=&Apache::lonnet::clutter($url);
- $linkurl .= '?symb='.&Apache::lonnet::escape($res);
+ }
+ }
- $r->print(''.$ungraded{$res}{title}.' | '.$ungraded{$res}{count}.' | ');
- $rowNum ++;
+ if ($needitems) {
+ &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
+ }
+ if ($show{'coursenormalmail'}) {
+ &getnormalmail(\@newmsgs);
+ }
+ if ($show{'coursecritmail'}) {
+ &getcritmail(\@critmsgs);
+ }
+
+ $r->print(qq|$lt{'hial'}
+ $lt{'shal'}
+ | | |
');
-## BOMBS ##
- $r->print(<<"END");
-
-
-
-
-
- Problems with errors |
-
-
-
-
-END
- my $bombnum = 0;
- if (@bombs > 0) {
-# @bombs = sort { &cmp_title($a,$b) } @bombs;
- foreach my $bomb (@bombs) {
- if ($bombnum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
+ $r->print('
');
+
+ my $displayed = 0;
+ my $totalboxes = keys(%{$checkallowed});
+ my $halfway = int($totalboxes/2) + $totalboxes%2;
+ foreach my $actionitem (@actionorder) {
+ if ($$checkallowed{$actionitem}) {
+ if ($displayed == $halfway) {
+ $r->print(' | | ');
}
- $r->print(' | '.$bombed{$bomb}{errorlink}.' | ');
- $bombnum ++;
+ &display_launcher($r,$actionitem,$checkallowed,$tabbg,$rowColor1,$rowColor2,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread);
+ $displayed ++;
}
- } else {
- $r->print(' No problems with errors
| ');
}
- $r->print('
| ');
+ $r->print('
+ |
+ |
+
+
+
+
+ ');
+}
- $r->print(' | ');
+#-------------------------------
+# display_threshold_config
+#
+# Display the threshold setting screen
+#
+#-------------------------------
+
+sub display_threshold_config {
+ my ($r,$command,$tabbg,$threshold_titles,$cdom,$crs) = @_;
+ my %threshold = ();
+ my $rowColor1 = "#ffffff";
+ my $rowColor2 = "#eeeeee";
+ my $rowColor;
-## MESSAGES ##
- $r->print(<
+ my @thresholditems = ("av_attempts","degdiff","numstudents");
+ my %threshold_titles = (
+ av_attempts => 'Average number of attempts',
+ degdiff => 'Degree of difficulty',
+ numstudents => 'Total number of students with submissions',
+ );
+ &get_curr_thresholds(\%threshold,$cdom,$crs);
+
+ $r->print('
|
-
- ');
- $r->print('');
+ return;
}
sub getitems {
- my ($unread,$ungraded,$bombed,$newdiscussions,$tograde,$bombs) = @_;
+ my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions,
+ $tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs,
+ $res_title,$show,$starttime,$countunread) = @_;
my $navmap = Apache::lonnavmaps::navmap->new();
- my @allres=$navmap->retrieveResources();
- my %discussiontime = &Apache::lonnet::dump('discussiontimes',
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
- my %lastread = &Apache::lonnet::dump('nohist_'.$env{'request.course.id'}.'_discuss',$env{'user.domain'},$env{'user.name'},'lastread');
- my %lastreadtime = ();
- my @discussions = ();
- my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();
-
- foreach my $key (keys(%lastread)) {
- my $newkey = $key;
- $newkey =~ s/_lastread$//;
- $lastreadtime{$newkey} = $lastread{$key};
+ # 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 %lastreadtime;
+ my %resourcetracker;
+ my $discussiontime;
+
+# Resource version changes
+ if ($$show{'versionchanges'}) {
+ &checkversions($cdom,$crs,$navmap,$changed,$starttime);
+ }
+
+ if ($$show{'coursediscussion'}) {
+ my %lastread = &Apache::lonnet::dump('nohist_'.
+ $env{'request.course.id'}.'_discuss',
+ $env{'user.domain'},$env{'user.name'},'lastread');
+ foreach my $key (keys(%lastread)) {
+ my $newkey = $key;
+ $newkey =~ s/_lastread$//;
+ $lastreadtime{$newkey} = $lastread{$key};
+ }
+ }
+
+ if ($$show{'abovethreshold'}) {
+ %resourcetracker = &Apache::lonnet::dump('nohist_resourcetracker',
+ $cdom,$crs);
}
+
+ my $warningnum = 0;
foreach my $resource (@allres) {
my $result = '';
my $applies = 0;
my $symb = $resource->symb();
%{$$bombed{$symb}} = ();
%{$$ungraded{$symb}} = ();
+ %{$$triggered{$symb}} = ();
+ $$triggered{$symb}{numparts} = 0;
my $title = $resource->compTitle();
+ $$res_title{$symb} = $title;
my $ressymb = $resource->wrap_symb();
-# Check for unread discussion postings
- if (defined($discussiontime{$ressymb})) {
- push(@discussions,$ressymb);
- my $prevread = 0;
- my $unreadcount = 0;
- %{$$unread{$ressymb}} = ();
- $$unread{$ressymb}{'title'} = $title;
- $$unread{$ressymb}{'symb'} = $symb;
- if (defined($lastreadtime{$ressymb})) {
- $prevread = $lastreadtime{$ressymb};
- }
- my %contrib = &Apache::lonnet::restore($ressymb,$env{'request.course.id'},
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
- if ($contrib{'version'}) {
- for (my $id=1;$id<=$contrib{'version'};$id++) {
- unless (($contrib{'hidden'}=~/\.$id\./) || ($contrib{'deleted'}=~/\.$id\./)) {
- if ($prevread <$contrib{$id.':timestamp'}) {
- $$unread{$ressymb}{$unreadcount} = $id.': '.$contrib{$id.':subject'};
- $unreadcount ++;
- push(@{$newdiscussions}, $ressymb);
- }
- }
- }
- }
+
+# Check if there are unread discussion postings
+ if ($$show{'coursediscussion'}) {
+ &check_discussions($cdom,$crs,$resource,$symb,$ressymb,$title,
+ $newdiscussions,$unread);
}
# Check for ungraded problems
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);
- foreach my $student (keys(%$classlist)) {
- my ($uname,$udom) = split(/:/,$student);
- my %status=&Apache::grades::student_gradeStatus($url,$symb,$udom,$uname,$partlist);
- my $submitted = 0;
- my $graded = 0;
- foreach (keys(%status)) {
- $submitted = 1 if ($status{$_} ne 'nothing');
- $graded = 1 if ($status{$_} !~ /^correct/);
- my ($foo,$partid,$foo1) = split(/\./,$_);
- if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
- $submitted = 0;
+ if ($$show{'handgrading'}) {
+ &check_handgraded($resource,$symb,$title,$cdom,$crs,$ungraded,
+ $tograde);
+ }
+ }
+
+# Check for bombs
+ if ($$show{'haserrors'}) {
+ &check_bombed($resource,$symb,$title,$bombs,$bombed);
+ }
+
+# Maxtries and degree of difficulty for problem parts, unless handgradeable
+ if ($$show{'abovethreshold'}) {
+ &check_thresholds($resource,$symb,\%resourcetracker,$triggered,
+ $threshold,$warnings,$warningnum,$rowColor1,$rowColor2);
+ }
+
+ }
+ my $hasdiscussion = @{$newdiscussions};
+ if ($$show{'coursediscussion'} && $hasdiscussion) { # Get time of last post;
+ $discussiontime = $navmap->{DISCUSSION_TIME};
+ foreach my $ressymb (@{$newdiscussions}) {
+ $$unread{$ressymb}{'lastpost'} = $$discussiontime{$ressymb};
+ }
+ if ($countunread) { #Get count of unread postings for each resource
+ my $discussiondata = $navmap->get_discussion_data();
+ foreach my $ressymb (@{$newdiscussions}) {
+ &get_discussions($cdom,$crs,$discussiondata,$ressymb,
+ $unread,\%lastreadtime);
+ }
+ }
+ }
+}
+
+sub check_discussions {
+ my ($cdom,$crs,$resource,$symb,$ressymb,$title,$newdiscussions,
+ $unread) = @_;
+ if ($resource->hasDiscussion()) {
+ %{$$unread{$ressymb}} = ();
+ $$unread{$ressymb}{'title'} = $title;
+ $$unread{$ressymb}{'symb'} = $symb;
+ push(@{$newdiscussions}, $ressymb);
+ }
+}
+
+sub get_discussions {
+ my ($cdom,$crs,$discussiondata,$ressymb,$unread,$lastreadtime) = @_;
+ my $prevread = 0;
+ my $unreadcount = 0;
+ if (defined($$lastreadtime{$ressymb})) {
+ $prevread = $$lastreadtime{$ressymb};
+ }
+ my $version = $$discussiondata{'version:'.$ressymb};
+ if ($version) {
+ my $hiddenflag = 0;
+ my $deletedflag = 0;
+ my ($hidden,$deleted);
+ for (my $id=$version; $id>0; $id--) {
+ my $vkeys=$$discussiondata{$id.':keys:'.$ressymb};
+ my @keys=split(/:/,$vkeys);
+ if (grep/^hidden$/,@keys) {
+ unless ($hiddenflag) {
+ $hidden = $$discussiondata{$id.':'.$ressymb.':hidden'};
+ $hiddenflag = 1;
+ }
+ } elsif (grep/^deleted$/,@keys) {
+ unless ($deletedflag) {
+ $deleted = $$discussiondata{$id.':'.$ressymb.':deleted'};
+ $deletedflag = 1;
+ }
+ } else {
+ unless (($hidden =~/\.$id\./) || ($deleted =~/\.$id\./)) {
+ if ($prevread <$$discussiondata{$id.':'.$ressymb.':timestamp'}) {
+ $unreadcount ++;
+ $$unread{$ressymb}{$unreadcount} = $id.': '.
+ $$discussiondata{$id.':'.$ressymb.':subject'};
}
}
- next if (!$submitted || !$graded);
- $ctr ++;
}
- if ($ctr) {
- $$ungraded{$symb}{count} = $ctr;
+ }
+ $$unread{$ressymb}{'unreadcount'} = $unreadcount;
+ }
+}
+
+
+sub check_handgraded {
+ my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_;
+ if ($resource->is_problem()) {
+ my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+ my $partlist=$resource->parts();
+ my $handgradeable;
+ foreach my $part (@$partlist) {
+ if ($resource->handgrade($part) eq 'yes') {
+ $handgradeable=1; last;
+ }
+ }
+ if ($handgradeable) {
+ my @ungraded = &Apache::bridgetask::get_queue_symb_status(
+ 'gradingqueue',$symb,$cdom,$cnum);
+ if (@ungraded > 0) {
+ $$ungraded{$symb}{count} = scalar(@ungraded);
$$ungraded{$symb}{title} = $title;
push(@{$tograde}, $symb);
}
}
+ }
+}
-# Check for bombs
- if ($resource->getErrors()) {
- my $errors = $resource->getErrors();
- my @bombs = split(/,/, $errors);
- my $errorcount = scalar(@bombs);
- my $errorlink = '';
- $$bombed{$symb}{errorcount} = $errorcount;
- $$bombed{$symb}{errorlink} = $errorlink;
- push(@{$bombs}, $symb);
+sub check_bombed {
+ my ($resource,$symb,$title,$bombs,$bombed) = @_;
+ if ($resource->getErrors()) {
+ my $errors = $resource->getErrors();
+ $errors =~ s/^,//;
+ my @bombs = split(/,/, $errors);
+ my $errorcount = scalar(@bombs);
+ my $errorlink = ''.
+ $title.'';
+ $$bombed{$symb}{errorcount} = $errorcount;
+ $$bombed{$symb}{errorlink} = $errorlink;
+ push(@{$bombs}, $symb);
+ }
+}
+
+sub check_thresholds {
+ my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings,
+ $warningnum,$rowColor1,$rowColor2) = @_;
+# Compile maxtries and degree of difficulty for problem parts, unless handgradeable
+ my @parts = @{$resource->parts()};
+ my %stats;
+ my %lastreset = ();
+ my $warning = 0;
+ my $rowColor;
+ foreach my $part (@parts) {
+ if ($resource->handgrade($part) eq 'yes') {
+ next;
+ }
+ %{$stats{$part}} = ();
+ my ($attempts,$users,$corrects,$degdiff,$av_attempts);
+ if (exists($$resourcetracker{$symb."\0".$part."\0attempts"})) {
+ $attempts = $$resourcetracker{$symb."\0".$part."\0attempts"};
+ }
+ if (exists($$resourcetracker{$symb."\0".$part."\0users"})) {
+ $users = $$resourcetracker{$symb."\0".$part."\0users"};
+ }
+ if (exists($$resourcetracker{$symb."\0".$part."\0correct"})) {
+ $corrects = $$resourcetracker{$symb."\0".$part."\0correct"};
+ }
+ if ($attempts > 0) {
+ $degdiff = 1 - ($corrects/$attempts);
+ $degdiff = sprintf("%.2f",$degdiff);
+ }
+ 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;
+ $lastreset{$part} = $$resourcetracker{$symb."\0".$part."\0resettime"};
+ if ($lastreset{$part}) {
+ $lastreset{$part} = &Apache::lonnavmaps::timeToHumanString($lastreset{$part});
+ }
+ $warning = 1;
+ }
+ }
+ if ($warning) {
+ if ($warningnum %2 == 1) {
+ $rowColor = $rowColor1;
+ } else {
+ $rowColor = $rowColor2;
+ }
+ $$triggered{$symb}{title} = $resource->title;
+ foreach my $part (@parts) {
+ if (exists($stats{$part}{users})) {
+ my $resetname = 'reset_'.&Apache::lonnet::escape($symb."\0".$part);
+ my $resettitle = 'title_'.&Apache::lonnet::escape($symb."\0".$part);
+ if ($$triggered{$symb}{numparts}) {
+ $$triggered{$symb}{text} .= ''."\n";
+ }
+ if (@parts > 1) {
+ $$triggered{$symb}{text} .= '
+ part - '.$part.' | ';
+ } else {
+ $$triggered{$symb}{text} .= '
+ single part | ';
+ }
+ $$triggered{$symb}{text} .= '
+ '.$stats{$part}{users}.' |
+ '.$stats{$part}{attempts}.' |
+ '.$stats{$part}{degdiff}.' |
+ '.$lastreset{$part}.' |
+ |
+
';
+ $$triggered{$symb}{numparts} ++;
+ }
+ }
+ push(@{$warnings},$symb);
+ $warningnum ++;
+ }
+}
+
+
+sub get_curr_thresholds {
+ my ($threshold,$cdom,$crs) = @_;
+ my %coursesettings = &Apache::lonnet::dump('environment',
+ $cdom,$crs,'internal.threshold');
+ if (exists($coursesettings{'internal.threshold_av_attempts'})) {
+ $$threshold{'av_attempts'} = $coursesettings{'internal.threshold_av_attempts'};
+ }
+ if (exists($coursesettings{'internal.threshold_degdiff'})) {
+ $$threshold{'degdiff'} = $coursesettings{'internal.threshold_degdiff'};
+ }
+ if (exists($coursesettings{'internal.threshold_numstudents'})) {
+ $$threshold{'numstudents'} = $coursesettings{'internal.threshold_numstudents'};
+ }
+}
+
+sub get_curr_interval {
+ my ($uname,$udom,$cid);
+ my $interval;
+ my %settings = &Apache::lonnet::dump('nohist_whatsnew',$uname,$udom,$cid,':interval');
+ my ($tmp) = %settings;
+
+ unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+ $interval = $settings{$cid.':interval'};
+ }
+ return $interval;
+}
+
+sub process_reset {
+ my ($dom,$crs) = @_;
+ my $result = 'Counters reset for following problems (and parts):
';
+ my @agg_types = ('attempts','users','correct');
+ my %agg_titles = (
+ attempts => 'Number of submissions',
+ users => 'Students with submissions',
+ correct => 'Number of correct submissions',
+ );
+ my @resets = ();
+ my %titles = ();
+ 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 %aggregates = ();
+ my ($symb,$part) = split(/\0/,$reset_item);
+ foreach my $type (@agg_types) {
+ $aggregates{$reset_item."\0".$type} = 0;
+ }
+ $aggregates{$reset_item."\0".'resettime'} = time;
+ my $putresult = &Apache::lonnet::put('nohist_resourcetracker',\%aggregates,
+ $dom,$crs);
+ if ($putresult eq 'ok') {
+ $result .= $title.' -part '.$part.': ';
+ my %new_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item);
+ foreach my $type (@agg_types) {
+ $result .= $agg_titles{$type}.' = '.$new_aggregates{$reset_item."\0".$type}.'; ';
+ }
+ $result =~ s/; $//;
+ $result .= '
';
+ } else {
+ $result = $title.' -part '.$part.': '.&mt('Unable to reset counters to zero due to [_1]',$putresult).'.
'."\n";
+ }
+ }
+ return $result;
+}
+
+sub process_update {
+ my ($dom,$crs,$threshold_titles) = @_;
+ my $setoutput = 'Changes to threshold(s) for problem tracking:
';
+ foreach (keys %env) {
+ next if ($_!~/^form\.(.+)\_setparmval$/);
+ my $name = $1;
+ my $value = $env{'form.'.$name.'_value'};
+ if ($name && defined($value)) {
+ my $put_result = &Apache::lonnet::put('environment',
+ {$name=>$value},$dom,$crs);
+
+ my ($shortname) = ($name =~ /^internal\.threshold_(.+)$/);
+ if ($put_result eq 'ok') {
+ $setoutput.=&mt('Set threshold for [_1] to [_2]',
+ ''.$$threshold_titles{$shortname}.'',
+ ''.$value.'').'
';
+ } else {
+ $setoutput.=&mt('Unable to set threshold for [_1] to [_2] due to [_3].',
+ ''.$name.'',''.$value.'',
+ ''.$put_result.'').'
';
+ }
}
}
-# Compile maxtries and degree of difficulty.
+ return $setoutput;
}
-sub getmail {
- my ($newmsgs,$critmsgs) = @_;
+sub getnormalmail {
+ my ($newmsgs) = @_;
# Check for unread mail in course
my $msgcount = 0;
- my @messages = &Apache::lonnet::getkeys('nohist_email');
+ my @messages = sort(&Apache::lonnet::getkeys('nohist_email'));
foreach my $message (@messages) {
my $msgid=&Apache::lonnet::escape($message);
- my ($sendtime,$shortsubj,$fromname,$fromdom,$fromcid,$status)=
+ my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
&Apache::lonmsg::unpackmsgid($msgid);
- if ($fromcid eq $env{'request.course.id'}) {
+ 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 ++;
+ $msgcount ++;
+ if ($shortsubj eq '') {
+ $shortsubj = &mt('No subject');
+ }
+ $shortsubj = &Apache::lonnet::unescape($shortsubj);
push(@{$newmsgs}, {
msgid => $msgid,
sendtime => $sendtime,
- shortsub => &Apache::lonnet::unescape($shortsubj),
+ shortsub => $shortsubj,
from => $fromname,
fromdom => $fromdom
});
@@ -493,37 +891,444 @@ sub getmail {
}
}
}
+ return $msgcount;
+}
+sub getcritmail {
+ my ($critmsgs) = @_;
# Check for critical messages in course
my %what=&Apache::lonnet::dump('critical');
my $result = '';
my $critmsgcount = 0;
foreach my $msgid (sort(keys(%what))) {
- my ($sendtime,$shortsubj,$fromname,$fromdom,$fromcid,$status)=
- &Apache::lonmsg::unpackmsgid($_);
- if ($fromcid eq $env{'request.course.id'}) {
+ my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
+ &Apache::lonmsg::unpackmsgid($msgid);
+ if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
if (defined($sendtime) && $sendtime!~/error/) {
my $numsendtime = $sendtime;
$sendtime = &Apache::lonlocal::locallocaltime($sendtime);
$critmsgcount ++;
+ if ($shortsubj eq '') {
+ $shortsubj = &mt('No subject');
+ }
+ $shortsubj = &Apache::lonnet::unescape($shortsubj);
push(@{$critmsgs}, {
msgid => $msgid,
sendtime => $sendtime,
- shortsub => &Apache::lonnet::unescape($shortsubj),
+ shortsub => $shortsubj,
from => $fromname,
fromdom => $fromdom
});
}
}
}
- return ($msgcount,$critmsgcount);
+ return $critmsgcount;
+}
+
+
+sub checkversions {
+ my ($cdom,$crs,$navmap,$changed,$starttime) = @_;
+ my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs);
+ my ($tmp) = keys(%changes);
+ unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+ if (keys(%changes) > 0) {
+ foreach my $key (sort(keys(%changes))) {
+ if ($changes{$key} > $starttime) {
+ my $version;
+ my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
+ my $currentversion=&Apache::lonnet::getversion($key);
+ my $revdate =
+ &Apache::lonnet::metadata($root.'.'.$extension,
+ 'lastrevisiondate');
+ $revdate = &Apache::lonlocal::locallocaltime($revdate);
+ my $linkurl=&Apache::lonnet::clutter($key);
+ my $usedversion=$navmap->usedVersion('version_'.$linkurl);
+ my @resources = $navmap->getResourceByUrl($linkurl,1);
+ if (($usedversion) && ($usedversion ne 'mostrecent')) {
+ $version = $usedversion;
+ } else {
+ $version = $currentversion;
+ }
+ foreach my $res (@resources) {
+ if (ref($res) eq 'Apache::lonnavmaps::resource') {
+ my $symb = $res->symb();
+ %{$$changed{$symb}} = (
+ current => $currentversion,
+ version => $version,
+ revdate => $revdate,
+ );
+ }
+ }
+ }
+ }
+ }
+ }
+ return;
+}
+
+sub display_handgrade {
+ my ($r,$tograde,$rowColor1,$rowColor2,$ungraded) = @_;
+ my $rowColor;
+ my %lt = &Apache::lonlocal::texthash(
+ 'prna' => 'Problem Name',
+ 'nmun' => 'Number ungraded',
+ 'nopr' => 'No problems require handgrading',
+ );
+ if (@{$tograde} > 0) {
+ $r->print(''.$lt{'prna'}.' | '.$lt{'nmun'}.' |
');
+ my $rowNum = 0;
+ foreach my $res (@{$tograde}) {
+ if ($rowNum %2 == 1) {
+ $rowColor = $rowColor1;
+ } else {
+ $rowColor = $rowColor2;
+ }
+ my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
+ my $linkurl=&Apache::lonnet::clutter($url);
+ $linkurl .= '?symb='.&Apache::lonnet::escape($res);
+
+ $r->print(''.$$ungraded{$res}{title}.' | '.$$ungraded{$res}{count}.' |
');
+ $rowNum ++;
+ }
+ } else {
+ $r->print(' '.$lt{'nopr'}.'
|
');
+ }
+}
+
+sub display_haserrors {
+ my ($r,$bombs,$rowColor1,$rowColor2,$bombed,$res_title) = @_;
+ my $bombnum = 0;
+ my $rowColor;
+ my %lt = &Apache::lonlocal::texthash(
+ reso => 'Resource',
+ nmer => 'Number of errors',
+ noer => 'No problems with errors',
+ );
+ if (@{$bombs} > 0) {
+ $r->print(''.$lt{'reso'}.' | '.$lt{'nmer'}.' |
');
+ @{$bombs} = sort { &cmp_title($a,$b,$res_title) } @{$bombs};
+ foreach my $bomb (@{$bombs}) {
+ if ($bombnum %2 == 1) {
+ $rowColor = $rowColor1;
+ } else {
+ $rowColor = $rowColor2;
+ }
+ $r->print(''.$$bombed{$bomb}{errorlink}.' | '.$$bombed{$bomb}{errorcount}.' |
');
+ $bombnum ++;
+ }
+ } else {
+ $r->print(' '.$lt{'noer'}.'
|
');
+ }
+ return;
+}
+
+sub display_abovethreshold {
+ my ($r,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ reso => 'Resource',
+ part => 'Part',
+ nust => 'Num. students',
+ avat => 'Av. Attempts',
+ dedi => 'Deg. Diff',
+ lare => 'Last Reset',
+ reco => 'Reset Count?',
+ rese => 'Reset counters to 0',
+ nopr => 'No problems satisfy threshold criteria',
+ );
+ my $rowColor;
+ my $warningnum = 0;
+ if (@{$warnings} > 0) {
+ @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings};
+ $r->print('