[LON-CAPA-cvs] cvs: loncom /interface lonfeedback.pm

raeburn lon-capa-cvs@mail.lon-capa.org
Wed, 28 Apr 2004 21:13:13 -0000


This is a MIME encoded message

--raeburn1083186793
Content-Type: text/plain

raeburn		Wed Apr 28 17:13:13 2004 EDT

  Modified files:              
    /loncom/interface	lonfeedback.pm 
  Log:
  For discussion posts: added "Title" for each post, and the ability for a user to mark posts as read/unread, and to display only unread posts, or all posts. Read/unread information stored for visible posts for each user in a course-specific db file (e.g., msu_35101d1a78a4060msul1_discuss.db) in lonUsers/$dom/a/b/c/abcuser.  Should this be made a nohist_...db instead???  
  
  
--raeburn1083186793
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20040428171313.txt"

Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.77 loncom/interface/lonfeedback.pm:1.78
--- loncom/interface/lonfeedback.pm:1.77	Fri Feb 13 10:03:39 2004
+++ loncom/interface/lonfeedback.pm	Wed Apr 28 17:13:13 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.77 2004/02/13 15:03:39 www Exp $
+# $Id: lonfeedback.pm,v 1.78 2004/04/28 21:13:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,6 +55,20 @@
 	$symb=&Apache::lonnet::symbread();
     }
     unless ($symb) { return ''; }
+
+    my %dischash = &Apache::lonnet::restore($symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'});
+    my %readids = ();
+    my $showonlyunread;
+    foreach my $key (keys %dischash) {
+        if ($key eq 'showonlyunread') {
+            $showonlyunread = $dischash{$key};
+        } else {
+            if ($dischash{$key} eq 'read') {
+                $readids{$key} = 1;
+            }
+        }
+    }
+
     my $seeid=&Apache::lonnet::allowed('rin',$crs);
     my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
 	&& ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/));
@@ -107,6 +121,11 @@
 		my $message=$contrib{$idx.':message'};
 		$message=~s/\n/\<br \/\>/g;
 		$message=&Apache::lontexconvert::msgtexconverted($message);
+                my $subject=$contrib{$idx.':subject'};
+                if (defined($subject)) {
+                    $subject=~s/\n/\<br \/\>/g;
+                    $subject=&Apache::lontexconvert::msgtexconverted($subject);
+                }
 		if ($contrib{$idx.':attachmenturl'}) {
 		    my ($fname,$ft)
                         =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
@@ -161,6 +180,16 @@
 			    $ressymb.':::'.$idx.'" '.$target.'>'.&mt('Reply').'</a>';
 		    }
 		    my $vgrlink;
