--- loncom/interface/lonwhatsnew.pm 2006/09/07 19:31:26 1.62 +++ loncom/interface/lonwhatsnew.pm 2010/02/28 22:38:11 1.101 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.62 2006/09/07 19:31:26 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.101 2010/02/28 22:38:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,11 +36,13 @@ 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; use lib '/home/httpd/lib/perl/'; use LONCAPA; +use HTML::Entities; #---------------------------- # handler @@ -68,6 +70,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'}; @@ -96,35 +100,49 @@ sub handler { &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew', - text=>"Display Action Items"}); + text=>"What's New?"}); 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 +162,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(''; + '; } else { $$triggered{$symb}{text}[$partcount] = ' - '; + '; } $$triggered{$symb}{text}[$partcount] .= ' @@ -913,6 +1042,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; @@ -999,28 +1133,28 @@ sub process_reset { sub process_update { my ($uname,$udom,$threshold_titles) = @_; - my $setoutput = 'Changes to threshold(s) for problem tracking:
'; + my $setoutput = ''.&mt('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)) { + if ($name && defined($value) && ($value ne '')) { my $put_result = &Apache::lonnet::put('nohist_whatsnew', {$name=>$value},$udom,$uname); my ($shortname) = ($name =~ /^\Q$env{'request.course.id'}\E:threshold_(.+)$/); if ($put_result eq 'ok') { - $setoutput.=&mt('Set threshold for [_1] to [_2]', + $setoutput.= &Apache::lonhtmlcommon::confirm_success(&mt('Set threshold for [_1] to [_2]', ''.$$threshold_titles{$shortname}.'', - ''.$value.'').'
'; + ''.$value.'').'
'); } else { - $setoutput.=&mt('Unable to set threshold for [_1] to [_2] due to [_3].', + $setoutput.= &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set threshold for [_1] to [_2] due to [_3].', ''.$name.'',''.$value.'', - ''.$put_result.'').'
'; + ''.$put_result.'').'
',1); } } } - return $setoutput; + return &Apache::loncommon::confirmwrapper($setoutput); } sub getnormalmail { @@ -1035,10 +1169,9 @@ sub getnormalmail { &Apache::lonmsg::unpackmsgid($msgid); if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { if (defined($sendtime) && $sendtime!~/error/) { - my $numsendtime = $sendtime; - $sendtime = &Apache::lonlocal::locallocaltime($sendtime); if ($status eq 'new') { - $msgcount ++; + $sendtime = &Apache::lonlocal::locallocaltime($sendtime); + $msgcount ++; if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } @@ -1067,7 +1200,6 @@ sub getcritmail { &Apache::lonmsg::unpackmsgid($msgid); if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { if (defined($sendtime) && $sendtime!~/error/) { - my $numsendtime = $sendtime; $sendtime = &Apache::lonlocal::locallocaltime($sendtime); $critmsgcount ++; if ($shortsubj eq '') { @@ -1086,6 +1218,205 @@ sub getcritmail { return $critmsgcount; } +sub getexpired { + my ($rolechgs,$rolechgtime,$status) = @_; + my $expirecount = &getrolechanges($rolechgs,$rolechgtime,$status); + return $expirecount; +} + +sub getactivated { + my ($rolechgs,$rolechgtime,$status) = @_; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $now = time(); + my $context = 'course'; + my ($permission,$allowed) = + &Apache::lonuserutils::get_permission($context); + my $viewablesec = &Apache::lonuserutils::viewable_section($permission); + my %changes=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum); + my (%stucounted,%advcounted); + my $activatedcount = 0; + if (keys(%changes) > 0) { + foreach my $chg (sort { $b <=> $a } (keys(%changes))) { + if (ref($changes{$chg}) eq 'HASH') { + my $timestamp = $changes{$chg}{'exe_time'}; + if ($timestamp) { + if ($rolechgtime > 0) { + if ($timestamp < $rolechgtime) { + last; + } + } + if (ref($changes{$chg}{'logentry'}) eq 'HASH') { + next if ($changes{$chg}{'delflag'}); + my $start = $changes{$chg}{'logentry'}{'start'}; + my $end = $changes{$chg}{'logentry'}{'end'}; + my $section = $changes{$chg}{'logentry'}{'section'}; + my $role = $changes{$chg}{'logentry'}{'role'}; + my $uname = $changes{$chg}{'uname'}; + my $udom = $changes{$chg}{'udom'}; + next if ($end && $end <= $now); + if (($viewablesec ne '') && ($section ne '')) { + next if ($viewablesec ne $section); + } + next if ($start >= $timestamp); + if ($role eq 'st') { + $stucounted{$uname.':'.$udom.':'.$section} = $start.':'.$end; + } else { + $advcounted{$uname.':'.$udom.':'.$role.':'.$section} = $start.':'.$end; + } + my %chginfo = ( + 'section' => $section, + 'uname' => $uname, + 'udom' => $udom, + 'role' => $role, + 'status' => $status, + ); + $activatedcount ++; + push (@{$rolechgs->{$timestamp}},\%chginfo); + } + } + } + } + } + $activatedcount += &getrolechanges($rolechgs,$rolechgtime,$status,\%stucounted,\%advcounted); + return $activatedcount; +} + +sub getrolechanges { + my ($rolechgs,$rolechgtime,$status,$stucountref,$advcountref) = @_; + my (%stucounted,%advcounted); + if (ref($stucountref) eq 'HASH') { + %stucounted = %{$stucountref}; + } + if (ref($advcountref) eq 'HASH') { + %advcounted = %{$advcountref}; + } + my $withsec = 1; + my $hidepriv = 1; + my $context = 'course'; + my @statuses = ($status); + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $now = time(); + my ($permission,$allowed) = + &Apache::lonuserutils::get_permission($context); + my $viewablesec = &Apache::lonuserutils::viewable_section($permission); + my $classlist = &Apache::loncoursedata::get_classlist(); + my $secidx = &Apache::loncoursedata::CL_SECTION(); + my $startidx = &Apache::loncoursedata::CL_START(); + my $endidx = &Apache::loncoursedata::CL_END(); + my $rolechgcount = 0; + foreach my $key (keys(%{$classlist})) { + my ($userstatus,$eventtime); + my $student = $classlist->{$key}; + if (ref($student) eq 'ARRAY') { + my $start = $student->[$startidx]; + my $end = $student->[$endidx]; + my $sec = $student->[$secidx]; + my ($stuname,$studom) = split(/:/,$key); + if ($status eq 'active') { + if (exists($stucounted{$key.':'.$sec})) { + next; + } + } + if (($end == 0) || ($end > $start)) { + if ($start <= $now) { + if ($end && $end < $now) { + if ($rolechgtime > 0) { + if ($end > $rolechgtime) { + $userstatus = 'previous'; + } + } else { + $userstatus = 'previous'; + } + } else { + if ($rolechgtime > 0) { + if ($start >= $rolechgtime) { + $userstatus = 'active'; + } + } else { + $userstatus = 'active'; + } + } + } + } + next if ($userstatus ne $status); + if ($status eq 'active') { + $eventtime = $start; + } else { + $eventtime = $end; + } + if (($viewablesec ne '') && ($sec ne '')) { + next if ($viewablesec ne $sec); + } + my %chginfo = ( + 'section' => $sec, + 'uname' => $stuname, + 'udom' => $studom, + 'role' => 'st', + 'status' => $userstatus, + ); + $rolechgcount ++; + push (@{$rolechgs->{$eventtime}},\%chginfo); + } + } + my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef, + \@statuses,undef,undef,$withsec,$hidepriv); + foreach my $item (keys(%advrolehash)) { + my ($userstatus,$eventtime); + my ($uname,$udom,$role,$section) = split(/:/,$item,-1); + my ($start,$end) = split(/:/,$advrolehash{$item}); + if ($start eq '-1' && $end eq '-1') { + next; + } else { + if ($status eq 'active') { + if (exists($advcounted{$item})) { + next; + } + } + if (($end == 0) || ($end > $start)) { + if ($start <= $now) { + if ($end && $end < $now) { + if ($rolechgtime > 0) { + if ($end > $rolechgtime) { + $userstatus = 'previous'; + } + } else { + $userstatus = 'previous'; + } + } else { + if ($rolechgtime > 0) { + if ($start >= $rolechgtime) { + $userstatus = 'active'; + } + } else { + $userstatus = 'active'; + } + } + } + } + next if ($userstatus ne $status); + if ($status eq 'active') { + $eventtime = $start; + } else { + $eventtime = $end; + } + } + if (($viewablesec ne '') && ($section ne '')) { + next if ($viewablesec ne $section); + } + my %chginfo = ( + 'section' => $section, + 'uname' => $uname, + 'udom' => $udom, + 'role' => $role, + 'status' => $userstatus, + ); + $rolechgcount ++; + push (@{$rolechgs->{$eventtime}},\%chginfo); + } + return $rolechgcount; +} sub checkversions { my ($cdom,$crs,$navmap,$changed,$starttime) = @_; @@ -1128,63 +1459,66 @@ sub checkversions { } sub display_handgrade { - my ($r,$tograde,$rowColor1,$rowColor2,$ungraded) = @_; - my $rowColor; + my ($r,$tograde,$ungraded,$itemserror) = @_; 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(''); } + } elsif ($itemserror) { + $r->print(''); } else { - $r->print(''); + $r->print(''); } } sub display_haserrors { - my ($r,$bombs,$rowColor1,$rowColor2,$bombed,$res_title) = @_; + my ($r,$bombs,$bombed,$res_title,$itemserror) = @_; 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(''); } + } elsif ($itemserror) { + $r->print(''); } else { - $r->print(''); + $r->print(''); } return; } sub display_abovethreshold { - my ($r,$refpage,$warnings,$triggered,$res_title) = @_; + my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', part => 'Part', @@ -1203,10 +1537,11 @@ sub display_abovethreshold { ' '. "\n"); $r->print(''. - ''. + ''. ''. ''. - ''); + ''); my $row; foreach my $res (@{$warnings}) { $row++; @@ -1217,8 +1552,12 @@ sub display_abovethreshold { $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"'; } $linkurl .= '?symb='.&escape($res); - my $css_class = $row%2?'LC_odd_row':''; - $r->print(''. + 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') { @@ -1234,50 +1573,110 @@ sub display_abovethreshold { } } } - $r->print(''); + $r->print(''); + } elsif ($itemserror) { + $r->print(''); } else { - $r->print('
'.$lt{'nopr'}.'
'); + $r->print(''); } } sub display_versionchanges { - my ($r,$changed,$res_title,$rowColor1,$rowColor2,$interval) = @_; + my ($r,$changed,$res_title,$interval,$itemserror) = @_; my %lt = &Apache::lonlocal::texthash( 'reso' => 'Resource', 'revd' => 'Last revised', 'newv' => 'New version', '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(''); + } + } elsif ($itemserror) { + $r->print(''); + } else { + $r->print(''); + } + return; +} + +sub display_rolechanges { + my ($r,$chgcount,$changed,$interval,$crstype) = @_; + my $now = time(); + my %lt = &Apache::lonlocal::texthash( + 'user' => 'User', + 'tich' => 'Time of change', + 'role' => 'Role', + 'sec' => 'Section', + 'status' => 'Status', + ); + if ($chgcount) { + $r->print(''. + ''. + ''. + ''. + ''. + ''); + if (ref($changed) eq 'HASH') { + my @changes = sort { $b <=> $a } (keys(%{$changed})); + my $changenum = 0; + foreach my $item (@changes) { + if (ref($changed->{$item}) eq 'ARRAY') { + foreach my $chg (@{$changed->{$item}}) { + if (ref($chg) eq 'HASH') { + my $section; + my $role = + &Apache::lonnet::plaintext($chg->{'role'},$crstype); + my $status = &mt($chg->{'status'}); + if ($chg->{'section'} eq '') { + $section = &mt('none'); + } else { + $section = $chg->{'section'}; + } + my $uname = $chg->{'uname'}; + my $udom = $chg->{'udom'}; + $changenum ++; + my $css_class = $changenum%2?' class="LC_odd_row"':''; + my $link = + &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom); + $r->print(''. + ''. + ''. + ''. + ''. + ''); + } + } + } + } } } else { - $r->print(''); + $r->print(''); } return; } sub display_coursediscussion { - my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1, - $rowColor2) = @_; + my ($r,$newdiscussions,$unread,$countunread,$res_title,$itemserror) = @_; my $lctype = lc(&Apache::loncommon::course_type()); my %lt = &Apache::lonlocal::texthash( 'loca' => 'Location', @@ -1286,97 +1685,99 @@ 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'; + $type = 'Discussion 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 ++; } + } elsif ($itemserror) { + $r->print(''); } else { - $r->print(''); + $r->print(''); } } sub display_coursenormalmail { - my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_; - my $rowColor; + 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 ($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(''); } } @@ -1428,24 +1829,32 @@ sub store_interval_setting { my ($uname,$udom,$cid,$interval_titles) = @_; my %interval_settings = (); my $result; - if (defined($env{'form.interval'})) { - $interval_settings{$cid.':interval'} = $env{'form.interval'}; + my $context = $env{'form.intervaltype'}; + if ($env{'form.interval'} ne '') { + if ($context eq 'oldroles') { + $interval_settings{$cid.':oldroleinterval'} = $env{'form.interval'}; + } elsif ($context eq 'newroles') { + $interval_settings{$cid.':newroleinterval'} = $env{'form.interval'}; + } else { + $interval_settings{$cid.':interval'} = $env{'form.interval'}; + } my $outcome = &Apache::lonnet::put('nohist_whatsnew', \%interval_settings,$udom,$uname); if ($outcome eq 'ok') { - $result = &mt('Interval set to version changes [_1]', - ''.$$interval_titles{$env{'form.interval'}}.'
'); - + if (ref($interval_titles->{$context}) eq 'HASH') { + $result = &Apache::lonhtmlcommon::confirm_success(&mt('New filter setting: [_1].',''. + $interval_titles->{$context}->{$env{'form.interval'}}.'').'
'); + } } else { my $lctype = lc(&Apache::loncommon::course_type()); - &Apache::lonnet::logthis('Error storing whatsnew interval setting'. + &Apache::lonnet::logthis('Error saving whatsnew '.$context.' interval setting'. ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); - $result = &mt('Unable to set interval to [_1] due to [_2].', - ''.$$interval_titles{$env{'form.interval'}}.'', - ''.$outcome.'.
'); + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set interval to [_1] due to [_2].', + ''.$interval_titles->{$context}->{$env{'form.interval'}}.'', + ''.$outcome.''),1); } } - return $result; + return &Apache::loncommon::confirmwrapper($result); } sub store_discussion_setting { @@ -1457,20 +1866,20 @@ sub store_discussion_setting { 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'}.'
'); + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Count unread posts in discussions display set to [_1]', + ''.&mt($env{'form.countunread'}).'').'
'); } else { my $lctype = lc(&Apache::loncommon::course_type()); - &Apache::lonnet::logthis('Error storing whatsnew countunread setting'. + &Apache::lonnet::logthis('Error saving whatsnew countunread setting'. ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); - $result = &mt('Unable to set "number unread posts display" to [_1]'. + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set "number unread posts display" to [_1]'. ' due to [_2].', - ''.$env{'form.countunread'}.'', - ''.$outcome.'.
'); + ''.&mt($env{'form.countunread'}).'', + ''.$outcome.''),1); } } - return $result; + return &Apache::loncommon::confirmwrapper($result); } sub store_courseinit_setting { @@ -1495,88 +1904,96 @@ sub store_courseinit_setting { \%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."); + $result = &Apache::lonhtmlcommon::confirm_success(&mt("Page displayed after role selection in $lctype now set by [_1]user's global preferences[_2].",'','')); } else { - $result = &mt('Page displayed after role selection in this '.$lctype.' set to [_2]',$lctype,$$initpage{$env{'form.courseinit_page'}}); + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Page displayed after role selection in this '.$lctype.' set to [_1].' + ,''.$$initpage{$env{'form.courseinit_page'}}.'')); } } else { - &Apache::lonnet::logthis('Error storing whatsnew courseinit '. + &Apache::lonnet::logthis('Error saving 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]'. + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set control of page display to [_1]'. ' due to [_2].', ''.$page_control.'', - ''.$outcome.'.
'); + ''.$outcome.''),1); } 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); + $result = &Apache::lonhtmlcommon::confirm_success(&mt('Unable to set page display, after role selection, for this '.$lctype.' to [_1] due to [_2].' + ,''.$$initpage{$env{'form.courseinit_page'}}.'' + ,''.$outcome.''),1); } } } } - return $result; + return &Apache::loncommon::confirmwrapper($result); } 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?', chop => 'Change options?', ); - my ($showhide,$class); + my $showhide; if ($$show{$caller}) { $showhide = 'Hide'; + 'display_'.$caller.",'hide'".');">'. + &mt('Hide').''; } else { $showhide = 'Show'; + 'display_'.$caller.",'show'".');">'. + &mt('Show').''; } $r->print(' -
'); @@ -153,17 +170,32 @@ 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", + whatsnew => "What's New Page", userpref => 'your general user preferences', coursespecific => "specific setting for this $lctype", ); @@ -172,18 +204,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 +244,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 discussion board which has unread posts.') + .'
' + .&mt("This can increase the time taken to gather data for the [_1]What's New Page[_2] by a few seconds.",'','') + .'  ' + .&mt('Currently set to [_1].',''.$current.'.') + ); $r->print('

@@ -593,10 +701,10 @@ function toggle_countunread(choice) { '); $r->print('
-         - '. + (' ' x7). + '
'); @@ -623,7 +731,7 @@ sub courseinit_config { 'anis' => 'and is set to display', 'padc' => 'Page display controlled by', 'chce' => 'Choose '.$lctype.' entry', - 'moce' => 'Modify '.$lctype.' entry', + 'moce' => 'Save', ); $r->print(<<"END");
$lt{'chwp'} @@ -640,9 +748,9 @@ END if ($choice eq $control) { $chkstring = ' checked="checked" '; } - $r->print(''); + '  '); } $r->print('

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

'); @@ -681,36 +789,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,$itemserror) = @_; 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,$itemserror); } elsif ($action eq 'haserrors') { # BOMBS - &display_haserrors($r,$bombs,$rowColor1,$rowColor2,$bombed, - $res_title); + &display_haserrors($r,$bombs,$bombed,$res_title,$itemserror); } elsif ($action eq 'versionchanges') { # VERSION CHANGES - &display_versionchanges($r,$changed,$res_title,$rowColor1, - $rowColor2,$interval); - + &display_versionchanges($r,$changed,$res_title,$interval->{'versions'},$itemserror); } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS &display_abovethreshold($r,$refpage,$warnings,$triggered, - $res_title); + $res_title,$itemserror); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, - $countunread,$res_title,$rowColor1,$rowColor2); + $countunread,$res_title,$itemserror); } 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,9 +829,13 @@ 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(); + if (!defined($navmap)) { + my $itemserror = ''.&mt('An error occurred retrieving information about the course.').'
'.&mt('It is recommended that you [_1]re-select the course[_2].','','').'
'; + return $itemserror; + } # 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;}); @@ -747,6 +860,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(); @@ -777,6 +894,7 @@ sub getitems { } } + return; } sub check_discussions { @@ -788,12 +906,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 +937,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,11 +970,13 @@ sub check_thresholds { my %stats; my %lastreset = (); my $warning = 0; - my $rowColor; foreach my $part (@parts) { if ($resource->handgrade($part) eq 'yes') { next; } + if ($resource->is_anonsurvey($part)) { + next; + } if ($resource->is_survey($part)) { next; } @@ -891,10 +1020,10 @@ sub check_thresholds { my $resettitle = 'title_'.&escape($symb."\0".$part); if (@parts > 1) { $$triggered{$symb}{text}[$partcount] = ' -
part - '.$part.''.&mt('part - ').$part.'single part'.&mt('single part').''.$stats{$part}{users}.'
'.$lt{'prna'}.''.$lt{'nmun'}.'
'. + $lt{'prna'}.''. + $lt{'nmun'}.'
'.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'
'.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'
'.$itemserror.'

  '.$lt{'nopr'}.'  

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

'.$lt{'noer'}.'

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


'.$itemserror.'
'.$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'}.'
'.$itemserror.'
' + .&mt('No '.$interval).'
'.$lt{'tich'}.''.$lt{'user'}.''.$lt{'role'}.''.$lt{'sec'}.''.$lt{'status'}.'
'.&Apache::lonlocal::locallocaltime($item).''.$link.''.$role.''.$section.''.$status.'

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

