--- loncom/interface/lonfeedback.pm 2003/11/03 20:34:54 1.65 +++ loncom/interface/lonfeedback.pm 2003/11/27 09:20:39 1.72 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.65 2003/11/03 20:34:54 www Exp $ +# $Id: lonfeedback.pm,v 1.72 2003/11/27 09:20:39 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,16 +69,47 @@ sub list_discussion { unless ($symb) { return ''; } my $seeid=&Apache::lonnet::allowed('rin',$crs); my $viewgrades=&Apache::lonnet::allowed('vgr',$crs); - my %discussionitems=(); + my @discussionitems=(); my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'}, $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my $visible=0; + my @depth=(); + my @original=(); + my @index=(); + my @replies=(); + my %alldiscussion=(); + my $maxdepth=0; + + my $target=''; + unless ($ENV{'browser.interface'} eq 'textual' || + $ENV{'environment.remote'} eq 'off' ) { + $target='target="LONcom"'; + } if ($contrib{'version'}) { for (my $id=1;$id<=$contrib{'version'};$id++) { my $idx=$id; my $hidden=($contrib{'hidden'}=~/\.$idx\./); my $deleted=($contrib{'deleted'}=~/\.$idx\./); + my $origindex='0.'; + if (($contrib{$idx.':replyto'}) && ($ENV{'environment.threadeddiscussion'})) { +# this is a follow-up message + $original[$idx]=$original[$contrib{$idx.':replyto'}]; + $depth[$idx]=$depth[$contrib{$idx.':replyto'}]+1; + $origindex=$index[$contrib{$idx.':replyto'}]; + if ($depth[$idx]>$maxdepth) { $maxdepth=$depth[$idx]; } + } else { +# this is an original message + $original[$idx]=0; + $depth[$idx]=0; + } + if ($replies[$depth[$idx]]) { + $replies[$depth[$idx]]++; + } else { + $replies[$depth[$idx]]=1; + } unless ((($hidden) && (!$seeid)) || ($deleted)) { + $visible++; my $message=$contrib{$idx.':message'}; $message=~s/\n/\
/g; $message=&Apache::lontexconvert::msgtexconverted($message); @@ -128,7 +159,7 @@ sub list_discussion { $ENV{'request.course.id'}. ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { $sender.=' '.&mt('Reply').''; + $symb.':::'.$idx.'" '.$target.'>'.&mt('Reply').''; } } else { if ($screenname) { @@ -140,7 +171,14 @@ sub list_discussion { $vgrlink=&Apache::loncommon::submlink('Submissions', $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb); } - $discussionitems{$idx}='

'.$sender.' '.$vgrlink.' ('. +#figure out at what position this needs to print + my $thisindex=$idx; + if ($ENV{'environment.threadeddiscussion'}) { + $thisindex=$origindex.substr('00'.$replies[$depth[$idx]],-2,2); + } + $alldiscussion{$thisindex}=$idx; + $index[$idx]=$thisindex; + $discussionitems[$idx]='

'.$sender.' '.$vgrlink.' ('. localtime($contrib{$idx.':timestamp'}). '):

'.$message. '

'; @@ -148,9 +186,29 @@ sub list_discussion { } } } - my $discussion='
'; - foreach (sort { $a <=> $b } keys %discussionitems) { - $discussion.=$discussionitems{$_}; + my $discussion=''; + if ($visible) { +# Print a the discusssion + $discussion.=''; + if ($visible>2) { + my $colspan=$maxdepth+1; + $discussion.=''; + } + + foreach (sort { $a <=> $b } keys %alldiscussion) { + $discussion.="\n"; + my $thisdepth=$depth[$alldiscussion{$_}]; + for (1..$thisdepth) { + $discussion.=''; + } + my $colspan=$maxdepth-$thisdepth+1; + $discussion.=""; + } + $discussion.='
'. + ''.&mt('Threaded View').'  '. + ''.&mt('Chronological View').''. + '
   ".$discussionitems[$alldiscussion{$_}]. + "
'; } if ($discussiononly) { $discussion.=(</g; + $quote='
'.&Apache::lontexconvert::msgtexconverted($message).'
'; + } + } my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); $r->print(< @@ -234,8 +304,10 @@ $bodytag
+ Please check at least one of the following feedback types: $options
+$quote

My question/comment/feedback:

$latexHelp @@ -255,12 +327,13 @@ $r->print(&generate_preview_button().'print (< Feedback not sent - Sorry, no recipients ... @@ -271,13 +344,14 @@ ENDFAILREDIR sub redirect_back { my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_; + if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' }; $r->print (< Feedback sent - $typestyle @@ -293,6 +367,7 @@ ENDREDIR sub no_redirect_back { my ($r,$feedurl) = @_; $r->print (< Feedback not sent ENDNOREDIR @@ -303,7 +378,6 @@ ENDNOREDIR $r->print (< - Sorry, no feedback possible on this resource ... @@ -524,7 +598,7 @@ sub adddiscuss { $ENV{'enrironment.generation'}, 'attachmenturl'=> $attachmenturl); if ($ENV{'form.replydisc'}) { - $contrib{'replyto'}=$ENV{'form.replydisc'}; + $contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1]; } if ($anon) { $contrib{'anonymous'}='true'; @@ -576,10 +650,11 @@ onClick="this.form.comment.value=documen ENDPREVIEW } + sub handler { my $r = shift; if ($r->header_only) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK; } @@ -587,11 +662,11 @@ sub handler { # --------------------------- Get query string for limited number of parameters &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['hide','unhide','deldisc','postdata','preview','replydisc']); + ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']); if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { # ----------------------------------------------------------------- Hide/unhide - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'}; @@ -619,9 +694,23 @@ sub handler { &redirect_back($r,&Apache::lonnet::clutter($url), &mt('Changed discussion status').'
','0','0'); + } elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + if ($ENV{'form.threadedon'}) { + &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'}); + &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on'); + } else { + &Apache::lonnet::del('environment',['threadeddiscussion']); + &Apache::lonnet::delenv('environment\.threadeddiscussion'); + } + my $symb=$ENV{'form.threadedon'}?$ENV{'form.threadedon'}:$ENV{'form.threadedoff'}; + my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); + &redirect_back($r,&Apache::lonnet::clutter($url), + &mt('Changed discussion view mode').'
','0','0'); } elsif ($ENV{'form.deldisc'}) { # --------------------------------------------------------------- Hide for good - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; my $entry=$ENV{'form.deldisc'}; @@ -657,7 +746,14 @@ sub handler { $feedurl=~s/^$ENV{'HTTP_HOST'}//; $feedurl=~s/\?.+$//; - my $symb=&Apache::lonnet::symbread($feedurl); + my $symb; + if ($ENV{'form.replydisc'}) { + $symb=(split(/\:\:\:/,$ENV{'form.replydisc'}))[0]; + my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb); + $feedurl=&Apache::lonnet::clutter($url); + } else { + $symb=&Apache::lonnet::symbread($feedurl); + } unless ($symb) { $symb=$ENV{'form.symb'}; if ($symb) { @@ -672,7 +768,7 @@ sub handler { if ($goahead) { # Go ahead with feedback, no ambiguous reference - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if (