--- loncom/interface/lonwhatsnew.pm 2017/05/19 19:55:09 1.105.2.14 +++ loncom/interface/lonwhatsnew.pm 2013/10/21 22:34:33 1.114 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.105.2.14 2017/05/19 19:55:09 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.114 2013/10/21 22:34:33 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,36 +62,17 @@ sub handler { my $command = $env{'form.command'}; my $refpage = $env{'form.refpage'}; - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; - - my ($isadhoc,%checkallowed); - - if ($env{'request.role'} =~ m{^(cc|co)/}) { - my $rolecode = $1; - if ($env{"environment.internal.$cdom.$crs.$env{'request.role'}.adhoc"}) { - $isadhoc = 1; - } - } elsif ($env{'request.role'} =~ m{^cr/$cdom/$cdom\-domainconfig/(\w+)\./}) { - my $rolename = $1; - if ($env{"environment.internal.$cdom.$crs.cr/$cdom/$cdom-domainconfig/$rolename.adhoc"}) { - $isadhoc = 1; - } - } - unless ($isadhoc) { - %checkallowed = ( coursenormalmail => 1, - coursecritmail => 1,); - } + my %checkallowed = ( coursenormalmail => 1, + coursecritmail => 1, ); foreach my $perm_check (['whn','whatsnew',1], ['pch','coursediscussion',1], ['mgr','handgrading',1], ['vgr','abovethreshold',1], - ['vgr','haserrors',1], - ['whn','versionchanges',1], + ['opa','haserrors',1], + ['mdc','versionchanges',0], ['vcl','newroles',1], ['vcl','oldroles',1], ['whn','crslogin',1], - ['mgr','resetcounters',1], ) { my ($perm,$key,$check_section) = @{ $perm_check }; my $scope = $env{'request.course.id'}; @@ -175,7 +156,7 @@ sub handler { ("What's New?",#'Course_Action_Items_Display' )); } - &display_main_box($r,$command,$refpage,\%checkallowed,$cdom,$crs); + &display_main_box($r,$command,$refpage,\%checkallowed); return OK; } @@ -186,7 +167,7 @@ sub handler { #------------------------------ sub display_main_box { - my ($r,$command,$refpage,$checkallowed,$cdom,$crs) = @_; + my ($r,$command,$refpage,$checkallowed) = @_; my $domain=&Apache::loncommon::determinedomain(); my $function = &Apache::loncommon::get_users_function(); my $lctype = lc(&Apache::loncommon::course_type()); @@ -233,10 +214,13 @@ sub display_main_box { userpref => 'your general user preferences', coursespecific => "specific setting for this $lctype", ); + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; if (($command eq 'chgthreshold') && $checkallowed->{'abovethreshold'}) { - &display_threshold_config($r,$refpage,\%threshold_titles,$cdom,$crs); + &display_threshold_config($r,$refpage,\%threshold_titles, + $cdom,$crs); } elsif (($command eq 'chginterval') && $checkallowed->{'versionchanges'}) { &display_interval_config($r,$refpage,\%interval_titles,'versions'); @@ -457,7 +441,7 @@ sub display_actions_box { $r->print(&Apache::loncommon::head_subbox($header)); if ($command eq 'reset') { - $result = &process_reset($cdom,$crs,$checkallowed); + $result = &process_reset($cdom,$crs); } elsif ($command eq 'update') { $result = &process_update($uname,$udom,$threshold_titles); } elsif ($command eq 'newinterval') { @@ -589,18 +573,6 @@ sub display_actions_box { '
',$threshold{'numstudents'}); my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin'); - my %actioncolumn = ( - handgrading => 'left', - haserrors => 'left', - abovethreshold => 'left', - versionchanges => 'left', - coursediscussion => 'right', - coursenormalmail => 'right', - coursecritmail => 'right', - newroles => 'right', - oldroles => 'right', - crslogin => 'right', - ); foreach my $key (keys(%{$checkallowed})) { if ($key =~ /_section$/) { next; } @@ -624,11 +596,11 @@ sub display_actions_box { my $itemserror; if ($needitems) { - $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread,$checkallowed); + $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); } my $classlist; if ($show{'oldroles'} || $show{'newroles'} || $show{'crslogin'}) { - $classlist = &Apache::loncoursedata::get_classlist(); + $classlist = &Apache::loncoursedata::get_classlist(); } if ($show{'coursenormalmail'}) { $msgcount = &getnormalmail(\@newmsgs); @@ -666,13 +638,12 @@ sub display_actions_box { $totalboxes ++; } } - my $currcolumn = 'left'; + my $halfway = 4; # my $halfway = int($totalboxes/2) + $totalboxes%2; foreach my $actionitem (@actionorder) { - if ($checkallowed->{$actionitem}) { - if (($actioncolumn{$actionitem} eq 'right') && ($currcolumn eq 'left')) { + if ($$checkallowed{$actionitem}) { + if ($displayed == $halfway) { $r->print(' '); - $currcolumn = 'right'; } &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,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror,\%loggedin,$logincount,$classlist); $displayed ++; @@ -828,7 +799,7 @@ function toggle_countunread(choice) { .'
' .&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.'') + .&mt('Currently set to [_1].',''.$current.'.') ); $r->print('

@@ -943,7 +914,7 @@ sub display_launcher { &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,$itemserror,$checkallowed); + $res_title,$itemserror); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, $countunread,$res_title,$itemserror); @@ -970,7 +941,7 @@ sub display_launcher { sub getitems { my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions, $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show, - $starttime,$countunread,$checkallowed) = @_; + $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].','','').''; @@ -1030,8 +1001,7 @@ sub getitems { # Maxtries and degree of difficulty for problem parts, unless handgradeable if ($$show{'abovethreshold'}) { &check_thresholds($resource,$symb,\%resourcetracker, - $triggered,$threshold,$warnings, - $checkallowed); + $triggered,$threshold,$warnings); } } @@ -1105,8 +1075,7 @@ sub check_bombed { } sub check_thresholds { - my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings, - $checkallowed) = @_; + my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_; # Compile maxtries and degree of difficulty for problem parts, unless handgradeable my @parts = @{$resource->parts()}; my %stats; @@ -1172,12 +1141,8 @@ sub check_thresholds { '.$stats{$part}{users}.' '.$stats{$part}{attempts}.' '.$stats{$part}{degdiff}.' - '.$lastreset{$part}.''; - if ($checkallowed->{'resetcounters'}) { - $$triggered{$symb}{text}[$partcount] .= - ''. - ''; - } + '.$lastreset{$part}.' + '; $partcount ++; } $$triggered{$symb}{numparts} = $partcount; @@ -1199,7 +1164,7 @@ sub get_curr_thresholds { my $thresholdcount = 0; my ($tmp) = %thresholdsettings; unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { - foreach my $item (keys(%{$threshold})) { + foreach my $item (keys %{$threshold}) { if (exists($thresholdsettings{$cid.':threshold_'.$item})) { $$threshold{$item} = $thresholdsettings{$cid.':threshold_'.$item}; @@ -1214,7 +1179,7 @@ sub get_curr_thresholds { $cdom,$crs,'internal.threshold'); my ($temp) = %coursesettings; unless ($temp =~ /^(con_lost|error|no_such_host)/i) { - foreach my $item (keys(%{$threshold})) { + foreach my $item (keys %{$threshold}) { unless (exists($thresholdsettings{$cid.':threshold_'.$item})) { if (exists($coursesettings{'internal.threshold_'.$item})) { $$threshold{$item} = @@ -1239,11 +1204,7 @@ sub get_current { } sub process_reset { - my ($dom,$crs,$checkallowed) = @_; - if (!$checkallowed->{'resetcounters'}) { - return ''.&mt('You do not have the required privileges to reset counters'). - '
'; - } + my ($dom,$crs) = @_; my $result = ''.&mt('Counters reset for following problems (and parts):'). '
'; my @agg_types = ('attempts','users','correct'); @@ -1285,13 +1246,9 @@ sub process_reset { sub process_update { my ($uname,$udom,$threshold_titles) = @_; my $setoutput = ''.&mt('Changes to threshold(s) for problem tracking:').'

'; - foreach my $key (keys(%env)) { - my $name; - if ($key =~/^form\.(.+)\_setparmval$/) { - $name = $1; - } else { - next; - } + foreach (keys %env) { + next if ($_!~/^form\.(.+)\_setparmval$/); + my $name = $1; my $value = $env{'form.'.$name.'_value'}; if ($name && defined($value) && ($value ne '')) { my $put_result = &Apache::lonnet::put('nohist_whatsnew', @@ -1314,36 +1271,29 @@ sub process_update { sub getnormalmail { my ($newmsgs) = @_; -# Check for unread messages in user's INBOX (which were sent in context of current course). +# Check for unread mail in course my $msgcount = 0; - my @messages = &Apache::lonnet::getkeys('nohist_email'); - return $msgcount if (!@messages); - my %emailstatus = &Apache::lonnet::dump('email_status'); - foreach my $msgid (sort(@messages)) { - if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) { - my $skipstatus; - if ($emailstatus{$msgid} eq 'new') { - $skipstatus = 1; - } - my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= - &Apache::lonmsg::unpackmsgid($msgid,undef,$skipstatus,undef, - $env{'request.course.id'}); - if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { - if (defined($sendtime) && $sendtime!~/error/) { - if (($emailstatus{$msgid} eq 'new') || ($status eq 'new')) { - $sendtime = &Apache::lonlocal::locallocaltime($sendtime); - $msgcount ++; - if ($shortsubj eq '') { - $shortsubj = &mt('No subject'); - } - push(@{$newmsgs}, { - msgid => $msgid, - sendtime => $sendtime, - shortsub => $shortsubj, - from => $fromname, - fromdom => $fromdom - }); + + my @messages = sort(&Apache::lonnet::getkeys('nohist_email')); + foreach my $message (@messages) { + my $msgid=&escape($message); + my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= + &Apache::lonmsg::unpackmsgid($msgid); + if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { + if (defined($sendtime) && $sendtime!~/error/) { + if ($status eq 'new') { + $sendtime = &Apache::lonlocal::locallocaltime($sendtime); + $msgcount ++; + if ($shortsubj eq '') { + $shortsubj = &mt('No subject'); } + push(@{$newmsgs}, { + msgid => $msgid, + sendtime => $sendtime, + shortsub => $shortsubj, + from => $fromname, + fromdom => $fromdom + }); } } } @@ -1353,14 +1303,13 @@ sub getnormalmail { sub getcritmail { my ($critmsgs) = @_; -# Check for critical messages which were sent in context of current course. +# Check for critical messages in course my %what=&Apache::lonnet::dump('critical'); my $result = ''; my $critmsgcount = 0; foreach my $msgid (sort(keys(%what))) { my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= - &Apache::lonmsg::unpackmsgid($msgid,undef,1,undef, - $env{'request.course.id'}); + &Apache::lonmsg::unpackmsgid($msgid); if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { if (defined($sendtime) && $sendtime!~/error/) { $sendtime = &Apache::lonlocal::locallocaltime($sendtime); @@ -1669,13 +1618,13 @@ sub display_handgrade { foreach my $res (@{$tograde}) { $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); + my $linkurl='/adm/grades'; if ($$ungraded{$res}{'enclink'}) { - $linkurl = - $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'}; + $linkurl.='?symb='.$$ungraded{$res}{'encsymb'}; + } else { + $linkurl.='?symb='.&escape($res); } + $linkurl.='&command=ungraded'; $r->print(''.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.''); } } elsif ($itemserror) { @@ -1714,7 +1663,7 @@ sub display_haserrors { } sub display_abovethreshold { - my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror,$checkallowed) = @_; + my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', part => 'Part', @@ -1733,11 +1682,8 @@ sub display_abovethreshold { ''. ''.$lt{'part'}.''.$lt{'nust'}.''. ''.$lt{'avat'}.''.$lt{'dedi'}.''. - ''.$lt{'lare'}.''); - if ($checkallowed->{'resetcounters'}) { - $r->print(''.$lt{'reco'}.''); - } - $r->print(''); + ''.$lt{'lare'}.''. + $lt{'reco'}.''); my $row; foreach my $res (@{$warnings}) { $row++; @@ -1769,9 +1715,7 @@ sub display_abovethreshold { } } } - if ($checkallowed->{'resetcounters'}) { - $r->print('
'); - } + $r->print('
'); } elsif ($itemserror) { $r->print(''.$itemserror.''); } else { @@ -1922,7 +1866,7 @@ sub display_crslogins { my $udom = $user->{'udom'}; my $fullname; if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') { - $fullname = $classlist->{$uname.':'.$udom}->[$fullnameidx]; + $fullname = $classlist->{$user}->[$fullnameidx]; } else { $fullname = &Apache::loncommon::plainname($uname,$udom,'lastname'); } @@ -2002,7 +1946,7 @@ sub display_coursediscussion { my $forum_title = $$unread{$ressymb}{'title'}; my $type = 'Resource'; my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb); - my $disclink = $feedurl.'?symb='.&escape($$unread{$ressymb}{symb}); + my $disclink = $feedurl.'?symb='. &escape($$unread{$ressymb}{symb}); if ($feedurl =~ /bulletinboard/) { $type = 'Discussion Board'; }