--- loncom/interface/lonwhatsnew.pm 2006/05/30 20:16:23 1.56 +++ loncom/interface/lonwhatsnew.pm 2007/03/02 20:58:32 1.69 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.56 2006/05/30 20:16:23 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.69 2007/03/02 20:58:32 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -144,8 +144,7 @@ sub display_main_box { 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($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); $r->print('
'); my %threshold_titles = &Apache::lonlocal::texthash ( @@ -172,7 +171,7 @@ sub display_main_box { if (($command eq 'chgthreshold') && $checkallowed->{'abovethreshold'}) { - &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles, + &display_threshold_config($r,$refpage,\%threshold_titles, $cdom,$crs); } elsif (($command eq 'chginterval') && $checkallowed->{'versionchanges'}) { @@ -183,7 +182,7 @@ sub display_main_box { } elsif ($command eq 'courseinit') { &courseinit_config($r,$refpage,\%initpage); } else { - &display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles, + &display_actions_box($r,$command,$refpage,\%threshold_titles, \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); } my $end_page = &Apache::loncommon::end_page(); @@ -228,8 +227,9 @@ END '; } - return &Apache::loncommon::start_page(&mt('[_1] Action Items', - $env{'course.'.$env{'request.course.id'}.'.type'}),$scripttag); + my $course_type=&Apache::loncommon::course_type(); + return &Apache::loncommon::start_page($course_type.' Action Items', + $scripttag); } #------------------------------- @@ -240,22 +240,19 @@ END #------------------------------- sub display_actions_box { - my ($r,$tabbg,$command,$refpage,$threshold_titles,$interval_titles, - $initpage,$cdom,$crs,$checkallowed) = @_; - my $rowColor1 = "#ffffff"; - my $rowColor2 = "#eeeeee"; - + my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage, + $cdom,$crs,$checkallowed) = @_; my $udom = $env{'user.domain'}; my $uname = $env{'user.name'}; my $cid = $env{'request.course.id'}; - my $crstype = $env{'course.'.$cid.'.type'}; + 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 or group', + 'yacc' => 'You are accessing an invalid course', 'gtfr' => 'Go to first resource', 'hial' => 'Hide all', 'shal' => 'Show all', @@ -285,11 +282,7 @@ sub display_actions_box { $result = &store_courseinit_setting($uname,$udom,$cid,$initpage); } - my %threshold = ( - av_attempts => 2, - degdiff => 0.5, - numstudents => 2, - ); + my %threshold = (); my %pagedesc = &Apache::lonlocal::texthash ( firstres => 'First resource', whatsnew => "What's New? page", @@ -315,10 +308,10 @@ sub display_actions_box { '
'); } } - $r->print(&mt('Page set to be displayed after you have selected a role in this [_1]',$lctype). + $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 [_2]',$refpage,$lctype).' '. - &mt('or for all your courses/groups',$refpage).'
'); + &mt('Change for just this '.$lctype.'',$refpage).' '. + &mt('or for all your courses',$refpage).'
'); if ($command eq 'reset') { $result = &process_reset($cdom,$crs); @@ -372,7 +365,10 @@ sub display_actions_box { &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 [_1] with submissions',$stulabel{$crstype}).' ≥ '.$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'); @@ -396,7 +392,7 @@ sub display_actions_box { } if ($needitems) { - &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); + &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); } if ($show{'coursenormalmail'}) { $msgcount = &getnormalmail(\@newmsgs); @@ -432,7 +428,7 @@ sub display_actions_box { if ($displayed == $halfway) { $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); + &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread); $displayed ++; } } @@ -454,7 +450,7 @@ sub display_actions_box { #------------------------------- sub display_threshold_config { - my ($r,$refpage,$tabbg,$threshold_titles,$cdom,$crs) = @_; + my ($r,$refpage,$threshold_titles,$cdom,$crs) = @_; my $uname = $env{'user.name'}; my $udom = $env{'user.dom'}; my $cid = $env{'request.course.id'}; @@ -464,9 +460,6 @@ sub display_threshold_config { my $rowColor; my @thresholditems = ("av_attempts","degdiff","numstudents"); - foreach my $item (@thresholditems) { - $threshold{$item} = ''; - } my %threshold_titles = &Apache::lonlocal::texthash( av_attempts => 'Average number of attempts', degdiff => 'Degree of difficulty', @@ -474,48 +467,31 @@ sub display_threshold_config { ); &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs); - $r->print('
- - - '."\n"; - } if (@parts > 1) { - $$triggered{$symb}{text} .= ' - '; + $$triggered{$symb}{text}[$partcount] = ' + '; } else { - $$triggered{$symb}{text} .= ' - '; + $$triggered{$symb}{text}[$partcount] = ' + '; } - $$triggered{$symb}{text} .= ' - - - - - - '; - $$triggered{$symb}{numparts} ++; + $$triggered{$symb}{text}[$partcount] .= ' + + + + + '; + $partcount ++; } + $$triggered{$symb}{numparts} = $partcount; } push(@{$warnings},$symb); - $$warningnum ++; } } sub get_curr_thresholds { my ($threshold,$uname,$udom,$cid,$cdom,$crs) = @_; + # set default values + %$threshold = (av_attempts => 2, + degdiff => 0.5, + numstudents => 2 + ); my %thresholdsettings = &Apache::lonnet::dump('nohist_whatsnew',$udom, $uname,$cid.':threshold'); my $thresholdcount = 0; @@ -1010,7 +987,7 @@ sub process_update { next if ($_!~/^form\.(.+)\_setparmval$/); my $name = $1; my $value = $env{'form.'.$name.'_value'}; - if ($name && defined($value)) { + if ($name && defined($value) && ($value ne '')) { my $put_result = &Apache::lonnet::put('nohist_whatsnew', {$name=>$value},$udom,$uname); @@ -1134,57 +1111,56 @@ sub checkversions { } sub display_handgrade { - my ($r,$tograde,$rowColor1,$rowColor2,$ungraded) = @_; - my $rowColor; + my ($r,$tograde,$ungraded) = @_; my %lt = &Apache::lonlocal::texthash( 'prna' => 'Problem Name', 'nmun' => 'Number ungraded', 'nopr' => 'No problems require handgrading', ); if (@{$tograde} > 0) { - $r->print(''); + $r->print(''); my $rowNum = 0; foreach my $res (@{$tograde}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } + $rowNum ++; + my $css_class = $rowNum%2?' class="LC_odd_row"':''; my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); my $linkurl=&Apache::lonnet::clutter($url); $linkurl .= '?symb='.&escape($res); - - $r->print(''); - $rowNum ++; + if ($$ungraded{$res}{'enclink'}) { + $linkurl = + $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'}; + } + $r->print(''); } } else { - $r->print(''); + $r->print(''); } } sub display_haserrors { - my ($r,$bombs,$rowColor1,$rowColor2,$bombed,$res_title) = @_; + my ($r,$bombs,$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(''); + $r->print(''); @{$bombs} = sort { &cmp_title($a,$b,$res_title) } @{$bombs}; foreach my $bomb (@{$bombs}) { - if ($bombnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(''); $bombnum ++; + my $css_class = $bombnum%2?' class="LC_odd_row"':''; + $r->print(''); } } else { - $r->print(''); + $r->print(''); } return; } @@ -1208,8 +1184,15 @@ sub display_abovethreshold { ' '."\n". ' '. "\n"); - $r->print(''); + $r->print(''. + ''. + ''. + ''. + ''); + my $row; foreach my $res (@{$warnings}) { + $row++; my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); my $linkurl=&Apache::lonnet::clutter($url); my $rowspan; @@ -1217,16 +1200,35 @@ sub display_abovethreshold { $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"'; } $linkurl .= '?symb='.&escape($res); - $r->print(''.$$triggered{$res}{text}); + if ($$triggered{$res}{'enclink'}) { + $linkurl = + $$triggered{$res}{'enclink'}.'?symb='.$$triggered{$res}{'encsymb'}; + } + my $css_class = $row%2?' class="LC_odd_row"':''; + $r->print(''. + ''); + if (ref($$triggered{$res}{text}) eq 'ARRAY') { + $r->print($$triggered{$res}{text}[0]); + } + $r->print(''); + if (ref($$triggered{$res}{text}) eq 'ARRAY') { + if (@{$$triggered{$res}{text}} > 1) { + for (my $i=1; $i<@{$$triggered{$res}{text}}; $i++) { + $r->print(''. + $$triggered{$res}{text}[$i].''); + } + } + } } - $r->print(''); } else { - $r->print(''); + $r->print(''); } } sub display_versionchanges { - my ($r,$changed,$res_title,$rowColor1,$rowColor2,$interval) = @_; + my ($r,$changed,$res_title,$interval) = @_; my %lt = &Apache::lonlocal::texthash( 'reso' => 'Resource', 'revd' => 'Last revised', @@ -1234,36 +1236,36 @@ sub display_versionchanges { 'veru' => 'Version used', 'noup' => 'No updated versions', ); - my $rowColor; if (keys(%{$changed}) > 0) { - $r->print(''); - - + $r->print(''); my @changes = sort { &cmp_title($a,$b,$res_title) } keys(%{$changed}); my $changenum = 0; foreach my $item (@changes) { - if ($changenum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } + $changenum ++; + my $css_class = $changenum%2?' class="LC_odd_row"':''; my ($map,$id,$url)=&Apache::lonnet::decode_symb($item); my $linkurl=&Apache::lonnet::clutter($url); $linkurl .= '?symb='.&escape($item); - $r->print(''); - $changenum ++; + $r->print(''); } } else { - $r->print(''); + $r->print(''); } return; } sub display_coursediscussion { - my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1, - $rowColor2) = @_; - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my ($r,$newdiscussions,$unread,$countunread,$res_title) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); my %lt = &Apache::lonlocal::texthash( 'loca' => 'Location', 'type' => 'Type', @@ -1271,97 +1273,96 @@ sub display_coursediscussion { 'noun' => 'No unread posts in '.$lctype.' discussions', 'tmlp' => 'Time of last post', ); - my $rowColor; if (@{$newdiscussions} > 0) { - $r->print(''); if ($countunread eq 'on') { - $r->print(''. - ''); + $r->print(''. + ''); } else { - $r->print(''); + $r->print(''); } $r->print("\n"); @{$newdiscussions} = sort { &cmp_title($a,$b,$res_title) } @{$newdiscussions}; my $rowNum = 0; foreach my $ressymb (@{$newdiscussions}) { + $rowNum ++; my $forum_title = $$unread{$ressymb}{'title'}; my $type = 'Resource'; my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb); + my $disclink = $feedurl.'?symb='.$$unread{$ressymb}{symb}; if ($feedurl =~ /bulletinboard/) { $type = 'Bulletin Board'; } - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; + if ($$unread{$ressymb}{'enclink'}) { + $disclink = $$unread{$ressymb}{'enclink'}.'?symb='.$$unread{$ressymb}{'encsymb'}; } + my $css_class = $rowNum%2?' class="LC_odd_row"':''; my $lastpost = &Apache::lonnavmaps::timeToHumanString( $$unread{$ressymb}{'lastpost'}); - $r->print(''); + $r->print(''); if ($countunread eq 'on') { my $unreadnum = $$unread{$ressymb}{'unreadcount'}; - $r->print(''); + $r->print(''); } else { - $r->print(''); + $r->print(''); } $r->print("\n"); - $rowNum ++; } } else { - $r->print(''); + $r->print(''); } } sub display_coursenormalmail { - my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_; - my $rowColor; - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my ($r,$msgcount,$newmsgs) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); if ($msgcount > 0) { - $r->print(''); - my $rowNum = 0; - my $mailcount = 1; + $r->print(''); + my $mailcount = 0; foreach my $msg (@{$newmsgs}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(''); - $rowNum ++; $mailcount ++; + my $css_class = $mailcount%2?' class="LC_odd_row"':''; + $r->print(''); } } 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'}); + my ($r,$critmsgcount,$critmsgs) = @_; + my $lctype = lc(&Apache::loncommon::course_type()); if ($critmsgcount > 0) { - $r->print(''); - my $rowNum = 0; - my $mailcount = 1; + $r->print(''); + my $mailcount = 0; foreach my $msg (@{$critmsgs}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(''); - $rowNum ++; $mailcount ++; + my $css_class = $mailcount%2?' class="LC_odd_row"':''; + $r->print(''); } } else { - $r->print(''); + $r->print(''); } } @@ -1380,7 +1381,7 @@ sub get_display_settings { if ($tmp=~ /^(con_lost|error|no_such_host)/i) { %settings = (); unless ($tmp =~ /^error: 2 /) { - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); &Apache::lonnet::logthis('Error retrieving whatsnew settings: '. $tmp.' for '.$uname.':'.$udom.' for '.$lctype.': '.$cid); } @@ -1422,7 +1423,7 @@ sub store_interval_setting { ''.$$interval_titles{$env{'form.interval'}}.'
'); } else { - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + my $lctype = lc(&Apache::loncommon::course_type()); &Apache::lonnet::logthis('Error storing whatsnew interval setting'. ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); $result = &mt('Unable to set interval to [_1] due to [_2].', @@ -1446,7 +1447,7 @@ sub store_discussion_setting { ''.$env{'form.countunread'}.'
'); } else { - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + 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]'. @@ -1475,14 +1476,14 @@ sub store_courseinit_setting { } } if ($page_control) { - my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + 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 [_1] now set by user's global preferences.",$lctype); + $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 [_1] set to [_2]',$lctype,$$initpage{$env{'form.courseinit_page'}}); + $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 '. @@ -1494,7 +1495,7 @@ sub store_courseinit_setting { ''.$page_control.'', ''.$outcome.'.
'); } else { - $result = &mt('Unable to set page display, after role selection, for this [_1] to [_2] due to [_3].
',$lctype, + $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to [_2] due to [_3].
', $$initpage{$env{'form.courseinit_page'}},$outcome); } } @@ -1504,7 +1505,7 @@ sub store_courseinit_setting { } sub start_box { - my ($r,$tabbg,$show,$heading,$caller,$refpage) = @_; + my ($r,$show,$heading,$caller,$refpage) = @_; my %lt = &Apache::lonlocal::texthash( chth => 'Change thresholds?', chin => 'Change interval?', @@ -1521,46 +1522,37 @@ sub start_box { } $r->print(' -
- - -
- - -
- - - - - - '); - my $rowNum =0; + $r->print('
'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''."\n". + ''."\n". + ''."\n". + &Apache::loncommon::end_data_table_header_row()); foreach my $type (@thresholditems) { 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']". '.checked=true;"'; - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(' - - - '."\n". + ' - - '); - $rowNum ++; + 10,$onchange).''."\n". + ''."\n". + &Apache::loncommon::end_data_table_row()); } - $r->print('
Threshold NameCurrent valueChange?
Threshold NameCurrent valueChange?
'.$threshold_titles{$type}.''.&Apache::lonhtmlcommon::textbox($parameter.'_value', + $r->print(&Apache::loncommon::start_data_table_row()."\n". + ''.$threshold_titles{$type}.''.&Apache::lonhtmlcommon::textbox($parameter.'_value', $threshold{$type}, - 10,$onchange).'' - .&Apache::lonhtmlcommon::checkbox($parameter.'_setparmval'). - '
'. + &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval'). + '
-
+ $r->print(&Apache::loncommon::end_data_table()."\n". + '
'); @@ -530,10 +506,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 $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 [_1].',$lctype)); + $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 [_1]',''. $$interval_titles{$current}.'.')); @@ -612,7 +588,7 @@ 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 $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', @@ -677,36 +653,30 @@ sub curr_courseinit { } sub display_launcher { - 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) = @_; + my ($r,$action,$refpage,$checkallowed,$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,$refpage); + &start_box($r,$show,$headings,$action,$refpage,$action); if ($$show{$action}) { if ($action eq 'handgrading') { # UNGRADED ITEMS - &display_handgrade($r,$tograde,$rowColor1,$rowColor2, - $ungraded); + &display_handgrade($r,$tograde,$ungraded); } elsif ($action eq 'haserrors') { # BOMBS - &display_haserrors($r,$bombs,$rowColor1,$rowColor2,$bombed, - $res_title); + &display_haserrors($r,$bombs,$bombed,$res_title); } elsif ($action eq 'versionchanges') { # VERSION CHANGES - &display_versionchanges($r,$changed,$res_title,$rowColor1, - $rowColor2,$interval); - + &display_versionchanges($r,$changed,$res_title,$interval); } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS &display_abovethreshold($r,$refpage,$warnings,$triggered, - $res_title); + $res_title); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, - $countunread,$res_title,$rowColor1,$rowColor2); + $countunread,$res_title); } elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES - &display_coursenormalmail($r,$msgcount,$newmsgs,$rowColor1, - $rowColor2); + &display_coursenormalmail($r,$msgcount,$newmsgs); } elsif ($action eq 'coursecritmail') { # CRITICAL MESSAGES - &display_coursecritmail($r,$critmsgcount,$critmsgs,$rowColor1, - $rowColor2); + &display_coursecritmail($r,$critmsgcount,$critmsgs); } } &end_box($r); @@ -716,8 +686,8 @@ sub display_launcher { sub getitems { my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions, - $tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs, - $res_title,$show,$starttime,$countunread) = @_; + $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show, + $starttime,$countunread) = @_; my $navmap = Apache::lonnavmaps::navmap->new(); # force retrieve Resource to seed the part id cache we'll need it later my @allres=$navmap->retrieveResources(undef, @@ -735,7 +705,6 @@ sub getitems { $cdom,$crs); } - my $warningnum = 0; foreach my $resource (@allres) { my $result = ''; my $applies = 0; @@ -744,6 +713,10 @@ sub getitems { %{$$ungraded{$symb}} = (); %{$$triggered{$symb}} = (); $$triggered{$symb}{numparts} = 0; + if ($resource->encrypted()) { + $$triggered{$symb}{'enclink'} = $resource->link(); + $$triggered{$symb}{'encsymb'} = $resource->shown_symb(); + } my $title = $resource->compTitle(); $$res_title{$symb} = $title; my $ressymb = $resource->wrap_symb(); @@ -769,8 +742,8 @@ 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); + &check_thresholds($resource,$symb,\%resourcetracker, + $triggered,$threshold,$warnings); } } @@ -785,12 +758,17 @@ sub check_discussions { %{$$unread{$ressymb}} = (); $$unread{$ressymb}{'title'} = $title; $$unread{$ressymb}{'symb'} = $symb; + if ($resource->encrypted()) { + $$unread{$ressymb}{'enclink'} = $resource->link(); + $$unread{$ressymb}{'encsymb'} = $resource->shown_symb(); + } push(@{$newdiscussions}, $ressymb); $$unread{$ressymb}{'lastpost'} = $resource->last_post_time(); if ($countunread eq 'on') { - $$unread{$ressymb}{'unreadcount'} = $resource->unread_discussion(); + $$unread{$ressymb}{'unreadcount'} = + $resource->discussion_info('unread'); } } @@ -811,7 +789,11 @@ sub check_handgraded { if (@ungraded > 0) { $$ungraded{$symb}{count} = scalar(@ungraded); $$ungraded{$symb}{title} = $title; - push(@{$tograde}, $symb); + if ($resource->encrypted()) { + $$ungraded{$symb}{'enclink'} = $resource->link(); + $$ungraded{$symb}{'encsymb'} = $resource->shown_symb(); + } + push(@{$tograde},$symb); } } } @@ -834,14 +816,12 @@ sub check_bombed { } sub check_thresholds { - my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings, - $warningnum,$rowColor1,$rowColor2) = @_; + my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_; # 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; @@ -880,45 +860,42 @@ sub check_thresholds { } } if ($warning) { - if ($$warningnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $$triggered{$symb}{rowColor} = $rowColor; $$triggered{$symb}{title} = $resource->title; + my $partcount = 0; + @{$$triggered{$symb}{text}} = (); foreach my $part (@parts) { if (exists($stats{$part}{users})) { my $resetname = 'reset_'.&escape($symb."\0".$part); my $resettitle = 'title_'.&escape($symb."\0".$part); - if ($$triggered{$symb}{numparts}) { - $$triggered{$symb}{text} .= '
part - '.$part.'part - '.$part.'single partsingle part'.$stats{$part}{users}.''.$stats{$part}{attempts}.''.$stats{$part}{degdiff}.''.$lastreset{$part}.'
'.$stats{$part}{users}.''.$stats{$part}{attempts}.''.$stats{$part}{degdiff}.''.$lastreset{$part}.'
'.$lt{'prna'}.''.$lt{'nmun'}.'
'. + $lt{'prna'}.''. + $lt{'nmun'}.'
'.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'
'.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'

  '.$lt{'nopr'}.'  

'.$lt{'nopr'}.'
'.$lt{'reso'}.''.$lt{'nmer'}.'
'. + $lt{'reso'}.''. + $lt{'nmer'}.'
'.$$bombed{$bomb}{errorlink}.''.$$bombed{$bomb}{errorcount}.'
'.$$bombed{$bomb}{errorlink}. + ''. + $$bombed{$bomb}{errorcount}.'

'.$lt{'noer'}.'

'.$lt{'noer'}.'
'.$lt{'reso'}.''.$lt{'part'}.''.$lt{'nust'}.''.$lt{'avat'}.''.$lt{'dedi'}.''.$lt{'lare'}.''.$lt{'reco'}.'
'.$lt{'reso'}.''.$lt{'part'}.''.$lt{'nust'}.''.$lt{'avat'}.''.$lt{'dedi'}.''.$lt{'lare'}.''. + $lt{'reco'}.'
'.$$triggered{$res}{title}.''. + $$triggered{$res}{title}.'

'); + $r->print('


'.$lt{'nopr'}.'

'.$lt{'nopr'}.'
'.$lt{'reso'}.''.$lt{'revd'}.''.$lt{'newv'}.''.$lt{'veru'}.'
'. + $lt{'reso'}.''.$lt{'revd'}.''. + $lt{'newv'}.''. + $lt{'veru'}.'
'.$$res_title{$item}.''.$$changed{$item}{'revdate'}.''.$$changed{$item}{'current'}.''.$$changed{$item}{'version'}.'
'. + $$res_title{$item}.''. + $$changed{$item}{'revdate'}.''. + $$changed{$item}{'current'}.''. + $$changed{$item}{'version'}.'

'.$lt{'noup'}.' '.$interval.'

'.$lt{'noup'}. + ' '.$interval.'
'.$lt{'loca'}. - ''.$lt{'type'}. - ''); + $r->print('
'. + $lt{'loca'}.''. + $lt{'type'}.''.$lt{'tmlp'}.''.$lt{'numn'}. - ''.$lt{'tmlp'}.''.$lt{'numn'}.''.$lt{'tmlp'}. - ''.$lt{'tmlp'}.'
'.$forum_title.' '.$type.' '.$forum_title.' '.$type.' '.$lastpost.''. - '',$unreadnum.' '.$lastpost.''. + $unreadnum.' '.$lastpost.''.$lastpost.'

 '. - $lt{'noun'}.'

'.$lt{'noun'}.'
'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'
'. + &mt('Number').''.&mt('Subject').''. + &mt('Sender').''. + &mt('Date/Time').'
'.$mailcount.'.  '.$msg->{'shortsub'}.'    '.$msg->{'from'}.'@'.$msg->{'fromdom'}.' '.$msg->{'sendtime'}.'
'.$mailcount. + '.  '. + $msg->{'shortsub'}.'    '. + $msg->{'from'}.'@'.$msg->{'fromdom'}.' '. + $msg->{'sendtime'}.'

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

'. + &mt('No new '.$lctype.' messages').'
'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'
'. + &mt('Number').''.&mt('Subject').''. + &mt('Sender').''. + &mt('Date/Time').'
'.$mailcount.'.  '.$msg->{'shortsub'}.'    '.$msg->{'from'}.'@'.$msg->{'fromdom'}.' '.$msg->{'sendtime'}.'
'.$mailcount. + '.  '. + $msg->{'shortsub'}.'    '. + $msg->{'from'}.'@'.$msg->{'fromdom'}.' '. + $msg->{'sendtime'}.'

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

'. + &mt('No unread critical messages in '.$lctype). + '
+
-
- - - - '); + + + '); if (($caller eq 'abovethreshold') && ($$show{$caller})) { if ($$show{$caller}) { $r->print(' - + '); } } elsif (($caller eq 'versionchanges') && ($$show{$caller})) { if ($$show{$caller}) { $r->print(' - + '); } } elsif ($caller eq 'coursediscussion') { if ($$show{$caller}) { $r->print(' - + '); } } - $r->print(' + $r->print(' -
- - - - - -
'.$$heading{$caller}.''.$showhide.'
-
'.$$heading{$caller}.''.$showhide.'
'.$lt{'chth'}.''.$lt{'chth'}.'
'.$lt{'chin'}.''.$lt{'chin'}.'
'.$lt{'chop'}.''.$lt{'chop'}.'
- + -
+ '); return; } @@ -1568,9 +1560,6 @@ sub start_box { sub end_box { my ($r) = shift; $r->print(' -
-