--- loncom/interface/lonwhatsnew.pm 2005/12/22 22:39:49 1.38.2.2 +++ loncom/interface/lonwhatsnew.pm 2006/06/03 21:28:07 1.59 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.38.2.2 2005/12/22 22:39:49 albertel Exp $ +# $Id: lonwhatsnew.pm,v 1.59 2006/06/03 21:28:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,8 @@ use Apache::lonuserstate; use Apache::Constants qw(:common :http); use Time::Local; use GDBM_File; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; #---------------------------- # handler @@ -52,27 +54,42 @@ sub handler { $r->send_http_header; return OK; } - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['command']); + &Apache::loncommon::get_unprocessed_cgi( + $ENV{'QUERY_STRING'},['command','refpage']); my $command = $env{'form.command'}; + my $refpage = $env{'form.refpage'}; - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - 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"; + my %checkallowed = ( coursenormalmail => 1, + coursecritmail => 1, ); + foreach my $perm_check (['whn','whatsnew',1], + ['pch','coursediscussion',1], + ['mgr','handgrading',1], + ['vgr','abovethreshold',1], + ['opa','haserrors',1], + ['mdc','versionchanges',0], + ) { + my ($perm,$key,$check_section) = @{ $perm_check }; + my $scope = $env{'request.course.id'}; + if (!($checkallowed{$key} = &Apache::lonnet::allowed($perm,$scope))) { + $scope .= '/'.$env{'request.course.sec'}; + if ( $check_section ) { + $checkallowed{$key} = &Apache::lonnet::allowed($perm,$scope); + } + if ($checkallowed{$key}) { + $checkallowed{$key.'_section'} = $env{'request.course.sec'}; + } + } + } + + if ( ! $env{'request.course.fn'} || ! $checkallowed{'whatsnew'}) { + # Not in a course, or no whn priv in course + $env{'user.error.msg'}="/adm/whatsnew::whn:0:0:Cannot display what's new page"; 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, - ); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; $r->print(&display_header($command,\%checkallowed)); @@ -80,23 +97,40 @@ sub handler { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew', text=>"Display Action Items"}); - if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { + if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=chgthreshold', + ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage, text=>"Change thresholds"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Course Action Items','Course_Action_Items_Thresholds')); - } elsif (($command eq 'chginterval') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { + ("What's New?",#'Course_Action_Items_Thresholds' + )); + } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=chginterval', + ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage, text=>"Change interval"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Course Action Items','Course_Action_Items_Intervals')); + ("What's New?",#'Course_Action_Items_Intervals' + )); + } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage, + text=>"Change discussion display"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + ("What's New?",#'Course_Action_Items_Intervals' + )); + } elsif ($command eq 'courseinit') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage, + text=>"Course initialization preference"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + ("What's New?",#'Course_Action_Items_Initialization' + )); } else { $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Course Action Items','Course_Action_Items_Display')); + ("What's New?",#'Course_Action_Items_Display' + )); } - &display_main_box($r,$command,\%checkallowed); + &display_main_box($r,$command,$refpage,\%checkallowed); return OK; } @@ -107,46 +141,57 @@ sub handler { #------------------------------ sub display_main_box { - my ($r,$command,$checkallowed) = @_; + my ($r,$command,$refpage,$checkallowed) = @_; my $domain=&Apache::loncommon::determinedomain(); my $function = &Apache::loncommon::get_users_function(); my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); - + my $lctype = lc(&Apache::loncommon::course_type()); $r->print('
'); - my %threshold_titles = ( + my %threshold_titles = &Apache::lonlocal::texthash ( 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', + my %interval_titles = &Apache::lonlocal::texthash ( + -1 => "since start of $lctype", 2592000 => 'since last month', 604800 => 'since last week', 86400 => 'since yesterday', ); + my %initpage = &Apache::lonlocal::texthash ( + firstres => "first resource in the $lctype", + whatsnew => "what's new? page", + userpref => 'your general user preferences', + coursespecific => "specific setting for this $lctype", + ); 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, + if (($command eq 'chgthreshold') + && $checkallowed->{'abovethreshold'}) { + &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles, $cdom,$crs); - } elsif (($command eq 'chginterval') && - (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) { - &display_interval_config($r,\%interval_titles); + } elsif (($command eq 'chginterval') + && $checkallowed->{'versionchanges'}) { + &display_interval_config($r,$refpage,\%interval_titles); + } elsif (($command eq 'chgdisc') + && $checkallowed->{'coursediscussion'}) { + &display_discussion_config($r,$refpage); + } elsif ($command eq 'courseinit') { + &courseinit_config($r,$refpage,\%initpage); } else { - &display_actions_box($r,$tabbg,$command,\%threshold_titles, - \%interval_titles,$cdom,$crs,$checkallowed); + &display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles, + \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); } + my $end_page = &Apache::loncommon::end_page(); $r->print(<

- - +$end_page END_OF_BLOCK } @@ -157,10 +202,9 @@ END_OF_BLOCK # up the HTML #------------------------------- -sub display_header{ +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"; @@ -173,6 +217,7 @@ function change_display(caller,change) { function changeAll(change) { END foreach my $item (keys(%{$checkallowed})) { + if ($item =~ /_section$/) { next; } if ($$checkallowed{$item}) { $scripttag.='document.visible.display_'.$item.'.value=change'. "\n"; @@ -183,14 +228,9 @@ END '; } - return(< -Course Action Items -$scripttag - -$bodytag -ENDHEAD + my $course_type=&Apache::loncommon::course_type(); + return &Apache::loncommon::start_page($course_type.' Action Items', + $scripttag); } #------------------------------- @@ -200,23 +240,24 @@ ENDHEAD # #------------------------------- -sub display_actions_box() { - my ($r,$tabbg,$command,$threshold_titles,$interval_titles, - $cdom,$crs,$checkallowed) = @_; - +sub display_actions_box { + my ($r,$tabbg,$command,$refpage,$threshold_titles,$interval_titles, + $initpage,$cdom,$crs,$checkallowed) = @_; my $rowColor1 = "#ffffff"; my $rowColor2 = "#eeeeee"; my $udom = $env{'user.domain'}; my $uname = $env{'user.name'}; my $cid = $env{'request.course.id'}; - + my $crstype = &Apache::loncommon::course_type(); + my $lctype = lc($crstype); + my %stulabel = ( + 'Course' => 'students', + 'Group' => 'members', + ); my %lt = &Apache::lonlocal::texthash( - 'yacc' => 'You are accessing an invalid course.', + 'yacc' => 'You are accessing an invalid course or group', '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', ); @@ -240,41 +281,61 @@ sub display_actions_box() { my $needitems = 0; my $boxcount = 0; + my $result; + if ($command eq 'newcourseinit') { + $result = &store_courseinit_setting($uname,$udom,$cid,$initpage); + } + my %threshold = ( av_attempts => 2, degdiff => 0.5, numstudents => 2, ); + my %pagedesc = &Apache::lonlocal::texthash ( + firstres => 'First resource', + whatsnew => "What's New? page", + userpref => 'user preference', + coursespecific => $lctype.' only', + default => 'default', + ); + + my ($initcontrol,$initdisp) = &curr_courseinit(); + my $currinit = $pagedesc{$initdisp}.' ('.$pagedesc{$initcontrol}.')'; unless ($cid) { $r->print('
'.$lt{'yacc'}.'


