--- loncom/interface/lonfeedback.pm 2003/10/15 20:01:48 1.62 +++ loncom/interface/lonfeedback.pm 2003/11/24 16:00:45 1.70 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.62 2003/10/15 20:01:48 www Exp $ +# $Id: lonfeedback.pm,v 1.70 2003/11/24 16:00:45 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,20 +69,47 @@ sub list_discussion { unless ($symb) { return ''; } my $seeid=&Apache::lonnet::allowed('rin',$crs); my $viewgrades=&Apache::lonnet::allowed('vgr',$crs); - my $discussion=''; + 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'}) { - unless ($discussiononly) { - $discussion.= - '
'; - } - my $idx; - for ($idx=1;$idx<=$contrib{'version'};$idx++) { + 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); @@ -92,7 +119,7 @@ sub list_discussion { $message.='

'.&mt('Attachment').': '.$fname.'.'.$ft.''; + '">'.$fname.'.'.$ft.'

'; } if ($message) { if ($hidden) { @@ -128,6 +155,12 @@ sub list_discussion { $sender.=' '.&mt('Delete').''; } + if (&Apache::lonnet::allowed('pch', + $ENV{'request.course.id'}. + ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { + $sender.=' '.&mt('Reply').''; + } } else { if ($screenname) { $sender=''.$screenname.''; @@ -138,16 +171,44 @@ sub list_discussion { $vgrlink=&Apache::loncommon::submlink('Submissions', $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb); } - $discussion.='

'.$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. '

'; } } } - unless ($discussiononly) { - $discussion.='
'; + } + 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.=(< Note: in anonymous discussion, your name is visible only to course faculty
- +

Attachment (128 KB max size):