+                    my $ctlink;
+                    if ($readids{$idx} == 1) {
+                        $ctlink = '<b>'.&mt('Mark unread').'?</b>&nbsp;'.
+                            '<input type="checkbox" name="'.
+                            'postunread_'.$idx.'" />';
+                    } else {
+                        $ctlink = '<b>'.&mt('Mark read').'?</b>&nbsp;'.
+                            '<input type="checkbox" name="'.
+                            'postread_'.$idx.'" />';
+                    }
 		    if ($viewgrades) {
 			$vgrlink=&Apache::loncommon::submlink('Submissions',
             $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
@@ -172,24 +201,43 @@
 		    }
 		    $alldiscussion{$thisindex}=$idx;
 		    $index[$idx]=$thisindex;
-		    $discussionitems[$idx]='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
-			localtime($contrib{$idx.':timestamp'}).
-			'):<blockquote>'.$message.
-			'</blockquote></p>';
-	        }
-	    } 
+                    $discussionitems[$idx]='<p><table border="0" width="100%">'.
+                        '<tr><td align="left"><b>'.$subject.'</b>&nbsp;&nbsp;'.
+                        $sender.'</b> '.$vgrlink.' ('.
+                        localtime($contrib{$idx.':timestamp'}).
+                        ')</td><td align="right">&nbsp;&nbsp;'.$ctlink.'</td></tr>';
+                    if ($showonlyunread && $readids{$idx}) {
+                        $discussionitems[$idx] .= '<tr><td colspan="2" align="right"><i><font size="-1">Check "Show all posts?" or "Mark unread?", then "Save read settings" to display message</font></i></td></tr></table>';
+                    } else {
+                        $discussionitems[$idx] .= '</table><blockquote>'.$message.'</blockquote></p>';
+                    }
+                }
+            }
 	}
     }
     my $discussion='';
     if ($visible) {
 # Print a the discusssion
+        $discussion .= '<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$symb.'">';
 	$discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
 	if ($visible>2) {
 	    my $colspan=$maxdepth+1;
+my $showoption = '<tr><td align="right" bgcolor="#FFFFFF" colspan="'.$colspan.'">';
+            my $showflag = 'all';
+            if ($showonlyunread) {
+                $showoption .= '<b>Show all posts?</b><input type="checkbox"
+name="allposts" value="1"></td></tr>';
+            } else {
+                $showoption .= '<b>Show only unread posts?</b><input type="checkbox" name="onlyunread" value="1"></td></tr>';
+            }
+            $discussion.=$showoption;
 	    $discussion.='<tr><td bgcolor="DDDDBB" colspan="'.$colspan.'">'.
-  '<a href="/adm/feedback?threadedon='.$symb.'">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
-  '<a href="/adm/feedback?threadedoff='.$symb.'">'.&mt('Chronological View').'</a>'.
-  '</td></tr>';
+            '<table border="0" width="100%" bgcolor="#DDDDBB"><tr><td align="left">'.
+            '<a href="/adm/feedback?threadedon='.$symb.'">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
+            '<a href="/adm/feedback?threadedoff='.$symb.'">'.&mt('Chronological View').'</a>&nbsp;&nbsp;</td>'.
+            '<td align="right"><a href="/adm/feedback?markread='.$symb.'">'.&mt('Mark all read').'</a>&nbsp;&nbsp;'.
+            '<a href="/adm/feedback?markunread='.$symb.'">'.&mt('Mark all unread').'</a>&nbsp;&nbsp;'.
+            '</td></tr></table></td></tr>';
 	}
 
 	foreach (sort { $a <=> $b } keys %alldiscussion) {
@@ -199,10 +247,16 @@
 		$discussion.='<td>&nbsp;&nbsp;&nbsp;</td>';
 	    }
 	    my $colspan=$maxdepth-$thisdepth+1;
-            $discussion.="<td  bgcolor='#CCCCCC' colspan='".$colspan."'>".$discussionitems[$alldiscussion{$_}].
-		"</td></tr>";
+            $discussion.='<td  bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
+                         $discussionitems[$alldiscussion{$_}].
+	                 '</td></tr>';
 	}
-        $discussion.='</table>';
+        my $colspan=$maxdepth+1;
+        $discussion.='<tr><td bgcolor="#FFFFFF" align="right" colspan="'.
+        $colspan.'"><br /><input type="hidden" name="storereads" value="0">'.            '<input type="hidden" name="discsymb" value="'.$symb.'">'.
+        '<input type="button" name="readoptions" '.
+        'value="Save read settings" onClick="this.form.storereads.value=1;this.form.submit();"></td></tr>';
+        $discussion .= '</table><br /><br /></form>';
     }
     if ($discussiononly) {
 	$discussion.=(<<ENDDISCUSS);
@@ -214,6 +268,7 @@
 <br />
 <font size="1">Note: in anonymous discussion, your name is visible only to
 course faculty</font><br />
+<b>Title:</b>&nbsp;<input type="text" name="subject" value="" size="30" /><br /><br />
 <textarea name="comment" cols="60" rows="10" wrap="hard"></textarea>
 <p>
 Attachment (128 KB max size): <input type="file" name="attachment" />
@@ -241,6 +296,7 @@
   my $title=&Apache::lonnet::gettitle($feedurl);
   if (!$title) { $title = $feedurl; }
   my $quote='';
+  my $subject = '';
   if ($ENV{'form.replydisc'}) {
       my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'});
       my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
@@ -250,6 +306,7 @@
 	  my $message=$contrib{$idx.':message'};
 	  $message=~s/\n/\<br \/\>/g;
 	  $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';
+          $subject = 'Re: '.$contrib{$idx.':subject'};
       }
   }
   my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
@@ -315,6 +372,8 @@
 <p>My question/comment/feedback:</p>
 <p>
 $latexHelp
+Title: <input type="text" name="subject" size="30" value="$subject" /></p>
+<p>
 <textarea name="comment" cols="60" rows="10" wrap="hard">
 </textarea></p>
 <p>
@@ -588,7 +647,7 @@
 }
 
 sub adddiscuss {
-    my ($symb,$email,$anon,$attachmenturl)=@_;
+    my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
     my $status='';
     if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
         ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
@@ -601,7 +660,8 @@
 		                   $ENV{'environment.middlename'}.' '.
                                    $ENV{'environment.lastname'}.' '.
                                    $ENV{'enrironment.generation'},
-                 'attachmenturl'=> $attachmenturl);
+                 'attachmenturl'=> $attachmenturl,
+                 'subject'      => $subject);
     if ($ENV{'form.replydisc'}) {
 	$contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1];
     }