' + .&mt('There are no '.$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.' '.&mt($type).' '.$lastpost.''. - '',$unreadnum.' '.$lastpost.''. + $unreadnum.' '.$lastpost.''.$lastpost.'
'.$itemserror.'

 '. - $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 '.$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). + '
+
-
- - - - '); + + + '); if (($caller eq 'abovethreshold') && ($$show{$caller})) { if ($$show{$caller}) { $r->print(' - + '); } - $class='class="LC_whatsnew"'; } elsif (($caller eq 'versionchanges') && ($$show{$caller})) { if ($$show{$caller}) { $r->print(' - + '); } } elsif ($caller eq 'coursediscussion') { if ($$show{$caller}) { $r->print(' - + + '); + } + } elsif (($caller eq 'newroles') && ($$show{$caller})) { + if ($$show{$caller}) { + $r->print(' + + + '); + } + } elsif (($caller eq 'oldroles') && ($$show{$caller})) { + if ($$show{$caller}) { + $r->print(' + + '); } } $r->print(' -
- - - - - -
'.$$heading{$caller}.''.$showhide.'
-
'.$$heading{$caller}.''.$showhide.'
'.$lt{'chth'}.''.$lt{'chth'}.'
'.$lt{'chin'}.''.$lt{'chin'}.'
'.$lt{'chop'}.''.$lt{'chop'}.'
'.$lt{'chin'}.'
'.$lt{'chin'}.'
- + -
+ '); return; } @@ -1584,9 +2001,6 @@ sub start_box { sub end_box { my ($r) = shift; $r->print(' -
-