@@ -176,13 +237,26 @@ sub mail_screen { '','onLoad="window.focus();"'); my $title=&Apache::lonnet::gettitle($feedurl); if (!$title) { $title = $feedurl; } + my $quote=''; + if ($ENV{'form.replydisc'}) { + my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'}); + my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) { + my $message=$contrib{$idx.':message'}; + $message=~s/\n/\
/g; + $quote='
'.&Apache::lontexconvert::msgtexconverted($message).'
'; + } + } my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); $r->print(< The LearningOnline Network with CAPA - $bodytag

$title

- + + Please check at least one of the following feedback types: -$options
-My question/comment/feedback:

+$options

+$quote +

My question/comment/feedback:

+

$latexHelp -

+

+

Attachment (128 KB max size):

- +

ENDDOCUMENT @@ -248,14 +327,15 @@ $r->print(&generate_preview_button().'print (<Feedback not sent - - + + - + Sorry, no recipients ... @@ -264,18 +344,19 @@ ENDFAILREDIR sub redirect_back { my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_; + if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' }; $r->print (< Feedback sent - + - + $typestyle Sent $sendsomething message(s), and $sendposts post(s). -$status +$status
@@ -287,7 +368,7 @@ sub no_redirect_back { my ($r,$feedurl) = @_; $r->print (<Feedback not sent - + ENDNOREDIR if ($feedurl!~/^\/adm\/feedback/) { @@ -298,7 +379,7 @@ ENDNOREDIR - + Sorry, no feedback possible on this resource ... @@ -306,45 +387,46 @@ ENDNOREDIRTWO } sub screen_header { - my ($feedurl) = @_; - my $msgoptions=''; - my $discussoptions=''; - if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { - $msgoptions= - '

'. - &mt('Feedback to resource author'); - } - if (&feedback_available(1)) { - $msgoptions.= - '
'. - &mt('Question about resource content'); - } - if (&feedback_available(0,1)) { - $msgoptions.= - '
'. - &mt('Question/Comment/Feedback about course content'); - } - if (&feedback_available(0,0,1)) { - $msgoptions.= - '
'. - &mt('Question/Comment/Feedback about course policy'); - } - - if ($ENV{'request.course.id'}) { - if (&Apache::lonnet::allowed('pch', - $ENV{'request.course.id'}. - ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { - $discussoptions=' '. - &mt('Contribution to course discussion of resource'); - $discussoptions.='
'. - &mt('Anonymous contribution to course discussion of resource'). - ' ('.&mt('name only visible to course faculty').')'; + my ($feedurl) = @_; + my $msgoptions=''; + my $discussoptions=''; + unless ($ENV{'form.replydisc'}) { + if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { + $msgoptions= + '

'. + &mt('Feedback to resource author').'

'; + } + if (&feedback_available(1)) { + $msgoptions.= + '
'. + &mt('Question about resource content'); + } + if (&feedback_available(0,1)) { + $msgoptions.= + '
'. + &mt('Question/Comment/Feedback about course content'); + } + if (&feedback_available(0,0,1)) { + $msgoptions.= + '
'. + &mt('Question/Comment/Feedback about course policy'); + } + } + if ($ENV{'request.course.id'}) { + if (&Apache::lonnet::allowed('pch', + $ENV{'request.course.id'}. + ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { + $discussoptions=' '. + &mt('Contribution to course discussion of resource'); + $discussoptions.='
'. + &mt('Anonymous contribution to course discussion of resource'). + ' ('.&mt('name only visible to course faculty').')'; } - } - if ($msgoptions) { $msgoptions='

'.&mt('Sending Messages').'

'.$msgoptions; } - if ($discussoptions) { - $discussoptions='

'.&mt('Discussion Contributions').'

'.$discussoptions; } - return $msgoptions.$discussoptions; + } + if ($msgoptions) { $msgoptions='

'.&mt('Sending Messages').'

'.$msgoptions; } + if ($discussoptions) { + $discussoptions='

'.&mt('Discussion Contributions').'

'.$discussoptions; } + return $msgoptions.$discussoptions; } sub resource_output { @@ -392,7 +474,7 @@ ENDEMAIL my $citations=<<"ENDCITE";

Previous attempts of student (if applicable)

$prevattempts -

+

Original screen output (if applicable)

$usersaw

Correct Answer(s) (if applicable)

@@ -439,7 +521,7 @@ sub decide_receiver { } } if ($ENV{'form.course'}||$course) { - $typestyle.='Submitting as Comment
'; + $typestyle.='Submitting as Comment
'; foreach (split(/\,/, $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) ) { @@ -448,7 +530,7 @@ sub decide_receiver { } } if ($ENV{'form.policy'}||$policy) { - $typestyle.='Submitting as Policy Feedback
'; + $typestyle.='Submitting as Policy Feedback
'; foreach (split(/\,/, $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) ) { @@ -479,7 +561,7 @@ sub send_msg { unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), 'Feedback ['.$declutter.']',$email,$citations,$feedurl, $attachmenturl)=~/ok/) { - $status.='
'.&mt('Error sending message to').' '.$_.'
'; + $status.='
'.&mt('Error sending message to').' '.$_.'
'; } else { $sendsomething++; } @@ -493,7 +575,7 @@ sub send_msg { $newrecord{'resource'}=$feedurl; $newrecord{'subnumber'}=$record{'subnumber'}+1; unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') { - $status.='
'.&mt('Not registered').'
'; + $status.='
'.&mt('Not registered').'
'; } } @@ -515,6 +597,9 @@ sub adddiscuss { $ENV{'environment.lastname'}.' '. $ENV{'enrironment.generation'}, 'attachmenturl'=> $attachmenturl); + if ($ENV{'form.replydisc'}) { + $contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1]; + } if ($anon) { $contrib{'anonymous'}='true'; } @@ -524,7 +609,7 @@ sub adddiscuss { $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); my %storenewentry=($symb => time); - $status.='
'.&mt('Updating discussion time').': '. + $status.='
'.&mt('Updating discussion time').': '. &Apache::lonnet::put('discussiontimes',\%storenewentry, $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); @@ -535,13 +620,13 @@ sub adddiscuss { my %newrecord=(); $newrecord{'resource'}=$symb; $newrecord{'subnumber'}=$record{'subnumber'}+1; - $status.='
'.&mt('Registering').': '. + $status.='
'.&mt('Registering').': '. &Apache::lonnet::cstore(\%newrecord,'_discussion'); } } else { $status.='Failed.'; } - return $status.'
'; + return $status.'
'; } # ----------------------------------------------------------- Preview function @@ -556,10 +641,11 @@ sub show_preview { } sub generate_preview_button { + my $pre=&mt("Show Preview"); return(< - ENDPREVIEW @@ -575,7 +661,7 @@ sub handler { # --------------------------- Get query string for limited number of parameters &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['hide','unhide','deldisc','postdata','preview']); + ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']); if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { # ----------------------------------------------------------------- Hide/unhide @@ -606,7 +692,19 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); &redirect_back($r,&Apache::lonnet::clutter($url), - &mt('Changed discussion status').'

','0','0'); + &mt('Changed discussion status').'
','0','0'); + } elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) { + 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'); @@ -633,7 +731,7 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); &redirect_back($r,&Apache::lonnet::clutter($url), - &mt('Changed discussion status').'

','0','0'); + &mt('Changed discussion status').'
','0','0'); } elsif ($ENV{'form.preview'}) { # -------------------------------------------------------- User wants a preview &show_preview($r); @@ -645,7 +743,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) {