version 1.34, 2005/12/05 16:42:26
|
version 1.38.2.2, 2005/12/22 22:39:49
|
Line 54 sub handler {
|
Line 54 sub handler {
|
} |
} |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['command']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['command']); |
|
|
my $command; |
my $command = $env{'form.command'}; |
if ($env{'form.action'} eq 'reset') { |
|
$command = 'reset'; |
|
} elsif ($env{'form.action'} eq 'update') { |
|
$command = 'update'; |
|
} else { |
|
$command = $env{'form.command'}; |
|
} |
|
|
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
$r->print(&display_header($command)); |
|
if (! (($env{'request.course.fn'}) && (&Apache::lonnet::allowed('bre',$env{'request.course.id'})))) { |
if (! (($env{'request.course.fn'}) && (&Apache::lonnet::allowed('bre',$env{'request.course.id'})))) { |
# Not in a course, or not allowed to view action items |
# Not in a course, or not allowed to view action items |
$env{'user.error.msg'}="/adm/whatsnew:bre:0:0:Cannot display what's new screen"; |
$env{'user.error.msg'}="/adm/whatsnew:bre:0:0:Cannot display what's new screen"; |
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
} |
} |
|
|
|
my %checkallowed = ( |
|
coursediscussion => &Apache::lonnet::allowed('pch',$env{'request.course.id'}), |
|
handgrading => &Apache::lonnet::allowed('mgr',$env{'request.course.id'}), |
|
abovethreshold => &Apache::lonnet::allowed('vgr',$env{'request.course.id'}), |
|
haserrors => &Apache::lonnet::allowed('opa',$env{'request.course.id'}), |
|
versionchanges => &Apache::lonnet::allowed('opa',$env{'request.course.id'}), |
|
coursenormalmail => 1, |
|
coursecritmail => 1, |
|
); |
|
|
|
$r->print(&display_header($command,\%checkallowed)); |
|
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
|
&Apache::lonhtmlcommon::add_breadcrumb |
|
({href=>'/adm/whatsnew', |
|
text=>"Display Action Items"}); |
if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { |
if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>'/adm/whatsnew?command=threshold', |
({href=>'/adm/whatsnew?command=chgthreshold', |
text=>"Change thresholds"}); |
text=>"Change thresholds"}); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs |
$r->print(&Apache::lonhtmlcommon::breadcrumbs |
(undef,'Course Action Items','Course_Action_Items_Thresholds')); |
(undef,'Course Action Items','Course_Action_Items_Thresholds')); |
} else { |
} elsif (($command eq 'chginterval') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>'/adm/whatsnew', |
({href=>'/adm/whatsnew?command=chginterval', |
text=>"Display Action Items"}); |
text=>"Change interval"}); |
|
$r->print(&Apache::lonhtmlcommon::breadcrumbs |
|
(undef,'Course Action Items','Course_Action_Items_Intervals')); |
|
} else { |
$r->print(&Apache::lonhtmlcommon::breadcrumbs |
$r->print(&Apache::lonhtmlcommon::breadcrumbs |
(undef,'Course Action Items','Course_Action_Items_Display')); |
(undef,'Course Action Items','Course_Action_Items_Display')); |
} |
} |
&display_main_box($r,$command); |
&display_main_box($r,$command,\%checkallowed); |
return OK; |
return OK; |
} |
} |
|
|
Line 97 sub handler {
|
Line 107 sub handler {
|
#------------------------------ |
#------------------------------ |
|
|
sub display_main_box { |
sub display_main_box { |
my ($r,$command) = @_; |
my ($r,$command,$checkallowed) = @_; |
my $domain=&Apache::loncommon::determinedomain(); |
my $domain=&Apache::loncommon::determinedomain(); |
my $tabbg=&Apache::loncommon::designparm('coordinator.tabbg',$domain); |
my $function = &Apache::loncommon::get_users_function(); |
|
my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); |
|
|
$r->print('<table width="100%" border="0" cellpadding="5" cellspacing="0"><tr><td width="100%">'); |
$r->print('<table width="100%" border="0" cellpadding="5" cellspacing="0"><tr><td width="100%">'); |
|
|
my %threshold_titles = ( |
my %threshold_titles = ( |
Line 107 sub display_main_box {
|
Line 119 sub display_main_box {
|
degdiff => 'Degree of difficulty', |
degdiff => 'Degree of difficulty', |
numstudents => 'Total number of students with submissions', |
numstudents => 'Total number of students with submissions', |
); |
); |
|
|
|
my %interval_titles = ( |
|
-1 => 'since start of course', |
|
2592000 => 'since last month', |
|
604800 => 'since last week', |
|
86400 => 'since yesterday', |
|
); |
|
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
|
if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { |
if (($command eq 'chgthreshold') && |
&display_config_box($r,$command,$tabbg,\%threshold_titles,$cdom,$crs); |
(&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) { |
|
&display_threshold_config($r,$command,$tabbg,\%threshold_titles, |
|
$cdom,$crs); |
|
} elsif (($command eq 'chginterval') && |
|
(&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) { |
|
&display_interval_config($r,\%interval_titles); |
} else { |
} else { |
&display_actions_box($r,$command,\%threshold_titles,$cdom,$crs); |
&display_actions_box($r,$tabbg,$command,\%threshold_titles, |
|
\%interval_titles,$cdom,$crs,$checkallowed); |
} |
} |
$r->print(<<END_OF_BLOCK); |
$r->print(<<END_OF_BLOCK); |
</td> |
</td> |
Line 132 END_OF_BLOCK
|
Line 158 END_OF_BLOCK
|
#------------------------------- |
#------------------------------- |
|
|
sub display_header{ |
sub display_header{ |
|
my ($command,$checkallowed) = @_; |
my $html=&Apache::lonxml::xmlbegin(); |
my $html=&Apache::lonxml::xmlbegin(); |
my $bodytag=&Apache::loncommon::bodytag('Course Action Items'); |
my $bodytag=&Apache::loncommon::bodytag('Course Action Items'); |
|
my $scripttag; |
|
unless ($command eq 'chgthreshold' || $command eq 'chginterval') { |
|
$scripttag = <<"END"; |
|
<script type="text/javascript"> |
|
function change_display(caller,change) { |
|
caller.value = change; |
|
document.visible.submit(); |
|
} |
|
|
|
function changeAll(change) { |
|
END |
|
foreach my $item (keys(%{$checkallowed})) { |
|
if ($$checkallowed{$item}) { |
|
$scripttag.='document.visible.display_'.$item.'.value=change'. |
|
"\n"; |
|
} |
|
} |
|
$scripttag.='document.visible.submit(); |
|
} |
|
</script> |
|
'; |
|
} |
return(<<ENDHEAD); |
return(<<ENDHEAD); |
$html |
$html |
<head> |
<head> |
<title>Course Action Items</title> |
<title>Course Action Items</title> |
|
$scripttag |
</head> |
</head> |
$bodytag |
$bodytag |
ENDHEAD |
ENDHEAD |
Line 151 ENDHEAD
|
Line 201 ENDHEAD
|
#------------------------------- |
#------------------------------- |
|
|
sub display_actions_box() { |
sub display_actions_box() { |
my ($r,$command,$threshold_titles,$cdom,$crs) = @_; |
my ($r,$tabbg,$command,$threshold_titles,$interval_titles, |
|
$cdom,$crs,$checkallowed) = @_; |
|
|
my $rowColor1 = "#ffffff"; |
my $rowColor1 = "#ffffff"; |
my $rowColor2 = "#eeeeee"; |
my $rowColor2 = "#eeeeee"; |
|
|
|
my $udom = $env{'user.domain'}; |
|
my $uname = $env{'user.name'}; |
|
my $cid = $env{'request.course.id'}; |
|
|
|
my %lt = &Apache::lonlocal::texthash( |
|
'yacc' => 'You are accessing an invalid course.', |
|
'gtfr' => 'Go to first resource', |
|
'chyp' => 'Change your preferences', |
|
'tsup' => 'to suppress display of this screen when accessing'. |
|
' this course in the future.', |
|
'hial' => 'Hide all', |
|
'shal' => 'Show all', |
|
); |
|
|
my %unread = (); |
my %unread = (); |
my %ungraded = (); |
my %ungraded = (); |
my %bombed = (); |
my %bombed = (); |
Line 175 sub display_actions_box() {
|
Line 240 sub display_actions_box() {
|
my $needitems = 0; |
my $needitems = 0; |
my $boxcount = 0; |
my $boxcount = 0; |
|
|
my $domain=&Apache::loncommon::determinedomain(); |
|
my $function; |
|
if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { |
|
$function='coordinator'; |
|
} |
|
if ($env{'request.role'}=~/^(su|dc|ad|li)/) { |
|
$function='admin'; |
|
} |
|
|
|
my %threshold = ( |
my %threshold = ( |
av_attempts => 2, |
av_attempts => 2, |
degdiff => 0.5, |
degdiff => 0.5, |
numstudents => 2, |
numstudents => 2, |
); |
); |
|
|
my $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain); |
unless ($cid) { |
my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); |
$r->print('<br /><b><center>'.$lt{'yacc'}.'</center></b><br /><br />'); |
|
|
unless ($env{'request.course.id'}) { |
|
$r->print('<br /><b><center>You are accessing an invalid course.</center></b><br /><br />'); |
|
return; |
return; |
} |
} |
|
|
my %checkallowed = ( |
if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db', |
coursediscussion => &Apache::lonnet::allowed('pch',$env{'request.course.id'}), |
&GDBM_READER(),0640)) { |
handgrading => &Apache::lonnet::allowed('mgr',$env{'request.course.id'}), |
my $furl=$bighash{'first_url'}; |
abovethreshold => &Apache::lonnet::allowed('vgr',$env{'request.course.id'}), |
$r->print('<font size="+1"><a href="'.$furl.'">'.$lt{'gtfr'}. |
haserrors => &Apache::lonnet::allowed('opa',$env{'request.course.id'}), |
'</a></font><a href="/adm/preferences?action=changecourseinit">'. |
versionchanges => &Apache::lonnet::allowed('opa',$env{'request.course.id'}), |
'</font><br />'.$lt{'chyp'}.'</a> '.$lt{'tsup'}.'<br /><hr />'); |
coursenormalmail => 1, |
untie(%bighash); |
coursecritmail => 1, |
} |
); |
|
|
my $result; |
|
|
|
if ($command eq 'reset') { |
|
$result = &process_reset($cdom,$crs); |
|
} elsif ($command eq 'update') { |
|
$result = &process_update($cdom,$crs,$threshold_titles); |
|
} elsif ($command eq 'newinterval') { |
|
$result = &store_interval_setting($uname,$udom,$cid,$interval_titles); |
|
} |
|
|
|
my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed); |
|
|
|
unless ($store_result eq 'ok') { |
|
&Apache::lonnet::logthis('Error storing whatsnew settings: '. |
|
$store_result.' for '.'user '.$uname.':'.$udom.' in course '.$cid); |
|
$result .= &mt('Unable to store visibility settings due to [_1]', |
|
$store_result); |
|
} |
|
|
|
if ($result) { |
|
$r->print($result.'<hr width="100%" />'); |
|
} |
|
$r->rflush(); |
|
|
my %display_settings = &get_display_settings(); |
|
my $starttime = 86400; |
my %display_settings = &get_display_settings($uname,$udom,$cid); |
my %intervals = ( |
my $timediff = $display_settings{$cid.':interval'}; |
all => 'since resource creation', |
unless (defined($timediff)) { $timediff = 604800; } |
-1 => 'since start of course', |
my $now = time; |
2592000 => 'since last month', |
my $interval = $$interval_titles{$timediff}; |
604800 => 'since last week', |
if ($timediff == -1) { |
86400 => 'since yesterday', |
$timediff = time; |
); |
} |
my $interval = $intervals{$starttime}; |
my $starttime = $now - $timediff; |
|
my $countunread = 1; |
|
|
my %headings = &Apache::lonlocal::texthash( |
my %headings = &Apache::lonlocal::texthash( |
coursediscussion => 'Unread course discussion posts', |
coursediscussion => 'Unread course discussion posts', |
handgrading => 'Problems requiring handgrading', |
handgrading => 'Problems requiring handgrading', |
haserrors => 'Problems with errors', |
haserrors => 'Problems with errors', |
versionchanges => 'Resources in course with version changes '.$interval, |
versionchanges => 'Resources in course with version changes '.$interval, |
coursenormalmail => 'New course message', |
coursenormalmail => 'New course messages', |
coursecritmail => 'New critical messages in course', |
coursecritmail => 'New critical messages in course', |
); |
); |
|
|
if ($checkallowed{'abovethreshold'}) { |
if ($$checkallowed{'abovethreshold'}) { |
&get_curr_thresholds(\%threshold,$cdom,$crs); |
&get_curr_thresholds(\%threshold,$cdom,$crs); |
} |
} |
|
|
Line 236 sub display_actions_box() {
|
Line 313 sub display_actions_box() {
|
|
|
my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail'); |
my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail'); |
|
|
foreach my $key (keys(%checkallowed)) { |
foreach my $key (keys(%{$checkallowed})) { |
$show{$key} = 0; |
$show{$key} = 0; |
if ($checkallowed{$key}) { |
if ($$checkallowed{$key}) { |
unless ($display_settings{$key} eq 'off') { |
unless ($display_settings{$cid.':'.$key} eq 'hide') { |
$show{$key} = 1; |
$show{$key} = 1; |
} |
} |
} |
} |
Line 254 sub display_actions_box() {
|
Line 331 sub display_actions_box() {
|
} |
} |
} |
} |
|
|
|
|
if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db', |
|
&GDBM_READER(),0640)) { |
|
my $furl=$bighash{'first_url'}; |
|
$r->print('<font size="+1"><a href="'.$furl.'">Go to first resource</a></font><a href="/adm/preferences?action=changecourseinit"></font><br />Change your preferences</a> to suppress display of this screen when accessing courses as Course Coordinator in the future.<br /><hr />'); |
|
untie(%bighash); |
|
} |
|
|
|
my $result; |
|
|
|
if ($command eq 'reset') { |
|
$result = &process_reset($cdom,$crs); |
|
} elsif ($command eq 'update') { |
|
$result = &process_update($cdom,$crs,$threshold_titles); |
|
} |
|
if ($result) { |
|
$r->print($result.'<hr width="100%" />'); |
|
} |
|
$r->rflush(); |
|
|
|
if ($needitems) { |
if ($needitems) { |
&getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime); |
&getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); |
} |
} |
if ($show{'coursenormalmail'}) { |
if ($show{'coursenormalmail'}) { |
&getnormalmail(\@newmsgs); |
&getnormalmail(\@newmsgs); |
Line 284 sub display_actions_box() {
|
Line 341 sub display_actions_box() {
|
&getcritmail(\@critmsgs); |
&getcritmail(\@critmsgs); |
} |
} |
|
|
$r->print(qq|<a href="javascript:changeAll('hide');">Hide All</a> <a href="javascript:changeAll('show');">Show All</a>|); |
$r->print(qq|<a href="javascript:changeAll('hide');">$lt{'hial'}</a> |
|
<a href="javascript:changeAll('show');">$lt{'shal'}</a> |
|
<form method="post" name="visible" action="/adm/whatsnew">\n|); |
|
foreach my $item (keys(%{$checkallowed})) { |
|
if ($$checkallowed{$item}) { |
|
$r->print('<input type="hidden" name="display_'.$item.'" />'."\n"); |
|
} |
|
} |
|
|
$r->print('<br /><table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">'); |
$r->print('</form><br /><table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">'); |
|
|
my $displayed = 0; |
my $displayed = 0; |
my $totalboxes = keys(%checkallowed); |
my $totalboxes = keys(%{$checkallowed}); |
my $halfway = int($totalboxes/2) + $totalboxes%2; |
my $halfway = int($totalboxes/2) + $totalboxes%2; |
foreach my $actionitem (@actionorder) { |
foreach my $actionitem (@actionorder) { |
if ($checkallowed{$actionitem}) { |
if ($$checkallowed{$actionitem}) { |
if ($displayed == $halfway) { |
if ($displayed == $halfway) { |
$r->print('</td><td width="5%"> </td><td align="left" valign="top" width-"50%">'); |
$r->print('</td><td width="5%"> </td><td align="left" valign="top" width-"50%">'); |
} |
} |
&display_launcher($r,$actionitem,\%checkallowed,$tabbg,$rowColor1,$rowColor2,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval); |
&display_launcher($r,$actionitem,$checkallowed,$tabbg,$rowColor1,$rowColor2,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread); |
$displayed ++; |
$displayed ++; |
} |
} |
} |
} |
Line 311 sub display_actions_box() {
|
Line 375 sub display_actions_box() {
|
} |
} |
|
|
#------------------------------- |
#------------------------------- |
# display_config_box |
# display_threshold_config |
# |
# |
# Display the threshold setting screen |
# Display the threshold setting screen |
# |
# |
#------------------------------- |
#------------------------------- |
|
|
sub display_config_box() { |
sub display_threshold_config { |
my ($r,$command,$tabbg,$threshold_titles,$cdom,$crs) = @_; |
my ($r,$command,$tabbg,$threshold_titles,$cdom,$crs) = @_; |
my %threshold = (); |
my %threshold = (); |
my $rowColor1 = "#ffffff"; |
my $rowColor1 = "#ffffff"; |
Line 332 sub display_config_box() {
|
Line 396 sub display_config_box() {
|
); |
); |
&get_curr_thresholds(\%threshold,$cdom,$crs); |
&get_curr_thresholds(\%threshold,$cdom,$crs); |
|
|
$r->print('<br /><form name="thresholdform" method="post"><table border="0" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%"> |
$r->print('<br /><form name="thresholdform" method="post" action="/adm/whatsnew"> |
|
<table border="0" cellpadding="2" cellspacing="4"> |
|
<tr> |
|
<td align="left" valign="top" width="45%"> |
<table border="0" cellpadding="0" cellspacing="0" bgcolor="#000000"> |
<table border="0" cellpadding="0" cellspacing="0" bgcolor="#000000"> |
<tr> |
<tr> |
<td> |
<td> |
Line 371 sub display_config_box() {
|
Line 438 sub display_config_box() {
|
} |
} |
$r->print('</table></td></tr></table></td></tr></table> |
$r->print('</table></td></tr></table></td></tr></table> |
<br /><input type="submit" name="threshold" value="Make changes" /> |
<br /><input type="submit" name="threshold" value="Make changes" /> |
<input type="hidden" name="action" value="update" /> |
<input type="hidden" name="command" value="update" /> |
</form>'); |
</form>'); |
} |
} |
|
|
|
#------------------------------- |
|
# display_interval_config |
|
# |
|
# Display the interval setting screen |
|
# |
|
#------------------------------- |
|
|
|
sub display_interval_config { |
|
my ($r,$interval_titles) = @_; |
|
my $current = &get_curr_interval($env{'user.name'}, |
|
$env{'user.domain'},$env{'request.course.id'}); |
|
$r->print('<br />'.&mt('Choose the time window to use for display of version changes for resources in the course.')); |
|
unless ($current eq '') { |
|
$r->print(' '.&mt('Current value is ').$$interval_titles{$current}.'<br /><br />'); |
|
} |
|
$r->print('<br /><br /> |
|
<form method="post" name="intervalswitch" action="/adm/whatsnew"> |
|
<input type="hidden" name="command" value="newinterval" /> |
|
<select name="interval"> |
|
'); |
|
foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles})))) { |
|
$r->print('<option value="'.$key.'">Version changes '.$$interval_titles{$key}. |
|
'</option>'."\n"); |
|
} |
|
$r->print('</select> |
|
<input type="submit" name="display" value="'. |
|
&mt('Change interval').'" /></form>'); |
|
return; |
|
} |
|
|
sub display_launcher { |
sub display_launcher { |
my ($r,$action,$checkallowed,$tabbg,$rowColor1,$rowColor2,$show, |
my ($r,$action,$checkallowed,$tabbg,$rowColor1,$rowColor2,$show, |
$headings,$res_title,$tograde,$ungraded,$bombs,$bombed,$changed, |
$headings,$res_title,$tograde,$ungraded,$bombs,$bombed,$changed, |
$warnings,$triggered,$newdiscussions,$unread,$msgcount,$newmsgs, |
$warnings,$triggered,$newdiscussions,$unread,$msgcount,$newmsgs, |
$critmsgcount,$critmsgs,$interval) = @_; |
$critmsgcount,$critmsgs,$interval,$countunread) = @_; |
|
|
if ($$checkallowed{$action}) { |
if ($$checkallowed{$action}) { |
&start_box($r,$tabbg,$show,$headings,$action); |
&start_box($r,$tabbg,$show,$headings,$action); |
Line 399 sub display_launcher {
|
Line 496 sub display_launcher {
|
$rowColor1,$rowColor2); |
$rowColor1,$rowColor2); |
} elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION |
} elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION |
&display_coursediscussion($r,$newdiscussions,$unread, |
&display_coursediscussion($r,$newdiscussions,$unread, |
$res_title); |
$countunread,$res_title,$rowColor1,$rowColor2); |
} elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES |
} elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES |
&display_coursenormalmail($r,$msgcount,$newmsgs,$rowColor1, |
&display_coursenormalmail($r,$msgcount,$newmsgs,$rowColor1, |
$rowColor2); |
$rowColor2); |
Line 416 sub display_launcher {
|
Line 513 sub display_launcher {
|
sub getitems { |
sub getitems { |
my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions, |
my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions, |
$tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs, |
$tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs, |
$res_title,$show,$starttime) = @_; |
$res_title,$show,$starttime,$countunread) = @_; |
my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
# force retrieve Resource to seed the part id cache we'll need it later |
# force retrieve Resource to seed the part id cache we'll need it later |
my @allres=$navmap->retrieveResources(undef,sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;}); |
my @allres=$navmap->retrieveResources(undef, |
|
sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;}); |
my %lastreadtime; |
my %lastreadtime; |
my %resourcetracker; |
my %resourcetracker; |
|
my $discussiontime; |
|
|
# Resource version changes |
# Resource version changes |
if ($$show{'versionchanges'}) { |
if ($$show{'versionchanges'}) { |
&checkversions($cdom,$crs,$navmap,$changed,$starttime); |
&checkversions($cdom,$crs,$navmap,$changed,$starttime); |
} |
} |
|
|
if ($$show{'coursediscussions'}) { |
if ($$show{'coursediscussion'}) { |
my %lastread = &Apache::lonnet::dump('nohist_'. |
my %lastread = &Apache::lonnet::dump('nohist_'. |
$env{'request.course.id'}.'_discuss', |
$env{'request.course.id'}.'_discuss', |
$env{'user.domain'},$env{'user.name'},'lastread'); |
$env{'user.domain'},$env{'user.name'},'lastread'); |
Line 457 sub getitems {
|
Line 556 sub getitems {
|
$$res_title{$symb} = $title; |
$$res_title{$symb} = $title; |
my $ressymb = $resource->wrap_symb(); |
my $ressymb = $resource->wrap_symb(); |
|
|
# Check for unread discussion postings |
# Check if there are unread discussion postings |
if ($$show{'coursediscussion'}) { |
if ($$show{'coursediscussion'}) { |
&check_discussions($cdom,$crs,$resource,$symb,$ressymb,$title, |
&check_discussions($cdom,$crs,$resource,$symb,$ressymb,$title, |
$newdiscussions,$unread,\%lastreadtime); |
$newdiscussions,$unread); |
} |
} |
|
|
# Check for ungraded problems |
# Check for ungraded problems |
Line 483 sub getitems {
|
Line 582 sub getitems {
|
} |
} |
|
|
} |
} |
|
my $hasdiscussion = @{$newdiscussions}; |
|
if ($$show{'coursediscussion'} && $hasdiscussion) { # Get time of last post; |
|
$discussiontime = $navmap->{DISCUSSION_TIME}; |
|
foreach my $ressymb (@{$newdiscussions}) { |
|
$$unread{$ressymb}{'lastpost'} = $$discussiontime{$ressymb}; |
|
} |
|
if ($countunread) { #Get count of unread postings for each resource |
|
my $discussiondata = $navmap->get_discussion_data(); |
|
foreach my $ressymb (@{$newdiscussions}) { |
|
&get_discussions($cdom,$crs,$discussiondata,$ressymb, |
|
$unread,\%lastreadtime); |
|
} |
|
} |
|
} |
} |
} |
|
|
sub check_discussions { |
sub check_discussions { |
my ($cdom,$crs,$resource,$symb,$ressymb,$title,$newdiscussions,$unread, |
my ($cdom,$crs,$resource,$symb,$ressymb,$title,$newdiscussions, |
$lastreadtime) = @_; |
$unread) = @_; |
# Check for unread discussion postings |
|
if ($resource->hasDiscussion()) { |
if ($resource->hasDiscussion()) { |
my $prevread = 0; |
|
my $unreadcount = 0; |
|
%{$$unread{$ressymb}} = (); |
%{$$unread{$ressymb}} = (); |
$$unread{$ressymb}{'title'} = $title; |
$$unread{$ressymb}{'title'} = $title; |
$$unread{$ressymb}{'symb'} = $symb; |
$$unread{$ressymb}{'symb'} = $symb; |
if (defined($$lastreadtime{$ressymb})) { |
push(@{$newdiscussions}, $ressymb); |
$prevread = $$lastreadtime{$ressymb}; |
} |
} |
} |
my %contrib = &Apache::lonnet::restore($ressymb, |
|
$env{'request.course.id'},$cdom,$crs); |
sub get_discussions { |
if ($contrib{'version'}) { |
my ($cdom,$crs,$discussiondata,$ressymb,$unread,$lastreadtime) = @_; |
for (my $id=1;$id<=$contrib{'version'};$id++) { |
my $prevread = 0; |
unless (($contrib{'hidden'}=~/\.$id\./) || |
my $unreadcount = 0; |
($contrib{'deleted'}=~/\.$id\./)) { |
if (defined($$lastreadtime{$ressymb})) { |
if ($prevread <$contrib{$id.':timestamp'}) { |
$prevread = $$lastreadtime{$ressymb}; |
$$unread{$ressymb}{$unreadcount} = $id.': '.$contrib{$id.':subject'}; |
} |
|
my $version = $$discussiondata{'version:'.$ressymb}; |
|
if ($version) { |
|
my $hiddenflag = 0; |
|
my $deletedflag = 0; |
|
my ($hidden,$deleted); |
|
for (my $id=$version; $id>0; $id--) { |
|
my $vkeys=$$discussiondata{$id.':keys:'.$ressymb}; |
|
my @keys=split(/:/,$vkeys); |
|
if (grep/^hidden$/,@keys) { |
|
unless ($hiddenflag) { |
|
$hidden = $$discussiondata{$id.':'.$ressymb.':hidden'}; |
|
$hiddenflag = 1; |
|
} |
|
} elsif (grep/^deleted$/,@keys) { |
|
unless ($deletedflag) { |
|
$deleted = $$discussiondata{$id.':'.$ressymb.':deleted'}; |
|
$deletedflag = 1; |
|
} |
|
} else { |
|
unless (($hidden =~/\.$id\./) || ($deleted =~/\.$id\./)) { |
|
if ($prevread <$$discussiondata{$id.':'.$ressymb.':timestamp'}) { |
$unreadcount ++; |
$unreadcount ++; |
|
$$unread{$ressymb}{$unreadcount} = $id.': '. |
|
$$discussiondata{$id.':'.$ressymb.':subject'}; |
} |
} |
} |
} |
} |
} |
} |
} |
if ($unreadcount) { push(@{$newdiscussions}, $ressymb); } |
$$unread{$ressymb}{'unreadcount'} = $unreadcount; |
} |
} |
} |
} |
|
|
|
|
sub check_handgraded { |
sub check_handgraded { |
my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_; |
my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_; |
if ($resource->is_problem()) { |
if ($resource->is_problem()) { |
Line 527 sub check_handgraded {
|
Line 661 sub check_handgraded {
|
} |
} |
} |
} |
if ($handgradeable) { |
if ($handgradeable) { |
my @ungraded = &Apache::bridgetask::get_users_in_queue( |
my @ungraded = &Apache::bridgetask::get_queue_symb_status( |
'gradingqueue',$symb,$cdom,$cnum); |
'gradingqueue',$symb,$cdom,$cnum); |
if (@ungraded > 0) { |
if (@ungraded > 0) { |
$$ungraded{$symb}{count} = scalar(@ungraded); |
$$ungraded{$symb}{count} = scalar(@ungraded); |
Line 598 sub check_thresholds {
|
Line 732 sub check_thresholds {
|
} |
} |
} |
} |
if ($warning) { |
if ($warning) { |
if ($$warningnum %2 == 1) { |
if ($warningnum %2 == 1) { |
$rowColor = $rowColor1; |
$rowColor = $rowColor1; |
} else { |
} else { |
$rowColor = $rowColor2; |
$rowColor = $rowColor2; |
Line 629 sub check_thresholds {
|
Line 763 sub check_thresholds {
|
} |
} |
} |
} |
push(@{$warnings},$symb); |
push(@{$warnings},$symb); |
$$warningnum ++; |
$warningnum ++; |
} |
} |
} |
} |
|
|
Line 649 sub get_curr_thresholds {
|
Line 783 sub get_curr_thresholds {
|
} |
} |
} |
} |
|
|
|
sub get_curr_interval { |
|
my ($uname,$udom,$cid); |
|
my $interval; |
|
my %settings = &Apache::lonnet::dump('nohist_whatsnew',$uname,$udom,$cid,':interval'); |
|
my ($tmp) = %settings; |
|
|
|
unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { |
|
$interval = $settings{$cid.':interval'}; |
|
} |
|
return $interval; |
|
} |
|
|
sub process_reset { |
sub process_reset { |
my ($dom,$crs) = @_; |
my ($dom,$crs) = @_; |
my $result = '<b>Counters reset for following problems (and parts):</b><br />'; |
my $result = '<b>Counters reset for following problems (and parts):</b><br />'; |
Line 784 sub checkversions {
|
Line 930 sub checkversions {
|
my ($cdom,$crs,$navmap,$changed,$starttime) = @_; |
my ($cdom,$crs,$navmap,$changed,$starttime) = @_; |
my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs); |
my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs); |
my ($tmp) = keys(%changes); |
my ($tmp) = keys(%changes); |
if ($tmp =~/^error\:/) { |
unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { |
&Apache::lonnet::logthis('Error retrieving version update information: '. |
if (keys(%changes) > 0) { |
$tmp.' for '.$cdom.'_'.$crs.' in whatsnew'); |
|
} else { |
|
if (keys(%changes) > 0) { |
|
foreach my $key (sort(keys(%changes))) { |
foreach my $key (sort(keys(%changes))) { |
if ($changes{$key} > $starttime) { |
if ($changes{$key} > $starttime) { |
my $version; |
my $version; |
Line 797 sub checkversions {
|
Line 940 sub checkversions {
|
my $revdate = |
my $revdate = |
&Apache::lonnet::metadata($root.'.'.$extension, |
&Apache::lonnet::metadata($root.'.'.$extension, |
'lastrevisiondate'); |
'lastrevisiondate'); |
print STDERR "revdate for $root and $extension is $revdate\n"; |
|
$revdate = &Apache::lonlocal::locallocaltime($revdate); |
$revdate = &Apache::lonlocal::locallocaltime($revdate); |
my $linkurl=&Apache::lonnet::clutter($key); |
my $linkurl=&Apache::lonnet::clutter($key); |
my $usedversion=$navmap->usedVersion('version_'.$linkurl); |
my $usedversion=$navmap->usedVersion('version_'.$linkurl); |
Line 808 sub checkversions {
|
Line 950 sub checkversions {
|
$version = $currentversion; |
$version = $currentversion; |
} |
} |
foreach my $res (@resources) { |
foreach my $res (@resources) { |
my $symb = $res->symb(); |
if (ref($res) eq 'Apache::lonnavmaps::resource') { |
%{$$changed{$symb}} = ( |
my $symb = $res->symb(); |
|
%{$$changed{$symb}} = ( |
current => $currentversion, |
current => $currentversion, |
version => $version, |
version => $version, |
revdate => $revdate, |
revdate => $revdate, |
); |
); |
|
} |
} |
} |
} |
} |
} |
} |
Line 895 sub display_abovethreshold {
|
Line 1039 sub display_abovethreshold {
|
my $warningnum = 0; |
my $warningnum = 0; |
if (@{$warnings} > 0) { |
if (@{$warnings} > 0) { |
@{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings}; |
@{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings}; |
$r->print('<form name="reset_tracking" method="post">'. |
$r->print('<form name="reset_tracking" method="post" action="/adm/whatsnew">'. |
' <input type="hidden" name="action" value="reset" />'."\n"); |
' <input type="hidden" name="command" value="reset" />'."\n"); |
$r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'reso'}.'</small></b></td><td align="right"><b><small>'.$lt{'part'}.'</small></b></td><td align="right"><b><small>'.$lt{'nust'}.'</small></b></td><td align="right"><b><small>'.$lt{'avat'}.'</small></b></td><td align="right"><b><small>'.$lt{'dedi'}.'</small></b></td><td align="right"><b><small>'.$lt{'lare'}.'</small></b></td><td align="right"><b><small>'.$lt{'reco'}.'</small></b></td></tr>'); |
$r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'reso'}.'</small></b></td><td align="right"><b><small>'.$lt{'part'}.'</small></b></td><td align="right"><b><small>'.$lt{'nust'}.'</small></b></td><td align="right"><b><small>'.$lt{'avat'}.'</small></b></td><td align="right"><b><small>'.$lt{'dedi'}.'</small></b></td><td align="right"><b><small>'.$lt{'lare'}.'</small></b></td><td align="right"><b><small>'.$lt{'reco'}.'</small></b></td></tr>'); |
foreach my $res (@{$warnings}) { |
foreach my $res (@{$warnings}) { |
if ($warningnum %2 == 1) { |
if ($warningnum %2 == 1) { |
Line 914 sub display_abovethreshold {
|
Line 1058 sub display_abovethreshold {
|
$r->print('<tr bgcolor="'.$rowColor.'"><td '.$rowspan.'><a href="'.$linkurl.'"><small>'.$$triggered{$res}{title}.'</small></a></td>'.$$triggered{$res}{text}); |
$r->print('<tr bgcolor="'.$rowColor.'"><td '.$rowspan.'><a href="'.$linkurl.'"><small>'.$$triggered{$res}{title}.'</small></a></td>'.$$triggered{$res}{text}); |
$warningnum ++; |
$warningnum ++; |
} |
} |
$r->print('<tr bgcolor="#cccccc"><td colspan="7" align="right"><br /><b><small><input type="submit" name="counters" value="'.$lt{'rese'}.'/></form>'); |
$r->print('<tr bgcolor="#cccccc"><td colspan="7" align="right"><br /><b><small><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></form>'); |
} else { |
} else { |
$r->print('<tr><td bgcolor="#ffffff"><br /><center><b><i><small>'.$lt{'nopr'}.'</small></i></b></center><br /></td></tr>'); |
$r->print('<tr><td bgcolor="#ffffff"><br /><center><b><i><small>'.$lt{'nopr'}.'</small></i></b></center><br /></td></tr>'); |
} |
} |
Line 956 sub display_versionchanges {
|
Line 1100 sub display_versionchanges {
|
} |
} |
|
|
sub display_coursediscussion { |
sub display_coursediscussion { |
my ($r,$newdiscussions,$unread,$res_title,$rowColor1,$rowColor2) = @_; |
my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1, |
|
$rowColor2) = @_; |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'loca' => 'Location', |
'loca' => 'Location', |
'type' => 'Type', |
'type' => 'Type', |
'numn' => 'Number of new posts', |
'numn' => 'Number of new posts', |
'noun' => 'No unread posts in course discussions', |
'noun' => 'No unread posts in course discussions', |
|
'tmlp' => 'Time of last post', |
); |
); |
my $rowColor; |
my $rowColor; |
if (@{$newdiscussions} > 0) { |
if (@{$newdiscussions} > 0) { |
$r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'loca'}. |
$r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'loca'}. |
'</small></b></td><td><b><small>'.$lt{'type'}. |
'</small></b></td><td><b><small>'.$lt{'type'}. |
'</small></b><td align="right"><b><small>'.$lt{'numn'}. |
'</small></b>'); |
'</small></b></td></tr>'); |
if ($countunread) { |
|
$r->print('<td><b><small>'.$lt{'tmlp'}.'</small></b></td>'. |
|
'<td align="right"><b><small>'.$lt{'numn'}. |
|
'</small></b></td>'); |
|
} else { |
|
$r->print('<td align="right"><b><small>'.$lt{'tmlp'}. |
|
'</small></b></td>'); |
|
} |
|
$r->print("</tr>\n"); |
@{$newdiscussions} = sort { &cmp_title($a,$b,$res_title) } |
@{$newdiscussions} = sort { &cmp_title($a,$b,$res_title) } |
@{$newdiscussions}; |
@{$newdiscussions}; |
my $rowNum = 0; |
my $rowNum = 0; |
Line 979 sub display_coursediscussion {
|
Line 1133 sub display_coursediscussion {
|
if ($feedurl =~ /bulletinboard/) { |
if ($feedurl =~ /bulletinboard/) { |
$type = 'Bulletin Board'; |
$type = 'Bulletin Board'; |
} |
} |
my $unreadnum = keys(%{$$unread{$ressymb}}); |
if ($rowNum %2 == 1) { |
$unreadnum = $unreadnum - 2; |
$rowColor = $rowColor1; |
if ($unreadnum > 0) { |
} else { |
if ($rowNum %2 == 1) { |
$rowColor = $rowColor2; |
$rowColor = $rowColor1; |
|
} else { |
|
$rowColor = $rowColor2; |
|
} |
|
$r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$feedurl.'?symb='.$$unread{$ressymb}{symb}.'">'.$forum_title.'</a> </td><td><small>'.$type.'</small></td><td align="right">'.$unreadnum.' </td></tr>'); |
|
$rowNum ++; |
|
} |
} |
|
my $lastpost = &Apache::lonnavmaps::timeToHumanString( |
|
$$unread{$ressymb}{'lastpost'}); |
|
$r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$feedurl.'?symb='.$$unread{$ressymb}{symb}.'">'.$forum_title.'</a> </td><td><small>'.$type.' </small></td>'); |
|
if ($countunread) { |
|
my $unreadnum = $$unread{$ressymb}{'unreadcount'}; |
|
$r->print('<td><small>'.$lastpost.'<small></td><td align="right">'. |
|
'<small>',$unreadnum.' </small></td>'); |
|
} else { |
|
$r->print('<td align="right"><small>'.$lastpost.'</small></td>'); |
|
} |
|
$r->print("</tr>\n"); |
|
$rowNum ++; |
} |
} |
} else { |
} else { |
$r->print('<tr><td bgcolor="#ffffff"><br><center> <i><b><small>'. |
$r->print('<tr><td bgcolor="#ffffff"><br><center> <i><b><small>'. |
Line 1050 sub cmp_title {
|
Line 1210 sub cmp_title {
|
} |
} |
|
|
sub get_display_settings { |
sub get_display_settings { |
my $udom = $env{'user.domain'}; |
my ($uname,$udom,$cid) = @_; |
my $uname = $env{'user.name'}; |
|
my $cid = $env{'request.course.id'}; |
|
my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid); |
my %settings = &Apache::lonnet::dump('nohist_whatsnew',$udom,$uname,$cid); |
my ($tmp) = keys(%settings); |
my ($tmp) = keys(%settings); |
if ($tmp=~/^error:/) { |
if ($tmp=~/^(con_lost|error|no_such_host)/i) { |
%settings = (); |
%settings = (); |
unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') { |
unless ($tmp =~ /^error: 2 /) { |
&logthis('Error retrieving whatsnew settings: '.$tmp.' for '. |
&Apache::lonnet::logthis('Error retrieving whatsnew settings: '. |
$uname.':'.$udom.' for course: '.$cid); |
$tmp.' for '.$uname.':'.$udom. |
} |
' for course: '.$cid); |
|
|
|
} |
} |
} |
return %settings; |
return %settings; |
} |
} |
|
|
|
sub store_display_settings { |
|
my ($uname,$udom,$cid,$checkallowed) = @_; |
|
my %whatsnew_settings; |
|
my $result; |
|
foreach my $key (keys(%{$checkallowed})) { |
|
if (exists($env{'form.display_'.$key})) { |
|
unless ($env{'form.display_'.$key} eq '') { |
|
$whatsnew_settings{$cid.':'.$key} = $env{'form.display_'.$key}; |
|
} |
|
} |
|
} |
|
if (keys(%whatsnew_settings)) { |
|
$result = &Apache::lonnet::put('nohist_whatsnew',\%whatsnew_settings, |
|
$udom,$uname); |
|
} else { |
|
$result = 'ok'; |
|
} |
|
return $result; |
|
} |
|
|
|
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 $outcome = &Apache::lonnet::put('nohist_whatsnew', |
|
\%interval_settings,$udom,$uname); |
|
if ($outcome eq 'ok') { |
|
$result = &mt('Interval set to version changes [_1]', |
|
'<b>'.$$interval_titles{$env{'form.interval'}}.'</b><br />'); |
|
|
|
} else { |
|
&Apache::lonnet::logthis('Error storing whatsnew interval setting'. |
|
' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid); |
|
$result = &mt('Unable to set interval to [_1] due to [_2].', |
|
'<b>'.$$interval_titles{$env{'form.interval'}}.'</b>', |
|
'<tt>'.$outcome.'</tt>.<br />'); |
|
} |
|
} |
|
return $result; |
|
} |
|
|
sub start_box { |
sub start_box { |
my ($r,$tabbg,$show,$heading,$caller) = @_; |
my ($r,$tabbg,$show,$heading,$caller) = @_; |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
Line 1073 sub start_box {
|
Line 1276 sub start_box {
|
); |
); |
my $showhide; |
my $showhide; |
if ($$show{$caller}) { |
if ($$show{$caller}) { |
$showhide = '<b><a href="javascript:change_display('."'".$caller. |
$showhide = '<b><a href="javascript:change_display(document.visible.'. |
"','hide'".');">Hide</a></b>'; |
'display_'.$caller.",'hide'".');">Hide</a></b>'; |
|
|
} else { |
} else { |
$showhide = '<b><a href="javascript:change_display('."'".$caller. |
$showhide = '<b><a href="javascript:change_display(document.visible.'. |
"','show'".');">Show</a></b>'; |
'display_'.$caller.",'show'".');">Show</a></b>'; |
} |
} |
|
|
$r->print(' |
$r->print(' |