--- loncom/interface/lonfeedback.pm 2003/10/15 20:01:48 1.62 +++ loncom/interface/lonfeedback.pm 2003/11/03 20:34:54 1.65 @@ -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.65 2003/11/03 20:34:54 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,17 +69,13 @@ 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'}); 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\./); unless ((($hidden) && (!$seeid)) || ($deleted)) { @@ -92,7 +88,7 @@ sub list_discussion { $message.='

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

'; } if ($message) { if ($hidden) { @@ -128,6 +124,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 +140,17 @@ sub list_discussion { $vgrlink=&Apache::loncommon::submlink('Submissions', $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb); } - $discussion.='

'.$sender.' '.$vgrlink.' ('. + $discussionitems{$idx}='

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

'.$message. '

'; } } } - unless ($discussiononly) { - $discussion.='
'; - } + } + my $discussion='
'; + foreach (sort { $a <=> $b } keys %discussionitems) { + $discussion.=$discussionitems{$_}; } if ($discussiononly) { $discussion.=(< Note: in anonymous discussion, your name is visible only to course faculty
- +

Attachment (128 KB max size):

@@ -182,7 +185,8 @@ sub mail_screen { The LearningOnline Network with CAPA - $bodytag

$title

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

+$options

+

My question/comment/feedback:

+

$latexHelp -

+

+

Attachment (128 KB max size):

- +

ENDDOCUMENT @@ -250,12 +257,12 @@ sub fail_redirect { my ($r,$feedurl) = @_; $r->print (<Feedback not sent - - + + - + Sorry, no recipients ... @@ -267,15 +274,15 @@ sub redirect_back { $r->print (< Feedback sent - + - + $typestyle Sent $sendsomething message(s), and $sendposts post(s). -$status +$status
@@ -287,7 +294,7 @@ sub no_redirect_back { my ($r,$feedurl) = @_; $r->print (<Feedback not sent - + ENDNOREDIR if ($feedurl!~/^\/adm\/feedback/) { @@ -298,7 +305,7 @@ ENDNOREDIR - + Sorry, no feedback possible on this resource ... @@ -306,45 +313,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 +400,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 +447,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 +456,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 +487,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 +501,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 +523,9 @@ sub adddiscuss { $ENV{'environment.lastname'}.' '. $ENV{'enrironment.generation'}, 'attachmenturl'=> $attachmenturl); + if ($ENV{'form.replydisc'}) { + $contrib{'replyto'}=$ENV{'form.replydisc'}; + } if ($anon) { $contrib{'anonymous'}='true'; } @@ -524,7 +535,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 +546,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 +567,11 @@ sub show_preview { } sub generate_preview_button { + my $pre=&mt("Show Preview"); return(< - ENDPREVIEW @@ -575,7 +587,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']); if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { # ----------------------------------------------------------------- Hide/unhide @@ -606,7 +618,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.deldisc'}) { # --------------------------------------------------------------- Hide for good $r->content_type('text/html'); @@ -633,7 +645,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);