'); return; } - if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db', + if ($refpage eq 'start') { + 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); + my $furl=$bighash{'first_url'}; + untie(%bighash); + $r->print(''.$lt{'gtfr'}. + '
'); + } } - - my $result; - + $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype). + '. '.&mt('Currently: [_1]',$currinit).'.  '. + &mt('Change for just this '.$lctype.'',$refpage).' '. + &mt('or for all your courses/groups',$refpage).'
'); + if ($command eq 'reset') { $result = &process_reset($cdom,$crs); } elsif ($command eq 'update') { - $result = &process_update($cdom,$crs,$threshold_titles); + $result = &process_update($uname,$udom,$threshold_titles); } elsif ($command eq 'newinterval') { $result = &store_interval_setting($uname,$udom,$cid,$interval_titles); + } elsif ($command eq 'newdiscconf') { + $result = &store_discussion_setting($uname,$udom,$cid); } my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed); unless ($store_result eq 'ok') { &Apache::lonnet::logthis('Error storing whatsnew settings: '. - $store_result.' for '.'user '.$uname.':'.$udom.' in course '.$cid); + $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result .= &mt('Unable to store visibility settings due to [_1]', $store_result); } @@ -294,26 +355,33 @@ sub display_actions_box() { $timediff = time; } my $starttime = $now - $timediff; - my $countunread = 1; + my $countunread = $display_settings{$cid.':countunread'}; + unless (defined($countunread)) { + $countunread = 'on'; + } my %headings = &Apache::lonlocal::texthash( - coursediscussion => 'Unread course discussion posts', + coursediscussion => 'Unread '.$lctype.' 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', + versionchanges => 'Resources in '.$lctype.' with version changes '.$interval, + coursenormalmail => 'New '.$lctype.' messages', + coursecritmail => 'New critical messages in '.$lctype, ); if ($$checkallowed{'abovethreshold'}) { - &get_curr_thresholds(\%threshold,$cdom,$crs); + &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$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'}; + $headings{'abovethreshold'} = + &mt('Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2]
and total number of '.$stulabel{$crstype}.' with submissions ≥ [_3]', + $threshold{'av_attempts'},$threshold{'degdiff'}, + $threshold{'numstudents'}); my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail'); foreach my $key (keys(%{$checkallowed})) { + if ($key =~ /_section$/) { next; } $show{$key} = 0; if ($$checkallowed{$key}) { unless ($display_settings{$cid.':'.$key} eq 'hide') { @@ -335,32 +403,40 @@ sub display_actions_box() { &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); + $msgcount = &getnormalmail(\@newmsgs); } if ($show{'coursecritmail'}) { - &getcritmail(\@critmsgs); + $critmsgcount = &getcritmail(\@critmsgs); } $r->print(qq|$lt{'hial'}   $lt{'shal'}
\n|); foreach my $item (keys(%{$checkallowed})) { + if ($item =~ /_section$/) { next; } if ($$checkallowed{$item}) { $r->print(''."\n"); } } - $r->print('

'); + $r->print('
'); my $displayed = 0; - my $totalboxes = keys(%{$checkallowed}); + my $totalboxes = 0; + foreach my $key (keys(%{$checkallowed})) { + if ($key =~ /_section$/) { next; } + if ($key eq 'whatsnew' ) { next; } # whatsnew check creates no box + if ($$checkallowed{$key}) { + $totalboxes ++; + } + } my $halfway = int($totalboxes/2) + $totalboxes%2; foreach my $actionitem (@actionorder) { if ($$checkallowed{$actionitem}) { if ($displayed == $halfway) { - $r->print(' '); + $r->print(' '); } - &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); + &display_launcher($r,$actionitem,$refpage,$checkallowed,$tabbg,$rowColor1,$rowColor2,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread); $displayed ++; } } @@ -382,19 +458,25 @@ sub display_actions_box() { #------------------------------- sub display_threshold_config { - my ($r,$command,$tabbg,$threshold_titles,$cdom,$crs) = @_; + my ($r,$refpage,$tabbg,$threshold_titles,$cdom,$crs) = @_; + my $uname = $env{'user.name'}; + my $udom = $env{'user.dom'}; + my $cid = $env{'request.course.id'}; my %threshold = (); my $rowColor1 = "#ffffff"; my $rowColor2 = "#eeeeee"; my $rowColor; my @thresholditems = ("av_attempts","degdiff","numstudents"); - my %threshold_titles = ( + foreach my $item (@thresholditems) { + $threshold{$item} = ''; + } + my %threshold_titles = &Apache::lonlocal::texthash( av_attempts => 'Average number of attempts', degdiff => 'Degree of difficulty', numstudents => 'Total number of students with submissions', ); - &get_curr_thresholds(\%threshold,$cdom,$crs); + &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs); $r->print('
@@ -414,7 +496,7 @@ sub display_threshold_config { '); my $rowNum =0; foreach my $type (@thresholditems) { - my $parameter = 'internal.threshold_'.$type; + my $parameter = $env{'request.course.id'}.':threshold_'.$type; # onchange is javascript to automatically check the 'Set' button. my $onchange = 'onFocus="javascript:window.document.forms'. "['thresholdform'].elements['".$parameter."_setparmval']". @@ -439,6 +521,7 @@ sub display_threshold_config { $r->print('

+ '); } @@ -450,16 +533,19 @@ sub display_threshold_config { #------------------------------- sub display_interval_config { - my ($r,$interval_titles) = @_; - my $current = &get_curr_interval($env{'user.name'}, - $env{'user.domain'},$env{'request.course.id'}); - $r->print('
'.&mt('Choose the time window to use for display of version changes for resources in the course.')); + my ($r,$refpage,$interval_titles) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); + my $current = &get_current($env{'user.name'},$env{'user.domain'}, + $env{'request.course.id'},'interval'); + $r->print('
'.&mt('Choose the time window to use for display of version changes for resources in the '.$lctype.'.')); unless ($current eq '') { - $r->print(' '.&mt('Current value is ').$$interval_titles{$current}.'

'); + $r->print(' '.&mt('Current value is [_1]',''. + $$interval_titles{$current}.'.')); } $r->print('

+ + + +'); + $r->print('
+ +         + +
'); + return; +} + +#--------------------------------------------------- +# courseinit_config +# +# Set page displayed when course loads after +# selecting a role in the course from the roles page. +# +#--------------------------------------------------- + +sub courseinit_config { + my ($r,$refpage,$initpage) = @_; + my ($control,$current) = &curr_courseinit(); + my @chgstate = ('userpref','coursespecific'); + my @chgentry = ('firstres','whatsnew'); + my $lctype = lc(&Apache::loncommon::course_type()); + my %lt = &Apache::lonlocal::texthash( + 'chwp' => "Choose which page will be displayed when you enter this $lctype after selecting a role.", + 'cuva' => 'Current value is determined by', + 'anis' => 'and is set to display', + 'padc' => 'Page display controlled by', + 'chce' => 'Choose '.$lctype.' entry', + 'moce' => 'Modify '.$lctype.' entry', + ); + $r->print(<<"END"); +
$lt{'chwp'} +
$lt{'cuva'}: +$$initpage{$control} $lt{'anis'} +$$initpage{$current}.

+
+ + +$lt{'padc'}:   +END + foreach my $choice (@chgstate) { + my $chkstring; + if ($choice eq $control) { + $chkstring = ' checked="checked" '; + } + $r->print(''); + } + $r->print('

'.&mt('If').' '.$$initpage{'coursespecific'}. + ' -
'.$lt{'chce'}.": \n"); + foreach my $choice (@chgentry) { + my $chkstring; + if (($choice eq $current) && ($control eq 'coursespecific')) { + $chkstring = ' checked="checked" '; + } + $r->print(''); + } + $r->print('

'); + return; +} + +sub curr_courseinit { + my $current = &get_current($env{'user.name'},$env{'user.domain'}, + $env{'request.course.id'},'courseinit'); + my $control; + if ($current) { + $control = 'coursespecific'; + } else { + $control = 'userpref'; + my %userenv = &Apache::lonnet::get('environment', + ['course_init_display']); + if (exists($userenv{'course_init_display'})) { + $current = $userenv{'course_init_display'}; + } + unless ($current) { + $current = 'whatsnew'; + } + } + return ($control,$current); +} + sub display_launcher { - my ($r,$action,$checkallowed,$tabbg,$rowColor1,$rowColor2,$show, + my ($r,$action,$refpage,$checkallowed,$tabbg,$rowColor1,$rowColor2,$show, $headings,$res_title,$tograde,$ungraded,$bombs,$bombed,$changed, $warnings,$triggered,$newdiscussions,$unread,$msgcount,$newmsgs, $critmsgcount,$critmsgs,$interval,$countunread) = @_; if ($$checkallowed{$action}) { - &start_box($r,$tabbg,$show,$headings,$action); + &start_box($r,$tabbg,$show,$headings,$action,$refpage); if ($$show{$action}) { if ($action eq 'handgrading') { # UNGRADED ITEMS &display_handgrade($r,$tograde,$rowColor1,$rowColor2, @@ -492,8 +700,8 @@ sub display_launcher { $rowColor2,$interval); } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS - &display_abovethreshold($r,$warnings,$triggered,$res_title, - $rowColor1,$rowColor2); + &display_abovethreshold($r,$refpage,$warnings,$triggered, + $res_title); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, $countunread,$res_title,$rowColor1,$rowColor2); @@ -518,7 +726,6 @@ sub getitems { # 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; @@ -527,17 +734,6 @@ sub getitems { &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); @@ -558,8 +754,8 @@ sub getitems { # Check if there are unread discussion postings if ($$show{'coursediscussion'}) { - &check_discussions($cdom,$crs,$resource,$symb,$ressymb,$title, - $newdiscussions,$unread); + &check_discussions($resource,$symb,$ressymb,$title, + $newdiscussions,$unread,$countunread); } # Check for ungraded problems @@ -577,78 +773,32 @@ sub getitems { # Maxtries and degree of difficulty for problem parts, unless handgradeable if ($$show{'abovethreshold'}) { - &check_thresholds($resource,$symb,\%resourcetracker,$triggered, - $threshold,$warnings,$warningnum,$rowColor1,$rowColor2); + $warningnum = &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); - } -} + my ($resource,$symb,$ressymb,$title,$newdiscussions,$unread, + $countunread) = @_; -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'}; - } - } - } - } - $$unread{$ressymb}{'unreadcount'} = $unreadcount; + if (!$resource->hasDiscussion()) { return; } + + %{$$unread{$ressymb}} = (); + $$unread{$ressymb}{'title'} = $title; + $$unread{$ressymb}{'symb'} = $symb; + push(@{$newdiscussions}, $ressymb); + + $$unread{$ressymb}{'lastpost'} = $resource->last_post_time(); + + if ($countunread eq 'on') { + $$unread{$ressymb}{'unreadcount'} = $resource->unread_discussion(); } } - sub check_handgraded { my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_; if ($resource->is_problem()) { @@ -680,7 +830,7 @@ sub check_bombed { my @bombs = split(/,/, $errors); my $errorcount = scalar(@bombs); my $errorlink = ''. + &escape($bombs[0]).'">'. $title.''; $$bombed{$symb}{errorcount} = $errorcount; $$bombed{$symb}{errorlink} = $errorlink; @@ -701,6 +851,9 @@ sub check_thresholds { if ($resource->handgrade($part) eq 'yes') { next; } + if ($resource->is_survey($part)) { + next; + } %{$stats{$part}} = (); my ($attempts,$users,$corrects,$degdiff,$av_attempts); if (exists($$resourcetracker{$symb."\0".$part."\0attempts"})) { @@ -732,16 +885,17 @@ sub check_thresholds { } } if ($warning) { - if ($warningnum %2 == 1) { + if ($warningnum%2 == 1) { $rowColor = $rowColor1; } else { $rowColor = $rowColor2; } + $$triggered{$symb}{rowColor} = $rowColor; $$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); + my $resetname = 'reset_'.&escape($symb."\0".$part); + my $resettitle = 'title_'.&escape($symb."\0".$part); if ($$triggered{$symb}{numparts}) { $$triggered{$symb}{text} .= ''."\n"; } @@ -757,7 +911,7 @@ sub check_thresholds { '.$stats{$part}{attempts}.' '.$stats{$part}{degdiff}.' '.$lastreset{$part}.' - + '; $$triggered{$symb}{numparts} ++; } @@ -765,41 +919,62 @@ sub check_thresholds { push(@{$warnings},$symb); $warningnum ++; } + return $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'}; + my ($threshold,$uname,$udom,$cid,$cdom,$crs) = @_; + my %thresholdsettings = &Apache::lonnet::dump('nohist_whatsnew',$udom, + $uname,$cid.':threshold'); + my $thresholdcount = 0; + my ($tmp) = %thresholdsettings; + unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { + foreach my $item (keys %{$threshold}) { + if (exists($thresholdsettings{$cid.':threshold_'.$item})) { + $$threshold{$item} = + $thresholdsettings{$cid.':threshold_'.$item}; + $thresholdcount ++; + } + } } - if (exists($coursesettings{'internal.threshold_degdiff'})) { - $$threshold{'degdiff'} = $coursesettings{'internal.threshold_degdiff'}; + if ($thresholdcount == 3) { + return; } - if (exists($coursesettings{'internal.threshold_numstudents'})) { - $$threshold{'numstudents'} = $coursesettings{'internal.threshold_numstudents'}; + my %coursesettings = &Apache::lonnet::dump('environment', + $cdom,$crs,'internal.threshold'); + my ($temp) = %coursesettings; + unless ($temp =~ /^(con_lost|error|no_such_host)/i) { + foreach my $item (keys %{$threshold}) { + unless (exists($thresholdsettings{$cid.':threshold_'.$item})) { + if (exists($coursesettings{'internal.threshold_'.$item})) { + $$threshold{$item} = + $coursesettings{'internal.threshold_'.$item}; + } + } + } } + return; } -sub get_curr_interval { - my ($uname,$udom,$cid); - my $interval; - my %settings = &Apache::lonnet::dump('nohist_whatsnew',$uname,$udom,$cid,':interval'); +sub get_current { + my ($uname,$udom,$cid,$caller) = @_; + my $currvalue; + my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid. + ':'.$caller); my ($tmp) = %settings; - unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { - $interval = $settings{$cid.':interval'}; + $currvalue = $settings{$cid.':'.$caller}; } - return $interval; + return $currvalue; } sub process_reset { my ($dom,$crs) = @_; - my $result = 'Counters reset for following problems (and parts):
'; + my $result = ''.&mt('Counters reset for following problems (and parts):'). + '
'; my @agg_types = ('attempts','users','correct'); - my %agg_titles = ( + my %agg_titles = &Apache::lonlocal::texthash ( attempts => 'Number of submissions', users => 'Students with submissions', correct => 'Number of correct submissions', @@ -808,8 +983,8 @@ sub process_reset { 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 $title = &unescape($env{'form.title_'.$1}); + my $reset_item = &unescape($1); my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item); my %aggregates = (); my ($symb,$part) = split(/\0/,$reset_item); @@ -835,17 +1010,17 @@ sub process_reset { } sub process_update { - my ($dom,$crs,$threshold_titles) = @_; + my ($uname,$udom,$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 $put_result = &Apache::lonnet::put('nohist_whatsnew', + {$name=>$value},$udom,$uname); - my ($shortname) = ($name =~ /^internal\.threshold_(.+)$/); + my ($shortname) = ($name =~ /^\Q$env{'request.course.id'}\E:threshold_(.+)$/); if ($put_result eq 'ok') { $setoutput.=&mt('Set threshold for [_1] to [_2]', ''.$$threshold_titles{$shortname}.'', @@ -867,7 +1042,7 @@ sub getnormalmail { my @messages = sort(&Apache::lonnet::getkeys('nohist_email')); foreach my $message (@messages) { - my $msgid=&Apache::lonnet::escape($message); + my $msgid=&escape($message); my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= &Apache::lonmsg::unpackmsgid($msgid); if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { @@ -879,7 +1054,6 @@ sub getnormalmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$newmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -911,7 +1085,6 @@ sub getcritmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$critmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -931,7 +1104,7 @@ sub checkversions { 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) { + if (keys(%changes) > 0) { foreach my $key (sort(keys(%changes))) { if ($changes{$key} > $starttime) { my $version; @@ -985,7 +1158,7 @@ sub display_handgrade { } my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); my $linkurl=&Apache::lonnet::clutter($url); - $linkurl .= '?symb='.&Apache::lonnet::escape($res); + $linkurl .= '?symb='.&escape($res); $r->print(''.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.''); $rowNum ++; @@ -1023,7 +1196,7 @@ sub display_haserrors { } sub display_abovethreshold { - my ($r,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_; + my ($r,$refpage,$warnings,$triggered,$res_title) = @_; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', part => 'Part', @@ -1035,28 +1208,22 @@ sub display_abovethreshold { 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('
'. - ' '."\n"); + ' '."\n". + ' '. + "\n"); $r->print(''.$lt{'reso'}.''.$lt{'part'}.''.$lt{'nust'}.''.$lt{'avat'}.''.$lt{'dedi'}.''.$lt{'lare'}.''.$lt{'reco'}.''); foreach my $res (@{$warnings}) { - if ($warningnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); my $linkurl=&Apache::lonnet::clutter($url); my $rowspan; if ($$triggered{$res}{numparts} > 1) { $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"'; } - $linkurl .= '?symb='.&Apache::lonnet::escape($res); - $r->print(''.$$triggered{$res}{title}.''.$$triggered{$res}{text}); - $warningnum ++; + $linkurl .= '?symb='.&escape($res); + $r->print(''.$$triggered{$res}{title}.''.$$triggered{$res}{text}); } $r->print('
'); } else { @@ -1088,7 +1255,7 @@ sub display_versionchanges { } my ($map,$id,$url)=&Apache::lonnet::decode_symb($item); my $linkurl=&Apache::lonnet::clutter($url); - $linkurl .= '?symb='.&Apache::lonnet::escape($item); + $linkurl .= '?symb='.&escape($item); $r->print(''.$$res_title{$item}.''.$$changed{$item}{'revdate'}.''.$$changed{$item}{'current'}.''.$$changed{$item}{'version'}.''); $changenum ++; @@ -1102,11 +1269,12 @@ sub display_versionchanges { sub display_coursediscussion { my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1, $rowColor2) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); my %lt = &Apache::lonlocal::texthash( 'loca' => 'Location', 'type' => 'Type', 'numn' => 'Number of new posts', - 'noun' => 'No unread posts in course discussions', + 'noun' => 'No unread posts in '.$lctype.' discussions', 'tmlp' => 'Time of last post', ); my $rowColor; @@ -1114,7 +1282,7 @@ sub display_coursediscussion { $r->print(''.$lt{'loca'}. ''.$lt{'type'}. ''); - if ($countunread) { + if ($countunread eq 'on') { $r->print(''.$lt{'tmlp'}.''. ''.$lt{'numn'}. ''); @@ -1141,7 +1309,7 @@ sub display_coursediscussion { my $lastpost = &Apache::lonnavmaps::timeToHumanString( $$unread{$ressymb}{'lastpost'}); $r->print(''.$forum_title.' '.$type.' '); - if ($countunread) { + if ($countunread eq 'on') { my $unreadnum = $$unread{$ressymb}{'unreadcount'}; $r->print(''.$lastpost.''. '',$unreadnum.' '); @@ -1160,6 +1328,7 @@ sub display_coursediscussion { sub display_coursenormalmail { my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_; my $rowColor; + my $lctype = lc(&Apache::loncommon::course_type()); if ($msgcount > 0) { $r->print(''.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').''); my $rowNum = 0; @@ -1175,13 +1344,14 @@ sub display_coursenormalmail { $mailcount ++; } } else { - $r->print('

'.&mt('No new course messages').'

'); + $r->print('

'.&mt('No new '.$lctype.' messages').'

'); } } sub display_coursecritmail { my ($r,$critmsgcount,$critmsgs,$rowColor1,$rowColor2) = @_; my $rowColor; + my $lctype = lc(&Apache::loncommon::course_type()); if ($critmsgcount > 0) { $r->print(''.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').''); my $rowNum = 0; @@ -1197,7 +1367,7 @@ sub display_coursecritmail { $mailcount ++; } } else { - $r->print('

'.&mt('No unread critical messages in course').'

'); + $r->print('

'.&mt('No unread critical messages in '.$lctype).'

'); } } @@ -1213,14 +1383,13 @@ sub get_display_settings { my ($uname,$udom,$cid) = @_; my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid); my ($tmp) = keys(%settings); - if ($tmp=~/^(con_lost|error|no_such_host)/i) { + if ($tmp=~ /^(con_lost|error|no_such_host)/i) { %settings = (); - unless ($tmp =~ /^error: 2 /) { - &Apache::lonnet::logthis('Error retrieving whatsnew settings: '. - $tmp.' for '.$uname.':'.$udom. - ' for course: '.$cid); - - } + unless ($tmp =~ /^error: 2 /) { + my $lctype = lc(&Apache::loncommon::course_type()); + &Apache::lonnet::logthis('Error retrieving whatsnew settings: '. + $tmp.' for '.$uname.':'.$udom.' for '.$lctype.': '.$cid); + } } return %settings; } @@ -1230,6 +1399,7 @@ sub store_display_settings { my %whatsnew_settings; my $result; foreach my $key (keys(%{$checkallowed})) { + if ($key =~ /_section$/) { next; } if (exists($env{'form.display_'.$key})) { unless ($env{'form.display_'.$key} eq '') { $whatsnew_settings{$cid.':'.$key} = $env{'form.display_'.$key}; @@ -1258,8 +1428,9 @@ sub store_interval_setting { ''.$$interval_titles{$env{'form.interval'}}.'
'); } else { + my $lctype = lc(&Apache::loncommon::course_type()); &Apache::lonnet::logthis('Error storing whatsnew interval setting'. - ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid); + ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result = &mt('Unable to set interval to [_1] due to [_2].', ''.$$interval_titles{$env{'form.interval'}}.'', ''.$outcome.'.
'); @@ -1268,11 +1439,82 @@ sub store_interval_setting { return $result; } +sub store_discussion_setting { + my ($uname,$udom,$cid) = @_; + my %discussion_settings; + my $result; + if (defined($env{'form.countunread'})) { + $discussion_settings{$cid.':countunread'} = $env{'form.countunread'}; + 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]', + ''.$env{'form.countunread'}.'
'); + + } else { + my $lctype = lc(&Apache::loncommon::course_type()); + &Apache::lonnet::logthis('Error storing whatsnew countunread setting'. + ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); + $result = &mt('Unable to set "number unread posts display" to [_1]'. + ' due to [_2].', + ''.$env{'form.countunread'}.'', + ''.$outcome.'.
'); + } + } + return $result; +} + +sub store_courseinit_setting { + my ($uname,$udom,$cid,$initpage) = @_; + my %courseinit_settings; + my $page_control; + my $result; + if (defined($env{'form.courseinit_control'})) { + if ($env{'form.courseinit_control'} eq 'userpref') { + $courseinit_settings{$cid.':courseinit'} = ''; + $page_control = 'global preferences'; + } else { + if (defined($env{'form.courseinit_page'})) { + $courseinit_settings{$cid.':courseinit'} = + $env{'form.courseinit_page'}; + $page_control = 'course specific setting'; + } + } + if ($page_control) { + my $lctype = lc(&Apache::loncommon::course_type()); + my $outcome = &Apache::lonnet::put('nohist_whatsnew', + \%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 user's global preferences."); + } else { + $result = &mt('Page displayed after role selection in this '.$lctype.' set to [_2]',$lctype,$$initpage{$env{'form.courseinit_page'}}); + } + } else { + &Apache::lonnet::logthis('Error storing 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]'. + ' due to [_2].', + ''.$page_control.'', + ''.$outcome.'.
'); + } else { + $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to [_2] due to [_3].
', + $$initpage{$env{'form.courseinit_page'}},$outcome); + } + } + } + } + return $result; +} + sub start_box { - my ($r,$tabbg,$show,$heading,$caller) = @_; + my ($r,$tabbg,$show,$heading,$caller,$refpage) = @_; my %lt = &Apache::lonlocal::texthash( chth => 'Change thresholds?', chin => 'Change interval?', + chop => 'Change options?', ); my $showhide; if ($$show{$caller}) { @@ -1300,15 +1542,26 @@ sub start_box { '); if (($caller eq 'abovethreshold') && ($$show{$caller})) { - $r->print(' + if ($$show{$caller}) { + $r->print(' - '.$lt{'chth'}.' + '.$lt{'chth'}.' '); + } } elsif (($caller eq 'versionchanges') && ($$show{$caller})) { - $r->print(' + if ($$show{$caller}) { + $r->print(' + + '.$lt{'chin'}.' + '); + } + } elsif ($caller eq 'coursediscussion') { + if ($$show{$caller}) { + $r->print(' - '.$lt{'chin'}.' + '.$lt{'chop'}.' '); + } } $r->print('