--- loncom/interface/lonwhatsnew.pm 2005/12/19 21:39:37 1.39 +++ loncom/interface/lonwhatsnew.pm 2006/06/03 21:05:04 1.58 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.39 2005/12/19 21:39:37 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.58 2006/06/03 21:05:04 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 @@ -58,26 +60,36 @@ sub handler { my $command = $env{'form.command'}; my $refpage = $env{'form.refpage'}; - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - my $crsid = $env{'request.course.id'}; - $crsid =~ s/_/\//; - if ((!($env{'request.course.id'})) || - ($env{'request.role'} !~ /\Q$crsid\E$/)) { - # Not in a course, or no role in course - $env{'user.error.msg'}="/adm/whatsnew::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)); @@ -85,33 +97,38 @@ 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&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&refpage='.$refpage, text=>"Change interval"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Course Action Items','Course_Action_Items_Intervals')); - } elsif (($command eq 'chgdisc') && (&Apache::lonnet::allowed('pch',$env{'request.course.id'}))) { + ("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 - (undef,'Course Action Items','Course_Action_Items_Intervals')); + ("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 - (undef,'Course Action Items','Course_Action_Items_Initialization')); + ("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,$refpage,\%checkallowed); return OK; @@ -126,7 +143,9 @@ sub handler { sub display_main_box { my ($r,$command,$refpage,$checkallowed) = @_; my $domain=&Apache::loncommon::determinedomain(); - my $tabbg=&Apache::loncommon::designparm('coordinator.tabbg',$domain); + my $function = &Apache::loncommon::get_users_function(); + my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); + my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); $r->print('
'); my %threshold_titles = &Apache::lonlocal::texthash ( @@ -136,43 +155,43 @@ sub display_main_box { ); my %interval_titles = &Apache::lonlocal::texthash ( - -1 => 'since start of course', + -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 course', + firstres => "first resource in the $lctype", whatsnew => "what's new? page", userpref => 'your general user preferences', - coursespecific => 'specific setting for this course', + 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'}))) { + 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'}))) { + } elsif (($command eq 'chginterval') + && $checkallowed->{'versionchanges'}) { &display_interval_config($r,$refpage,\%interval_titles); - } elsif (($command eq 'chgdisc') && - (&Apache::lonnet::allowed('pch',$env{'request.course.id'}))) { + } 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,$command,$refpage,\%threshold_titles, + &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 } @@ -185,8 +204,7 @@ 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"; @@ -199,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"; @@ -209,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); } #------------------------------- @@ -227,19 +241,23 @@ ENDHEAD #------------------------------- sub display_actions_box { - my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage, - $cdom,$crs,$checkallowed) = @_; + 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 = $env{'course.'.$cid.'.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', - 'pgse' => 'Page set to be displayed after you have selected a role in this course?', 'hial' => 'Hide all', 'shal' => 'Show all', ); @@ -263,15 +281,6 @@ sub display_actions_box { my $needitems = 0; my $boxcount = 0; - my $domain=&Apache::loncommon::determinedomain(); - my $function; - if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { - $function='coordinator'; - } - if ($env{'request.role'}=~/^(su|dc|ad|li)/) { - $function='admin'; - } - my $result; if ($command eq 'newcourseinit') { $result = &store_courseinit_setting($uname,$udom,$cid,$initpage); @@ -284,18 +293,15 @@ sub display_actions_box { ); my %pagedesc = &Apache::lonlocal::texthash ( firstres => 'First resource', - whatsnew => "What's New page", + whatsnew => "What's New? page", userpref => 'user preference', - coursespecific => 'course only', + coursespecific => $lctype.' only', default => 'default', ); my ($initcontrol,$initdisp) = &curr_courseinit(); my $currinit = $pagedesc{$initdisp}.' ('.$pagedesc{$initcontrol}.')'; - my $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain); - my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); - unless ($cid) { $r->print('
'.$lt{'yacc'}.'


