--- loncom/interface/lonfeedback.pm	2001/02/10 14:10:13	1.8
+++ loncom/interface/lonfeedback.pm	2001/10/01 19:24:49	1.16
@@ -12,12 +12,18 @@
 # 3/1,2/3,2/5,2/6,2/8 Gerd Kortemeyer
 # 2/9 Guy Albertelli
 # 2/10 Gerd Kortemeyer
+# 2/13 Guy Albertelli
+# 7/25 Gerd Kortemeyer
+# 7/26 Guy Albertelli
+# 7/26,8/10,10/1 Gerd Kortemeyer
+
 
 package Apache::lonfeedback;
 
 use strict;
 use Apache::Constants qw(:common);
 use Apache::lonmsg();
+use Apache::loncommon();
 
 sub mail_screen {
   my ($r,$feedurl,$options) = @_;
@@ -29,26 +35,36 @@ sub mail_screen {
 <script>
     function gosubmit() {
         var rec=0;
-        if (document.mailform.elements.author!=undefined) {
+        if (typeof(document.mailform.elements.author)!="undefined") {
           if (document.mailform.elements.author.checked) {
              rec=1;
           } 
         }
-        if (document.mailform.elements.question!=undefined) {
+        if (typeof(document.mailform.elements.question)!="undefined") {
           if (document.mailform.elements.question.checked) {
              rec=1;
           } 
         }
-        if (document.mailform.elements.course!=undefined) {
+        if (typeof(document.mailform.elements.course)!="undefined") {
           if (document.mailform.elements.course.checked) {
              rec=1;
           } 
         }
-        if (document.mailform.elements.policy!=undefined) {
+        if (typeof(document.mailform.elements.policy)!="undefined") {
           if (document.mailform.elements.policy.checked) {
              rec=1;
           } 
         }
+        if (typeof(document.mailform.elements.discuss)!="undefined") {
+          if (document.mailform.elements.discuss.checked) {
+             rec=1;
+          } 
+        }
+        if (typeof(document.mailform.elements.anondiscuss)!="undefined") {
+          if (document.mailform.elements.anondiscuss.checked) {
+             rec=1;
+          } 
+        }
 
         if (rec) {
 	    document.mailform.submit();
@@ -67,7 +83,7 @@ sub mail_screen {
 Please check at least one of the following feedback types:
 $options<hr>
 My question/comment/feedback:<p>
-<textarea name=comment cols=60 rows=10>
+<textarea name=comment cols=60 rows=10 wrap=hard>
 </textarea><p>
 <input type=hidden name=sendit value=1>
 <input type=button value="Send Feedback" onClick='gosubmit();'></input>
@@ -155,53 +171,16 @@ sub screen_header {
       '<br><input type=checkbox name=policy> '.
 	'Question/Comment/Feedback about course policy';
   }
-  return $options;
-}
-
-sub get_previous_attempt {
-  my ($symb)=@_;
-  my $prevattempts='';
-  if ($symb) {
-    my $answer=&Apache::lonnet::reply(
-	              "restore:".$ENV{'user.domain'}.':'.$ENV{'user.name'}.':'.
-				      $ENV{'request.course.id'}.':'.
-				      &Apache::lonnet::escape($symb),
-				      $ENV{'user.home'});
-    my %returnhash=();
-    map {
-      my ($name,$value)=split(/\=/,$_);
-      $returnhash{&Apache::lonnet::unescape($name)}=
-	&Apache::lonnet::unescape($value);
-    } split(/\&/,$answer);
-    if ($returnhash{'version'}) {
-      my %lasthash=();
-      my $version;
-      for ($version=1;$version<=$returnhash{'version'};$version++) {
-        map {
-	  $lasthash{$_}=$returnhash{$version.':'.$_};
-        } split(/\:/,$returnhash{$version.':keys'});
-      }
-      $prevattempts='<table border=2></tr><th>History</th>';
-      map {
-        $prevattempts.='<th>'.$_.'</th>';
-      } keys %lasthash;
-      for ($version=1;$version<=$returnhash{'version'};$version++) {
-        $prevattempts.='</tr><tr><th>Attempt '.$version.'</th>';
-        map {
-	  $prevattempts.='<td>'.$returnhash{$version.':'.$_}.'</td>';   
-        } keys %lasthash;
-      }
-      $prevattempts.='</tr><tr><th>Current</th>';
-      map {
-        $prevattempts.='<td>'.$lasthash{$_}.'</td>';
-      } keys %lasthash;
-      $prevattempts.='</tr></table>';
-    } else {
-      $prevattempts='Nothing submitted - no attempts.';
-    }
-  } else {
-    $prevattempts='No data.';
+  if ($ENV{'request.course.id'}) {
+    $options.='<br><input type=checkbox name=discuss> '.
+	'<b>Contribution to course discussion of resource</b>';
+  }
+  if ($ENV{'request.course.id'}) {
+    $options.='<br><input type=checkbox name=anondiscuss> '.
+	'<b>Anonymous contribution to course discussion of resource</b>'.
+        ' (name only visible to course faculty)';
   }
+  return $options;
 }
 
 sub resource_output {
@@ -292,6 +271,25 @@ sub send_msg {
   return ($status,$sendsomething);
 }
 
+sub adddiscuss {
+    my ($symb,$email,$anon)=@_;
+    my $status='';
+    my %contrib=('message'      => $email,
+                 'sendername'   => $ENV{'user.name'},
+                 'senderdomain' => $ENV{'user.domain'});
+    if ($anon) {
+	$contrib{'anonymous'}='true';
+    }
+    if (($symb) && ($email)) {
+       $status='Adding to class discussion'.($anon?' (anonymous)':'').': '.
+        &Apache::lonnet::store(\%contrib,$symb,$ENV{'request.course.id'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.num'}).
+        '<br>';
+    }
+    return $status;   
+}
+
 sub handler {
   my $r = shift;
   if ($r->header_only) {
@@ -299,7 +297,53 @@ sub handler {
      $r->send_http_header;
      return OK;
   }
-  
+
+# --------------------------- Get query string for limited number of parameters
+
+    map {
+       my ($name, $value) = split(/=/,$_);
+       $value =~ tr/+/ /;
+       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+       if (($name eq 'hide') || ($name eq 'unhide')) {
+           unless ($ENV{'form.'.$name}) {
+              $ENV{'form.'.$name}=$value;
+	   }
+       }
+    } (split(/&/,$ENV{'QUERY_STRING'}));
+
+  if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
+# ----------------------------------------------------------------- Hide/unhide
+    $r->content_type('text/html');
+    $r->send_http_header;
+
+    my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
+
+    my ($symb,$idx)=split(/\:\:\:/,$entry);
+    my ($map,$ind,$url)=split(/\_\_\_/,$symb);
+
+    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 $currenthidden=$contrib{'hidden'};
+    
+    if ($ENV{'form.hide'}) {
+	$currenthidden.='.'.$idx.'.';
+    } else {
+        $currenthidden=~s/\.$idx\.//g;
+    }
+    my %newhash=('hidden' => $currenthidden);
+
+    &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+    &redirect_back($r,'/res/'.$url,'Changed discussion status<p>','0');
+
+      
+  } else {
+# ------------------------------------------------------------- Normal feedback
   my $feedurl=$ENV{'form.postdata'};
   $feedurl=~s/^http\:\/\///;
   $feedurl=~s/^$ENV{'SERVER_NAME'}//;
@@ -334,7 +378,9 @@ sub handler {
     } else {
       
 # Get previous user input
-      my $prevattempts=&get_previous_attempt($symb);
+      my $prevattempts=&Apache::loncommon::get_previous_attempt(
+            $symb,$ENV{'user.name'},$ENV{'user.domain'},
+            $ENV{'request.course.id'});
 
 # Get output from resource
       my $usersaw=&resource_output($feedurl);
@@ -352,6 +398,17 @@ sub handler {
 # Actually send mail
       my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to);
 
+# Discussion? Store that.
+
+      if ($ENV{'form.discuss'}) {
+	  $typestyle.=&adddiscuss($symb,$message);
+      }
+
+      if ($ENV{'form.anondiscuss'}) {
+	  $typestyle.=&adddiscuss($symb,$message,1);
+      }
+
+
 # Receipt screen and redirect back to where came from
       &redirect_back($r,$feedurl,$typestyle,$numsent,$status);
 
@@ -364,6 +421,7 @@ sub handler {
 # Ambiguous Problem Resource
     $r->internal_redirect('/adm/ambiguous');
   }
+}
   return OK;
 } 
 
@@ -372,3 +430,4 @@ __END__
 
 
 
+