@@ -641,7 +701,11 @@
     my $message=&clear_out_html($ENV{'form.comment'});
     $message=~s/\n/\<br \/\>/g;
     $message=&Apache::lontexconvert::msgtexconverted($message);
+    my $subject=&clear_out_html($ENV{'form.subject'});
+    $subject=~s/\n/\<br \/\>/g;
+    $subject=&Apache::lontexconvert::msgtexconverted($subject);
     $r->print('<table border="2"><tr><td>'.
+       '<b>Subject:</b> '.$subject.'<br /><br />'.
        $message.'</td></tr></table>');
 }
 
@@ -649,9 +713,10 @@
     my $pre=&mt("Show Preview");
     return(<<ENDPREVIEW);
 <form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
+<input type="hidden" name="subject">
 <input type="hidden" name="comment" />
 <input type="button" value="$pre"
-onClick="this.form.comment.value=document.mailform.comment.value;this.form.submit();" />
+onClick="this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" />
 </form>
 ENDPREVIEW
 }
@@ -667,9 +732,76 @@
 # --------------------------- Get query string for limited number of parameters
 
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-         ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']);
+#         ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']);
+         ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','markread','markunread','storereads','onlyunread','allposts','chgreads']);
 
-  if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
+  if (($ENV{'form.markread'}) || ($ENV{'form.markunread'})) {
+# ----------------------------------------------------------------- Modify read/unread for all
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      my $symb=$ENV{'form.markread'}?$ENV{'form.markread'}:$ENV{'form.markunread'};
+      my $ressymb = $symb;
+      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+      $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+      my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
+                          $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+                          $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+      my %readinghash = ();
+                                                                                 
+      if ($contrib{'version'}) {
+          for (my $id=1;$id<=$contrib{'version'};$id++) {
+              my $msgid = $id.':message';
+              if (defined($contrib{$msgid})) {
+                  if ($ENV{'form.markread'}) {
+                      $readinghash{$id} = 'read';
+                  } else {
+                       $readinghash{$id} = 'unread';
+                  }
+              }
+          }
+          if ($ENV{'form.allposts'}) {
+              $readinghash{'showonlyunread'} = 0;
+          } elsif ($ENV{'form.onlyunread'}) {
+              $readinghash{'showonlyunread'} = 1;
+          }
+          &Apache::lonnet::cstore(\%readinghash,$symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'});
+      }
+                                                                                 
+      &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed reading status'),'0','0');
+      return OK;
+  } else {
+      my $symb = $ENV{'form.discsymb'};
+      my %readinghash = ();
+      my $chgcount = 0;
+      foreach my $key (keys %ENV) {
+          if ($key =~ m/^form\.postunread_(\d+)/) {
+              $readinghash{$1} = 'unread';
+              $chgcount ++;
+          } elsif ($key =~ m/^form\.postread_(\d+)/) {
+              $readinghash{$1} = 'read';
+              $chgcount ++;
+          }
+      }
+      if ($ENV{'form.allposts'}) {
+          $readinghash{'showonlyunread'} = 0;
+          $chgcount ++;
+      } elsif ($ENV{'form.onlyunread'}) {
+          $readinghash{'showonlyunread'} = 1;
+          $chgcount ++;
+      }
+                                                                                 
+      if ($chgcount > 0) {
+          &Apache::lonnet::cstore(\%readinghash,$symb,$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'});
+      }
+  }
+
+  if ($ENV{'form.chgreads'}) {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ENV{'form.chgreads'});
+      &redirect_back($r,&Apache::lonnet::clutter($url),
+       &mt('Changed read status').'<br />','0','0');
+  } elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
@@ -698,7 +830,7 @@
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
     &redirect_back($r,&Apache::lonnet::clutter($url),
-       &mt('Changed discussion status').'<br />','0','0');
+       &mt('Changed read status').'<br />','0','0');
   } elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) {
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
@@ -839,12 +971,14 @@
 
       my $numpost=0;
       if ($ENV{'form.discuss'}) {
-	  $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl);
+          my $subject = &clear_out_html($ENV{'form.subject'});
+	  $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl,$subject);
 	  $numpost++;
       }
 
       if ($ENV{'form.anondiscuss'}) {
-	  $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl);
+          my $subject = &clear_out_html($ENV{'form.subject'});
+	  $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl,$subject);
 	  $numpost++;
       }
 

--raeburn1083186793--