Diff for /loncom/interface/lonfeedback.pm between versions 1.48 and 1.52

version 1.48, 2003/07/01 19:27:31 version 1.52, 2003/09/09 18:46:28
Line 56  sub mail_screen { Line 56  sub mail_screen {
   my ($r,$feedurl,$options) = @_;    my ($r,$feedurl,$options) = @_;
   my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion',    my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion',
                                           '','onLoad="window.focus();"');                                            '','onLoad="window.focus();"');
     my $title=&Apache::lonnet::gettitle($feedurl);
     if (!$title) { $title = $feedurl; }
   my $latexHelp = Apache::loncommon::helpLatexCheatsheet();    my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
   $r->print(<<ENDDOCUMENT);    $r->print(<<ENDDOCUMENT);
 <html>  <html>
Line 105  sub mail_screen { Line 107  sub mail_screen {
 </script>  </script>
 </head>  </head>
 $bodytag  $bodytag
 <h2><tt>$feedurl</tt></h2>  <h2><tt>$title</tt></h2>
 <form action="/adm/feedback" method="post" name="mailform"  <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">  enctype="multipart/form-data">
 <input type=hidden name=postdata value="$feedurl">  <input type=hidden name=postdata value="$feedurl">
Line 151  sub redirect_back { Line 153  sub redirect_back {
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">  <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
 </head>  </head>
 <html>  <html>
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
 <img align=right src=/adm/lonIcons/lonlogos.gif>  <img align=right src=/adm/lonIcons/lonlogos.gif>
 $typestyle  $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>  <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
 <font color=red>$status</font>  <font color=red>$status</font>
   <form name="reldt" action="$feedurl" target="loncapaclient">
   </form>
 </body>  </body>
 </html>  </html>
 ENDREDIR  ENDREDIR
Line 175  ENDNOREDIR Line 179  ENDNOREDIR
   $r->print (<<ENDNOREDIRTWO);    $r->print (<<ENDNOREDIRTWO);
 </head>  </head>
 <html>  <html>
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
 <img align=right src=/adm/lonIcons/lonlogos.gif>  <img align=right src=/adm/lonIcons/lonlogos.gif>
 <b>Sorry, no feedback possible on this resource  ...</b>  <b>Sorry, no feedback possible on this resource  ...</b>
 </body>  </body>
Line 185  ENDNOREDIRTWO Line 189  ENDNOREDIRTWO
   
 sub screen_header {  sub screen_header {
   my ($feedurl) = @_;    my ($feedurl) = @_;
   my $options='';    my $msgoptions='';
     my $discussoptions='';
   if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {    if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
     $options=       $msgoptions= 
       '<p><input type=checkbox name=author> Feedback to resource author';        '<p><input type=checkbox name=author> Feedback to resource author';
   }    }
   if (&feedback_available(1)) {    if (&feedback_available(1)) {
     $options.=      $msgoptions.=
     '<br><input type=checkbox name=question> Question about resource content';      '<br><input type=checkbox name=question> Question about resource content';
   }    }
   if (&feedback_available(0,1)) {    if (&feedback_available(0,1)) {
     $options.=      $msgoptions.=
       '<br><input type=checkbox name=course> '.        '<br><input type=checkbox name=course> '.
  'Question/Comment/Feedback about course content';   'Question/Comment/Feedback about course content';
   }    }
   if (&feedback_available(0,0,1)) {    if (&feedback_available(0,0,1)) {
     $options.=      $msgoptions.=
       '<br><input type=checkbox name=policy> '.        '<br><input type=checkbox name=policy> '.
  'Question/Comment/Feedback about course policy';   'Question/Comment/Feedback about course policy';
   }    }
Line 209  sub screen_header { Line 214  sub screen_header {
       if (&Apache::lonnet::allowed('pch',        if (&Apache::lonnet::allowed('pch',
         $ENV{'request.course.id'}.          $ENV{'request.course.id'}.
         ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {          ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
     $options.='<br><input type=checkbox name=discuss> '.      $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;"> '.
  '<b>Contribution to course discussion of resource</b>';   'Contribution to course discussion of resource';
     $options.='<br><input type=checkbox name=anondiscuss> '.      $discussoptions.='<br><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;"> '.
  '<b>Anonymous contribution to course discussion of resource</b>'.   'Anonymous contribution to course discussion of resource'.
         ' (name only visible to course faculty)';          ' <i>(name only visible to course faculty)</i>';
       }        }
   }    }
   return $options;    if ($msgoptions) { $msgoptions='<h2>Sending Messages</h2>'.$msgoptions; }
     if ($discussoptions) { 
        $discussoptions='<h2>Discussion Contributions</h2>'.$discussoptions; }
     return $msgoptions.$discussoptions;
 }  }
   
 sub resource_output {  sub resource_output {
Line 457  sub handler { Line 465  sub handler {
     my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};      my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
   
     my ($symb,$idx)=split(/\:\:\:/,$entry);      my ($symb,$idx)=split(/\:\:\:/,$entry);
     my ($map,$ind,$url)=split(/\_\_\_/,$symb);      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
   
     my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},      my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},                       $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
Line 487  sub handler { Line 495  sub handler {
     my $entry=$ENV{'form.deldisc'};      my $entry=$ENV{'form.deldisc'};
   
     my ($symb,$idx)=split(/\:\:\:/,$entry);      my ($symb,$idx)=split(/\:\:\:/,$entry);
     my ($map,$ind,$url)=split(/\_\_\_/,$symb);      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
   
     my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},      my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
                      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},                       $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
Line 520  sub handler { Line 528  sub handler {
   unless ($symb) {    unless ($symb) {
       $symb=$ENV{'form.symb'};        $symb=$ENV{'form.symb'};
       if ($symb) {        if ($symb) {
   my ($map,$id,$url)=split(/\_\_\_/,$symb);    my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
           $feedurl=&Apache::lonnet::clutter($url);            $feedurl=&Apache::lonnet::clutter($url);
       }        }
   }    }
Line 561  sub handler { Line 569  sub handler {
 # Get output from resource  # Get output from resource
       my $usersaw=&resource_output($feedurl);        my $usersaw=&resource_output($feedurl);
   
 # Get resource answer  # Get resource answer (need to allow student to view grades for this to work)
         &Apache::lonnet::appenv(('allowed.vgr'=>'F'));
       my $useranswer=&Apache::loncommon::get_student_answers(        my $useranswer=&Apache::loncommon::get_student_answers(
                        $symb,$ENV{'user.name'},$ENV{'user.domain'},                         $symb,$ENV{'user.name'},$ENV{'user.domain'},
        $ENV{'request.course.id'});         $ENV{'request.course.id'});
         &Apache::lonnet::delenv('allowed.vgr');
 # Get attachments, if any, and not too large  # Get attachments, if any, and not too large
       my $attachmenturl='';        my $attachmenturl='';
       if ($ENV{'form.attachment.filename'}) {        if ($ENV{'form.attachment.filename'}) {

Removed from v.1.48  
changed lines
  Added in v.1.52


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>