'); return; @@ -310,13 +316,11 @@ sub display_actions_box { '
'); } } - $r->print($lt{'pgse'}.' '.&mt('Currently: [_1]',''.$currinit.''). - '  '.&mt('[_1] for just [_2]','Change', - 'this course').' '.&mt('or for all [_1].', - 'your courses').'
'); - + $r->print(&mt('Page set to be displayed after you have selected a role in this [_1]',$lctype). + '. '.&mt('Currently: [_1]',$currinit).'.  '. + &mt('Change for just this [_2]',$refpage,$lctype).' '. + &mt('or for all your courses/groups',$refpage).'
'); + if ($command eq 'reset') { $result = &process_reset($cdom,$crs); } elsif ($command eq 'update') { @@ -331,7 +335,7 @@ sub display_actions_box { 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); } @@ -357,23 +361,24 @@ sub display_actions_box { } 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,$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').' ≥ '.$threshold{'av_attempts'}.' '.&mt('or deg. difficulty').' ≥ '.$threshold{'degdiff'}.'
'.&mt('and total number of [_1] with submissions',$stulabel{$crstype}).' ≥ '.$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') { @@ -395,16 +400,17 @@ 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"); } @@ -413,12 +419,19 @@ sub display_actions_box { $r->print('

'."\n"; } @@ -925,7 +908,7 @@ sub check_thresholds { - + '; $$triggered{$symb}{numparts} ++; } @@ -933,6 +916,7 @@ sub check_thresholds { push(@{$warnings},$symb); $warningnum ++; } + return $warningnum; } @@ -942,7 +926,7 @@ sub get_curr_thresholds { $uname,$cid.':threshold'); my $thresholdcount = 0; my ($tmp) = %thresholdsettings; - unless ($tmp =~ /^Error/) { + unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { foreach my $item (keys %{$threshold}) { if (exists($thresholdsettings{$cid.':threshold_'.$item})) { $$threshold{$item} = @@ -957,7 +941,7 @@ sub get_curr_thresholds { my %coursesettings = &Apache::lonnet::dump('environment', $cdom,$crs,'internal.threshold'); my ($temp) = %coursesettings; - unless ($temp =~ /^Error/) { + 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})) { @@ -976,10 +960,7 @@ sub get_current { my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid. ':'.$caller); my ($tmp) = %settings; - if ($tmp =~ /^Error/) { - &logthis('Error retrieving '.$caller.' setting from nohist_whatsnew for '. - $uname.";".$udom.' in '.$cid); - } else { + unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { $currvalue = $settings{$cid.':'.$caller}; } return $currvalue; @@ -999,8 +980,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); @@ -1058,7 +1039,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'})) { @@ -1070,7 +1051,6 @@ sub getnormalmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$newmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -1102,7 +1082,6 @@ sub getcritmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$critmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -1121,10 +1100,7 @@ sub checkversions { my ($cdom,$crs,$navmap,$changed,$starttime) = @_; my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs); my ($tmp) = keys(%changes); - if ($tmp =~/^error\:/) { - &Apache::lonnet::logthis('Error retrieving version update information: '. - $tmp.' for '.$cdom.'_'.$crs.' in whatsnew'); - } else { + unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { if (keys(%changes) > 0) { foreach my $key (sort(keys(%changes))) { if ($changes{$key} > $starttime) { @@ -1179,7 +1155,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(''); $rowNum ++; @@ -1217,7 +1193,7 @@ sub display_haserrors { } sub display_abovethreshold { - my ($r,$refpage,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_; + my ($r,$refpage,$warnings,$triggered,$res_title) = @_; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', part => 'Part', @@ -1229,8 +1205,6 @@ 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(''. @@ -1239,20 +1213,14 @@ sub display_abovethreshold { "\n"); $r->print(''); 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}{text}); - $warningnum ++; + $linkurl .= '?symb='.&escape($res); + $r->print(''.$$triggered{$res}{text}); } $r->print(''); $changenum ++; @@ -1298,11 +1266,12 @@ sub display_versionchanges { sub display_coursediscussion { my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1, $rowColor2) = @_; + my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.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; @@ -1356,6 +1325,7 @@ sub display_coursediscussion { sub display_coursenormalmail { my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_; my $rowColor; + my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); if ($msgcount > 0) { $r->print(''); my $rowNum = 0; @@ -1371,13 +1341,14 @@ sub display_coursenormalmail { $mailcount ++; } } else { - $r->print(''); + $r->print(''); } } sub display_coursecritmail { my ($r,$critmsgcount,$critmsgs,$rowColor1,$rowColor2) = @_; my $rowColor; + my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); if ($critmsgcount > 0) { $r->print(''); my $rowNum = 0; @@ -1393,7 +1364,7 @@ sub display_coursecritmail { $mailcount ++; } } else { - $r->print(''); + $r->print(''); } } @@ -1409,11 +1380,12 @@ sub get_display_settings { my ($uname,$udom,$cid) = @_; my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid); my ($tmp) = keys(%settings); - if ($tmp=~/^error:/) { + if ($tmp=~ /^(con_lost|error|no_such_host)/i) { %settings = (); - unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') { - &logthis('Error retrieving whatsnew settings: '.$tmp.' for '. - $uname.':'.$udom.' for course: '.$cid); + unless ($tmp =~ /^error: 2 /) { + my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + &Apache::lonnet::logthis('Error retrieving whatsnew settings: '. + $tmp.' for '.$uname.':'.$udom.' for '.$lctype.': '.$cid); } } return %settings; @@ -1424,6 +1396,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}; @@ -1452,8 +1425,9 @@ sub store_interval_setting { ''.$$interval_titles{$env{'form.interval'}}.'
'); } else { + my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.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.'.
'); @@ -1475,8 +1449,9 @@ sub store_discussion_setting { ''.$env{'form.countunread'}.'
'); } else { + my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); &Apache::lonnet::logthis('Error storing whatsnew countunread setting'. - ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid); + ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result = &mt('Unable to set "number unread posts display" to [_1]'. ' due to [_2].', ''.$env{'form.countunread'}.'', @@ -1503,27 +1478,27 @@ sub store_courseinit_setting { } } if ($page_control) { + my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.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 course now set by [_1]',"user's global preferences."); + $result = &mt("Page displayed after role selection in [_1] now set by user's global preferences.",$lctype); } else { - $result = &mt('Page displayed after role selection in this course set to [_1]',''.$$initpage{$env{'form.courseinit_page'}}.'.'); + $result = &mt('Page displayed after role selection in this [_1] set to [_2]',$lctype,$$initpage{$env{'form.courseinit_page'}}); } } else { &Apache::lonnet::logthis('Error storing whatsnew courseinit '. 'setting: '.$outcome.' for '.$uname. - ':'.$udom.' in course '.$cid); + ':'.$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 course to [_1] due to [_2].', - ''.$$initpage{$env{'form.courseinit_page'}}.'', - ''.$outcome.'.
'); + $result = &mt('Unable to set page display, after role selection, for this [_1] to [_2] due to [_3].
',$lctype, + $$initpage{$env{'form.courseinit_page'}},$outcome); } } } @@ -1564,20 +1539,26 @@ sub start_box { '); if (($caller eq 'abovethreshold') && ($$show{$caller})) { - $r->print(' + if ($$show{$caller}) { + $r->print(' '); + } } elsif (($caller eq 'versionchanges') && ($$show{$caller})) { - $r->print(' + if ($$show{$caller}) { + $r->print(' '); + } } elsif ($caller eq 'coursediscussion') { - $r->print(' + if ($$show{$caller}) { + $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,$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 ++; @@ -518,9 +531,10 @@ sub display_threshold_config { sub display_interval_config { my ($r,$refpage,$interval_titles) = @_; + my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.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 course.')); + $r->print('
'.&mt('Choose the time window to use for display of version changes for resources in the [_1].',$lctype)); unless ($current eq '') { $r->print(' '.&mt('Current value is [_1]',''. $$interval_titles{$current}.'.')); @@ -555,24 +569,34 @@ sub display_discussion_config { if ($current eq '') { $current = 'on'; } - my %status = ( - on => 'checked="checked"', - off => 'checked="checked"', - ); - $status{$current} = ''; - $r->print('
'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'
'.&mt('This can increase the time taken to gather data for the [_1] page by a few seconds.',"What's New?").'  '.&mt('Currently set to [_1] .'),"$current."); + my %opposite = ( + 'on' => 'off', + 'off' => 'on', + ); + $r->print(''); + $r->print('
'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'
'.&mt('This can increase the time taken to gather data for the [_1] page by a few seconds.',"What's New?").'  '.&mt('Currently set to [_1].',''.$current.'')); $r->print('

-
'. -&mt('Display of unread post counts?').'  + -on -    -off + '); - $r->print('

-
'); + $r->print('
+ +         + + '); return; } @@ -589,13 +613,14 @@ sub courseinit_config { my ($control,$current) = &curr_courseinit(); my @chgstate = ('userpref','coursespecific'); my @chgentry = ('firstres','whatsnew'); + my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); my %lt = &Apache::lonlocal::texthash( - 'chwp' => 'Choose which page will be displayed when you enter this course after selecting a role.', + '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 course entry', - 'moce' => 'Modify course entry', + 'chce' => 'Choose '.$lctype.' entry', + 'moce' => 'Modify '.$lctype.' entry', ); $r->print(<<"END");
$lt{'chwp'} @@ -605,17 +630,27 @@ $$initpage{$current}.

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

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

'); @@ -625,17 +660,19 @@ END sub curr_courseinit { my $current = &get_current($env{'user.name'},$env{'user.domain'}, $env{'request.course.id'},'courseinit'); - my %userenv = &Apache::lonnet::get('environment',['course_init_display']); my $control; - if ($current eq '') { + if ($current) { + $control = 'coursespecific'; + } else { $control = 'userpref'; - if (exists($userenv{'firstres'})) { - $current = 'firstres'; - } else { + my %userenv = &Apache::lonnet::get('environment', + ['course_init_display']); + if (exists($userenv{'course_init_display'})) { + $current = $userenv{'course_init_display'}; + } + unless ($current) { $current = 'whatsnew'; } - } else { - $control = 'coursespecific'; } return ($control,$current); } @@ -661,7 +698,7 @@ sub display_launcher { } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS &display_abovethreshold($r,$refpage,$warnings,$triggered, - $res_title,$rowColor1,$rowColor2); + $res_title); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, $countunread,$res_title,$rowColor1,$rowColor2); @@ -686,7 +723,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; @@ -695,17 +731,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); @@ -726,8 +751,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 @@ -745,78 +770,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 eq 'on') { #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()) { @@ -848,7 +827,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; @@ -869,6 +848,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"})) { @@ -900,16 +882,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} .= '
'.$stats{$part}{attempts}.' '.$stats{$part}{degdiff}.' '.$lastreset{$part}.'
'.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'
'.$lt{'reso'}.''.$lt{'part'}.''.$lt{'nust'}.''.$lt{'avat'}.''.$lt{'dedi'}.''.$lt{'lare'}.''.$lt{'reco'}.'
'.$$triggered{$res}{title}.'
'.$$triggered{$res}{title}.'

'); } else { @@ -1284,7 +1252,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'}.'
'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'

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


'.&mt('No new [_1] messages',$lctype).'

'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'

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


'.&mt('No unread critical messages in [_1]',$lctype).'

'.$lt{'chth'}.'
'.$lt{'chin'}.'
'.$lt{'chop'}.'