--- loncom/interface/lonwhatsnew.pm 2006/09/06 19:20:04 1.61 +++ loncom/interface/lonwhatsnew.pm 2008/12/12 15:48:05 1.83 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.61 2006/09/06 19:20:04 albertel Exp $ +# $Id: lonwhatsnew.pm,v 1.83 2008/12/12 15:48:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,7 @@ use Apache::lonlocal; use Apache::loncoursedata(); use Apache::lonnavmaps(); use Apache::lonuserstate; +use Apache::lonuserutils; use Apache::Constants qw(:common :http); use Time::Local; use GDBM_File; @@ -68,6 +69,8 @@ sub handler { ['vgr','abovethreshold',1], ['opa','haserrors',1], ['mdc','versionchanges',0], + ['vcl','newroles',1], + ['vcl','oldroles',1], ) { my ($perm,$key,$check_section) = @{ $perm_check }; my $scope = $env{'request.course.id'}; @@ -99,32 +102,46 @@ sub handler { text=>"Display Action Items"}); if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage, + ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage, text=>"Change thresholds"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs ("What's New?",#'Course_Action_Items_Thresholds' )); } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage, + ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage, text=>"Change interval"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs ("What's New?",#'Course_Action_Items_Intervals' )); } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage, + ({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, + ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage, text=>"Course initialization preference"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs ("What's New?",#'Course_Action_Items_Initialization' )); + } elsif ($command eq 'chgoldroleinterval' && $checkallowed{'oldroles'}) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/whatsnew?command=chgoldroleinterval&refpage='.$refpage, + text=>"Change interval"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + ("What's New?",#'Course_Action_Items_Intervals' + )); + } elsif ($command eq 'chgnewroleinterval' && $checkallowed{'newroles'}) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/whatsnew?command=chgnewroleinterval&refpage='.$refpage, + text=>"Change interval"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + ("What's New?",#'Course_Action_Items_Intervals' + )); } else { $r->print(&Apache::lonhtmlcommon::breadcrumbs ("What's New?",#'Course_Action_Items_Display' @@ -144,7 +161,6 @@ 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(&Apache::loncommon::course_type()); $r->print('
');
@@ -153,14 +169,29 @@ sub display_main_box {
degdiff => 'Degree of difficulty',
numstudents => 'Total number of students with submissions',
);
-
- my %interval_titles = &Apache::lonlocal::texthash (
- -1 => "since start of $lctype",
- 2592000 => 'since last month',
- 604800 => 'since last week',
- 86400 => 'since yesterday',
+ my %versions = (
+ -1 => "version changes since start of $lctype",
+ 2592000 => 'version changes since last month',
+ 604800 => 'version changes since last week',
+ 86400 => 'version changes since yesterday',
+ );
+ my %newroles = (
+ -1 => "roles which have become active since start of $lctype",
+ 2592000 => 'roles which have become active since last month',
+ 604800 => 'roles which have become active since last week',
+ 86400 => 'roles which have become active since yesterday',
+ );
+ my %oldroles = (
+ -1 => "roles which expired since start of $lctype",
+ 2592000 => 'roles which expired since last month',
+ 604800 => 'roles which expired since last week',
+ 86400 => 'roles which expired since yesterday',
+ );
+ my %interval_titles = (
+ versions => \%versions,
+ newroles => \%newroles,
+ oldroles => \%oldroles,
);
-
my %initpage = &Apache::lonlocal::texthash (
firstres => "first resource in the $lctype",
whatsnew => "what's new? page",
@@ -172,18 +203,24 @@ 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'}) {
- &display_interval_config($r,$refpage,\%interval_titles);
+ &display_interval_config($r,$refpage,\%interval_titles,'versions');
} elsif (($command eq 'chgdisc')
&& $checkallowed->{'coursediscussion'}) {
&display_discussion_config($r,$refpage);
} elsif ($command eq 'courseinit') {
&courseinit_config($r,$refpage,\%initpage);
+ } elsif (($command eq 'chgnewroleinterval')
+ && $checkallowed->{'newroles'}) {
+ &display_interval_config($r,$refpage,\%interval_titles,'newroles');
+ } elsif (($command eq 'chgoldroleinterval')
+ && $checkallowed->{'oldroles'}) {
+ &display_interval_config($r,$refpage,\%interval_titles,'oldroles');
} 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();
@@ -206,12 +243,13 @@ sub display_header {
my ($command,$checkallowed) = @_;
my $scripttag;
- unless ($command eq 'chgthreshold' || $command eq 'chginterval') {
+ unless ($command eq 'chgthreshold' || $command eq 'chginterval' ||
+ $command eq 'chgoldroleinterval' || $command eq 'chgnewroleinterval') {
$scripttag = <<"END";
');
- $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('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 'What's New?' page by a few seconds.") + .' ' + .&mt('Currently set to [_1].',''.$current.'.') + ); $r->print(' '); @@ -640,9 +741,9 @@ END if ($choice eq $control) { $chkstring = ' checked="checked" '; } - $r->print(' '.&mt('If').' '.$$initpage{'coursespecific'}. ' - '.$lt{'chce'}.": \n"); @@ -651,9 +752,9 @@ END if (($choice eq $current) && ($control eq 'coursespecific')) { $chkstring = ' checked="checked" '; } - $r->print(' '); @@ -681,36 +782,37 @@ 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,$expired,$expirecount,$activated,$activecount, + $crstype) = @_; if ($$checkallowed{$action}) { - &start_box($r,$tabbg,$show,$headings,$action,$refpage,$action); + &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->{'versions'}); } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS &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); + $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); + } elsif ($action eq 'newroles') { # ACTIVATED ROLES + &display_rolechanges($r,$activecount,$activated,$interval->{'newroles'}, + $crstype); + } elsif ($action eq 'oldroles') { # EXPIRED ROLES + &display_rolechanges($r,$expirecount,$expired,$interval->{'oldroles'}, + $crstype); } } &end_box($r); @@ -720,8 +822,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, @@ -747,6 +849,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(); @@ -788,12 +894,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'); } } @@ -814,7 +925,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); } } } @@ -843,7 +958,6 @@ sub check_thresholds { my %stats; my %lastreset = (); my $warning = 0; - my $rowColor; foreach my $part (@parts) { if ($resource->handgrade($part) eq 'yes') { next; @@ -883,29 +997,28 @@ sub check_thresholds { } if ($warning) { $$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.' | '; + $$triggered{$symb}{text}[$partcount] = ' +'.&mt('part - ').$part.' | '; } else { - $$triggered{$symb}{text} .= ' -single part | '; + $$triggered{$symb}{text}[$partcount] = ' +'.&mt('single part').' | '; } - $$triggered{$symb}{text} .= ' + $$triggered{$symb}{text}[$partcount] .= ''.$stats{$part}{users}.' | '.$stats{$part}{attempts}.' | '.$stats{$part}{degdiff}.' | '.$lastreset{$part}.' | -- | '; + $partcount ++; } + $$triggered{$symb}{numparts} = $partcount; } push(@{$warnings},$symb); } @@ -914,6 +1027,11 @@ sub check_thresholds { 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; @@ -1000,12 +1118,12 @@ sub process_reset { sub process_update { my ($uname,$udom,$threshold_titles) = @_; - my $setoutput = 'Changes to threshold(s) for problem tracking: | ||||||||||||
'.$lt{'prna'}.' | '.$lt{'nmun'}.' | ||||||||||||||||||||
'. + $lt{'prna'}.' | '. + $lt{'nmun'}.' | ||||||||||||||||||||
'.$$ungraded{$res}{title}.' | '.$$ungraded{$res}{count}.' | ||||||||||||||||||||
'.$$ungraded{$res}{title}.' | '.$$ungraded{$res}{count}.' | ||||||||||||||||||||
'.$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{'reso'}.' | '. + ''.$lt{'reso'}.' | '. ''.$lt{'part'}.' | '.$lt{'nust'}.' | '. ''.$lt{'avat'}.' | '.$lt{'dedi'}.' | '. - ''.$lt{'lare'}.' | '.$lt{'reco'}.' | '.$lt{'lare'}.' | '. + $lt{'reco'}.' | '); my $row; foreach my $res (@{$warnings}) { $row++; @@ -1218,55 +1535,127 @@ sub display_abovethreshold { $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"'; } $linkurl .= '?symb='.&escape($res); - $r->print('||||||||||||
'. - $$triggered{$res}{title}.' | '. - $$triggered{$res}{text}); + $$triggered{$res}{title}.''); + if (ref($$triggered{$res}{text}) eq 'ARRAY') { + $r->print($$triggered{$res}{text}[0]); + } + $r->print('|||||||||||||||||||||
'.$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'}.' | ||||||||||||||||||
' + .&mt('No '.$interval).' | |||||||||||||||||||||
'.$lt{'tich'}.' | '. + ''.$lt{'user'}.' | '. + ''.$lt{'role'}.' | '. + ''.$lt{'sec'}.' | '. + ''.$lt{'status'}.' | |||||||||||||||||
'.&Apache::lonlocal::locallocaltime($item).' | '. + ''.$link.' | '. + ''.$role.' | '. + ''.$section.' | '. + ''.$status.' | |||||||||||||||||
' + .&mt('There are no '.$interval).' | |||||||||||||||||||||
'.$lt{'loca'}. - ' | '.$lt{'type'}. - ''); + $r->print(' | ||||||||||||||||||||
'. + $lt{'loca'}.' | '. + $lt{'type'}.' | '); if ($countunread eq 'on') { - $r->print(''.$lt{'tmlp'}.' | '. - ''.$lt{'numn'}. - ' | '); + $r->print(''.$lt{'tmlp'}.' | '. + ''.$lt{'numn'}.' | '); } else { - $r->print(''.$lt{'tmlp'}. - ' | '); + $r->print(''.$lt{'tmlp'}.' | '); } $r->print("||||||||||||||
'.$forum_title.' | '.$type.' | '); + $r->print('||||||||||||||||||||
'.$forum_title.' | '.&mt($type).' | '); if ($countunread eq 'on') { my $unreadnum = $$unread{$ressymb}{'unreadcount'}; - $r->print(''.$lastpost.' | '. - '',$unreadnum.' | '); + $r->print(''.$lastpost.' | '. + $unreadnum.' | '); } else { - $r->print(''.$lastpost.' | '); + $r->print(''.$lastpost.' | '); } $r->print("||||||||||||||
'.$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 '.$lctype.' messages').' | |||||||||||||||||||||
'. + &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 '.$lctype).' | |||||||||||||||||||||
'. + &mt('No unread critical messages in '.$lctype). + ' |
-
|