--- loncom/interface/lonfeedback.pm 2004/05/07 12:03:53 1.82 +++ loncom/interface/lonfeedback.pm 2004/06/02 16:41:46 1.86 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.82 2004/05/07 12:03:53 albertel Exp $ +# $Id: lonfeedback.pm,v 1.86 2004/06/02 16:41:46 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,7 +34,8 @@ use Apache::Constants qw(:common); use Apache::lonmsg(); use Apache::loncommon(); use Apache::lontexconvert(); -use Apache::lonlocal; +use Apache::lonlocal; # must not have () +use Apache::lonhtmlcommon(); sub list_discussion { my ($mode,$status,$symb)=@_; @@ -43,6 +44,8 @@ sub list_discussion { || $status eq 'OPEN')) { return ''; } + + my @bgcols = ("#cccccc","#eeeeee"); my $discussiononly=0; if ($mode eq 'board') { $discussiononly=1; } unless ($ENV{'request.course.id'}) { return ''; } @@ -68,8 +71,11 @@ sub list_discussion { my $lastkey = $ressymb.'_lastread'; my $showkey = $ressymb.'_showonlyunread'; my $visitkey = $ressymb.'_visit'; - my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey],$ENV{'user.domain'},$ENV{'user.name'}); + my $ondispkey = $ressymb.'_markondisp'; + my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey,$ondispkey],$ENV{'user.domain'},$ENV{'user.name'}); + my %discinfo = (); my $showonlyunread = 0; + my $markondisp = 0; my $prevread = 0; my $previous = 0; my $visit = 0; @@ -81,7 +87,28 @@ sub list_discussion { if ($previous > 0) { $prevread = $previous; } elsif (defined($dischash{$lastkey})) { - $prevread = $dischash{$lastkey}; + unless ($dischash{$lastkey} eq '') { + $prevread = $dischash{$lastkey}; + } + } + +# Get discussion display default settings for user + my %userenv = &Apache::lonnet::get('environment',['discdisplay','discmarkread'],$ENV{'user.domain'},$ENV{'user.name'}); + my $discdisplay=$userenv{'discdisplay'}; + if ($discdisplay eq 'unread') { + $showonlyunread = 1; + } + my $discmarkread=$userenv{'discmarkread'}; + if ($discmarkread eq 'ondisp') { + $markondisp = 1; + } + +# Override user's default if user specified display setting for this discussion + if (defined($dischash{$ondispkey})) { + $markondisp = $dischash{$ondispkey}; + } + if ($markondisp) { + $discinfo{$lastkey} = time; } if (defined($dischash{$showkey})) { @@ -107,6 +134,7 @@ sub list_discussion { my @replies=(); my %alldiscussion=(); my %notshown = (); + my %newitem = (); my $maxdepth=0; my $target=''; @@ -116,17 +144,19 @@ sub list_discussion { } my $now = time; - my %discinfo = (); $discinfo{$visitkey} = $visit; - $discinfo{$lastkey} = $now; &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); if ($contrib{'version'}) { + my $oldest = $contrib{'1:timestamp'}; + if ($prevread eq '0') { + $prevread = $oldest-1; + } for (my $id=1;$id<=$contrib{'version'};$id++) { my $idx=$id; my $posttime = $contrib{$idx.':timestamp'}; - if ($prevread > 0 && $prevread <= $posttime) { + if ($prevread <= $posttime) { $newpostsflag = 1; } my $hidden=($contrib{'hidden'}=~/\.$idx\./); @@ -244,9 +274,16 @@ sub list_discussion { if ($showonlyunread && $prevread > $posttime) { $notshown{$idx} = 1; } else { - $discussionitems[$idx]='

'; if ($prevread > 0 && $prevread <= $posttime) { - $discussionitems[$idx] .= ''; + $newitem{$idx} = 1; + $discussionitems[$idx] .= ' +

NEW
+ '; + } else { + $newitem{$idx} = 0; + $discussionitems[$idx] .= ' +

NEW
+ '; } $discussionitems[$idx] .= '
   '. ''.$subject.'  '. @@ -260,31 +297,83 @@ sub list_discussion { } my $discussion=''; + + my $function = &Apache::loncommon::get_users_function(); + my $color = &Apache::loncommon::designparm($function.'.tabbg', + $ENV{'user.domain'}); + my %lt = &Apache::lonlocal::texthash( + 'cuse' => 'Current settings for this discussion', + 'allposts' => 'All posts', + 'unread' => 'New posts only', + 'ondisp' => 'Once displayed', + 'onmark' => 'Once marked read', + 'disa' => 'Posts to be displayed', + 'npce' => 'Posts cease to be marked "NEW"', + 'chgt' => 'Change to ', + ); + + my $currdisp = $lt{'allposts'}; + my $currmark = $lt{'onmark'}; + my $dispchange = $lt{'unread'}; + my $markchange = $lt{'ondisp'}; + my $displink = '/adm/feedback?onlyunread='.$ressymb; + my $marklink = '/adm/feedback?markondisp='.$ressymb; + + if ($markondisp) { + $currmark = $lt{'ondisp'}; + $markchange = $lt{'onmark'}; + $marklink = '/adm/feedback?markonread='.$ressymb; + if ($newpostsflag) { + $marklink .= '&previous='.$prevread; + } + } + + if ($showonlyunread) { + $currdisp = $lt{'unread'}; + $dispchange = $lt{'allposts'}; + $displink = '/adm/feedback?allposts='.$ressymb; + } + + if ($newpostsflag) { + $displink .= '&previous='.$prevread; + } + if ($visible) { # Print the discusssion $discussion.=''; - if ($visible>2) { - my $colspan=$maxdepth+1; - $discussion.=''; + my $numhidden = keys %notshown; if ($numhidden > 0) { my $colspan = $maxdepth+1; @@ -305,7 +394,7 @@ sub list_discussion { $discussion.=''; } my $colspan=$maxdepth-$thisdepth+1; - $discussion.=''; } @@ -369,13 +458,15 @@ sub mail_screen { $prevtag = ''; } } - my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); + my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(); + my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders(); my $send=&mt('Send'); $r->print(< The LearningOnline Network with CAPA +$htmlheader
'. - ''. - ''. + ''; - } + } else { + $discussion .= ''; + } + $discussion .= '
'. - ''.&mt('Threaded View').'  '. - ''.&mt('Chronological View').'  '.&mt('Show all posts').'?'; + my $colspan=$maxdepth+1; + $discussion .= '
'. + ''. + ''. + ''. + ''. + '
'.$lt{'cuse'}.'    '.$lt{'chgt'}.'
'.$lt{'disa'}.': '.$currdisp.'    '.$dispchange.'
'.$lt{'npce'}.': '.$currmark.'    '.$markchange.'
'. + ''; + if ($visible>2) { + $discussion.=''; + } + if ($newpostsflag) { + if (!$markondisp) { + $discussion .=''; } - $discussion .= '  
'. + ''.&mt('Threaded View').'  '. + ''.&mt('Chronological View').'  '.&mt('Mark new posts as read').'  '; } else { - $discussion .= 'onlyunread='.$ressymb; - if ($newpostsflag) { - $discussion .= '&previous='.$prevread; - } - $discussion .= '">'.&mt('Show only unread posts').'?'; + $discussion .= ' 
 
   '. + $discussion.=''. $discussionitems[$alldiscussion{$_}]. '