--- loncom/interface/lonfeedback.pm 2004/05/05 21:04:14 1.80 +++ loncom/interface/lonfeedback.pm 2004/08/31 15:54:48 1.99.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.80 2004/05/05 21:04:14 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.99.2.4 2004/08/31 15:54:48 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,15 +34,40 @@ 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,$previous)=@_; -# &Apache::lonnet::logthis("status is $status"); - if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER' +sub discussion_open { + my ($status)=@_; + if (defined($status) && + !($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'OPEN')) { - return ''; + return 0; + } + my $close=&Apache::lonnet::EXT('resource.0.discussend'); + if (defined($close) && $close ne '' && $close < time) { + return 0; + } + return 1; +} + +sub discussion_visible { + my ($status)=@_; + if (not &discussion_open($status)) { + my $hidden=&Apache::lonnet::EXT('resource.0.discusshide'); + if (lc($hidden) eq 'yes' or $hidden eq '' or !defined($hidden)) { + return 0; + } } + return 1; +} + +sub list_discussion { + my ($mode,$status,$symb)=@_; + + my $outputtarget=$ENV{'form.grade_target'}; + if (not &discussion_visible($status)) { return ''; } + my @bgcols = ("#cccccc","#eeeeee"); my $discussiononly=0; if ($mode eq 'board') { $discussiononly=1; } unless ($ENV{'request.course.id'}) { return ''; } @@ -68,16 +93,44 @@ 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; my $newpostsflag = 0; +# Retain identification of "NEW" posts identified in last display, if continuing 'previous' browsing of posts. + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous']); + $previous = $ENV{'form.previous'}; 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})) { @@ -103,6 +156,7 @@ sub list_discussion { my @replies=(); my %alldiscussion=(); my %notshown = (); + my %newitem = (); my $maxdepth=0; my $target=''; @@ -112,17 +166,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\./); @@ -155,12 +211,13 @@ sub list_discussion { $subject=&Apache::lontexconvert::msgtexconverted($subject); } if ($contrib{$idx.':attachmenturl'}) { - my ($fname,$ft) - =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/); - $message.='

'.&mt('Attachment').': '.$fname.'.'.$ft.'

'; + my ($fname) + =($contrib{$idx.':attachmenturl'}=~m|/([^/]+)$|); + &Apache::lonnet::allowuploaded('/adm/feedback', + $contrib{$idx.':attachmenturl'}); + $message.='

'.&mt('Attachment'). + ': '. + $fname.'

'; } if ($message) { if ($hidden) { @@ -213,7 +270,8 @@ sub list_discussion { $sender=''.$screenname.''; } } - if (&Apache::lonnet::allowed('pch', + if (&discussion_open($status) && + &Apache::lonnet::allowed('pch', $ENV{'request.course.id'}. ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { $sender.=' '; if ($prevread > 0 && $prevread <= $posttime) { - $discussionitems[$idx] .= 'NEW'; + $newitem{$idx} = 1; + $discussionitems[$idx] .= ' +

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

NEW
+ '; } $discussionitems[$idx] .= ' + +
   '. ''.$subject.'  '. @@ -255,30 +320,85 @@ 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 discussion settings', + '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', + 'disp' => 'Display', + 'nolo' => 'Not new', + ); + + my $currdisp = $lt{'allposts'}; + my $currmark = $lt{'onmark'}; + my $dispchange = $lt{'unread'}; + my $markchange = $lt{'ondisp'}; + my $chglink = '/adm/feedback?modifydisp='.$ressymb; + my $displink = 'onlyunread'; + my $marklink = 'markondisp'; + + if ($markondisp) { + $currmark = $lt{'ondisp'}; + $markchange = $lt{'onmark'}; + $marklink = 'markonread'; + } + + if ($showonlyunread) { + $currdisp = $lt{'unread'}; + $dispchange = $lt{'allposts'}; + $displink = 'allposts'; + } + + $chglink .= '&changes='.$displink.'_'.$marklink; + + if ($newpostsflag) { + $chglink .= '&previous='.$prevread; + } + if ($visible) { # Print the discusssion - $discussion.=''; - if ($visible>2) { - my $colspan=$maxdepth+1; - $discussion.=''; + if ($outputtarget ne 'tex') { + my $colspan=$maxdepth+1; + $discussion.='
'. - ''. - '
'. - ''.&mt('Threaded View').'  '. - ''.&mt('Chronological View').'  '.&mt('Show all posts').'?'; - } else { - $discussion .= 'onlyunread='.$ressymb; - if ($newpostsflag) { - $discussion .= '&previous='.$prevread; - } - $discussion .= '">'.&mt('Show only unread posts').'?'; - } - $discussion .= '  
'; + $discussion .=''; + } else { + $discussion.='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'. + '\textbf{DISCUSSIONS}\makebox[2 cm][b]{\hrulefill}'. + '\vskip 0 mm\noindent\textbf{'.$lt{'cuse'}.'}:\vskip 0 mm'. + '\noindent\textbf{'.$lt{'disa'}.'}: \textit{'.$currdisp.'}\vskip 0 mm'. + '\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}'; } my $numhidden = keys %notshown; if ($numhidden > 0) { @@ -294,18 +414,79 @@ sub list_discussion { } foreach (sort { $a <=> $b } keys %alldiscussion) { unless ($notshown{$alldiscussion{$_}} eq '1') { - $discussion.="\n"; + if ($outputtarget ne 'tex') { + $discussion.="\n"; + } else { + $discussion.='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'; + } my $thisdepth=$depth[$alldiscussion{$_}]; - for (1..$thisdepth) { - $discussion.=''; - } + if ($outputtarget ne 'tex') { + for (1..$thisdepth) { + $discussion.=''; + } + } my $colspan=$maxdepth-$thisdepth+1; - $discussion.=''; + } else { + #cleanup block + $discussionitems[$alldiscussion{$_}]=~s/]*)>/
'. + ''; + if ($visible>2) { + $discussion.=''; + } + if ($newpostsflag) { + if (!$markondisp) { + $discussion .=''; + } + } else { + $discussion .= ''; + } + $discussion .= '
'. + ''.&mt('Threaded View').'  '. + ''.&mt('Chronological View').'  '.&mt('Mark new posts as read').'  '; + } else { + $discussion .= '  
      '. + if ($outputtarget ne 'tex') { + $discussion.=''. $discussionitems[$alldiscussion{$_}]. '
/; + $discussionitems[$alldiscussion{$_}]=~s/]*)>]*)>/
/; + my $threadinsert=''; + if ($thisdepth > 0) { + $threadinsert='
Reply: '.$thisdepth.''; + } + $discussionitems[$alldiscussion{$_}]=~s/<\/td>]*)>/$threadinsert<\/td>		/; + $discussionitems[$alldiscussion{$_}]=~s/]+)>(Hide|Delete|Reply|Submissions)<\/a>//g; + $discussionitems[$alldiscussion{$_}]=~s/(|<\/b>|<\/a>|]+)>)//g; + + #FIXME xmlparse can't be safely called from inside xmlparse + # due to the global variables that are use, the safe + # space etc. I expect this has unforseen issues that + # need resolving. + + $discussion.=&Apache::lonxml::xmlparse('','tex',$discussionitems[$alldiscussion{$_}]); + } } } - $discussion.='


'; + if ($outputtarget ne 'tex') { + my $colspan=$maxdepth+1; + $discussion .= < + 		+ + + + +
+ + + + +END + if ($newpostsflag) { + $discussion .= + ''; + } else { + $discussion .= + ''; + } + $discussion .= <  + + +
+ $lt{'cuse'}: 1. '.$lt{'disp'}.' - '.$currdisp.'  2. '.$lt{'nolo'}.' - '.$currmark.''.$lt{'disp'}.' - '.$currdisp.' + $lt{'chgt'}?
+
+
+

+END + } } if ($discussiononly) { $discussion.=(<Note: in anonymous discussion, your name is visible only to course faculty
Title: 

- +

Attachment (128 KB max size):

ENDDISCUSS - $discussion.=&generate_preview_button(); + if ($outputtarget ne 'tex') { + $discussion.=&generate_preview_button(); + } } else { - if (&Apache::lonnet::allowed('pch', + if (&discussion_open($status) && + &Apache::lonnet::allowed('pch', $ENV{'request.course.id'}. ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { - $discussion.='
'. - ''. - &mt('Post Discussion').'
'; + if ($outputtarget ne 'tex') { + $discussion.='
'. + ''. + &mt('Post Discussion').'
'; + } } } return $discussion; @@ -364,13 +550,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