--- loncom/interface/lonfeedback.pm 2004/04/28 23:59:53 1.79
+++ loncom/interface/lonfeedback.pm 2004/06/04 19:27:33 1.92
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.79 2004/04/28 23:59:53 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.92 2004/06/04 19:27:33 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,15 +34,44 @@ use Apache::Constants qw(:common);
use Apache::lonmsg();
use Apache::loncommon();
use Apache::lontexconvert();
-use Apache::lonlocal;
+use Apache::lonlocal; # must not have ()
+use Apache::lonhtmlcommon();
-sub list_discussion {
- my ($mode,$status,$symb)=@_;
-# &Apache::lonnet::logthis("status is $status");
- if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
+sub discussion_open {
+ my ($status)=@_;
+ if (defined($status) &&
+ !($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
|| $status eq 'OPEN')) {
- return '';
+ &Apache::lonnet::logthis(" no open due to status $status");
+ return 0;
+ }
+ my $close=&Apache::lonnet::EXT('resource.0.discussend');
+ if (defined($close) && $close ne '' && $close < time) {
+ &Apache::lonnet::logthis(" no open due to time ");
+ return 0;
}
+ &Apache::lonnet::logthis(" open ");
+ return 1;
+}
+
+sub discussion_visible {
+ my ($status)=@_;
+ if (not &discussion_open($status)) {
+ my $hidden=&Apache::lonnet::EXT('resource.0.discusshide');
+ if (lc($hidden) eq 'yes' or $hidden eq '' or !defined($hidden)) {
+ &Apache::lonnet::logthis(" hidden ");
+ return 0;
+ }
+ }
+ &Apache::lonnet::logthis(" visible ");
+ return 1;
+}
+
+sub list_discussion {
+ my ($mode,$status,$symb)=@_;
+
+ if (not &discussion_visible($status)) { return ''; }
+ my @bgcols = ("#cccccc","#eeeeee");
my $discussiononly=0;
if ($mode eq 'board') { $discussiononly=1; }
unless ($ENV{'request.course.id'}) { return ''; }
@@ -56,33 +85,71 @@ sub list_discussion {
}
unless ($symb) { return ''; }
- my %dischash = &Apache::lonnet::restore($symb,'nohist_'.$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'});
- my %readids = ();
- my $showonlyunread;
- my $prevread = 0;
-
- foreach my $key (keys %dischash) {
- if ($key eq 'lastread') {
- $prevread = $dischash{$key};
+# backward compatibility (bulletin boards used to be 'wrapped')
+ my $ressymb=$symb;
+ if ($mode eq 'board') {
+ unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+ $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
}
- if ($key eq 'showonlyunread') {
- $showonlyunread = $dischash{$key};
- } else {
- if ($dischash{$key} eq 'read') {
- $readids{$key} = 1;
- }
+ }
+
+# Get discussion display settings for this discussion
+ my $lastkey = $ressymb.'_lastread';
+ my $showkey = $ressymb.'_showonlyunread';
+ my $visitkey = $ressymb.'_visit';
+ my $ondispkey = $ressymb.'_markondisp';
+ my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey,$ondispkey],$ENV{'user.domain'},$ENV{'user.name'});
+ my %discinfo = ();
+ my $showonlyunread = 0;
+ my $markondisp = 0;
+ my $prevread = 0;
+ my $previous = 0;
+ my $visit = 0;
+ my $newpostsflag = 0;
+
+# Retain identification of "NEW" posts identified in last display, if continuing 'previous' browsing of posts.
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous']);
+ $previous = $ENV{'form.previous'};
+ if ($previous > 0) {
+ $prevread = $previous;
+ } elsif (defined($dischash{$lastkey})) {
+ unless ($dischash{$lastkey} eq '') {
+ $prevread = $dischash{$lastkey};
}
}
+# Get discussion display default settings for user
+ my %userenv = &Apache::lonnet::get('environment',['discdisplay','discmarkread'],$ENV{'user.domain'},$ENV{'user.name'});
+ my $discdisplay=$userenv{'discdisplay'};
+ if ($discdisplay eq 'unread') {
+ $showonlyunread = 1;
+ }
+ my $discmarkread=$userenv{'discmarkread'};
+ if ($discmarkread eq 'ondisp') {
+ $markondisp = 1;
+ }
+
+# Override user's default if user specified display setting for this discussion
+ if (defined($dischash{$ondispkey})) {
+ $markondisp = $dischash{$ondispkey};
+ }
+ if ($markondisp) {
+ $discinfo{$lastkey} = time;
+ }
+
+ if (defined($dischash{$showkey})) {
+ $showonlyunread = $dischash{$showkey};
+ }
+
+ if (defined($dischash{$visitkey})) {
+ $visit = $dischash{$visitkey};
+ }
+ $visit ++;
+
my $seeid=&Apache::lonnet::allowed('rin',$crs);
my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
&& ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/));
my @discussionitems=();
- # backward compatibility (bulletin boards used to be 'wrapped')
- my $ressymb=$symb;
- if ($mode eq 'board') {
- $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'});
@@ -92,6 +159,8 @@ sub list_discussion {
my @index=();
my @replies=();
my %alldiscussion=();
+ my %notshown = ();
+ my %newitem = ();
my $maxdepth=0;
my $target='';
@@ -101,14 +170,21 @@ sub list_discussion {
}
my $now = time;
- my %discinfo = (
- 'lastread' => $now,
- );
- &Apache::lonnet::cstore(\%discinfo,$symb,'nohist_'.$ENV{'request.course.id'}.'_discuss',$ENV{'user.domain'},$ENV{'user.name'});
+ $discinfo{$visitkey} = $visit;
+
+ &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
if ($contrib{'version'}) {
+ my $oldest = $contrib{'1:timestamp'};
+ if ($prevread eq '0') {
+ $prevread = $oldest-1;
+ }
for (my $id=1;$id<=$contrib{'version'};$id++) {
my $idx=$id;
+ my $posttime = $contrib{$idx.':timestamp'};
+ if ($prevread <= $posttime) {
+ $newpostsflag = 1;
+ }
my $hidden=($contrib{'hidden'}=~/\.$idx\./);
my $deleted=($contrib{'deleted'}=~/\.$idx\./);
my $origindex='0.';
@@ -139,12 +215,13 @@ sub list_discussion {
$subject=&Apache::lontexconvert::msgtexconverted($subject);
}
if ($contrib{$idx.':attachmenturl'}) {
- my ($fname,$ft)
- =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
- $message.=''.&mt('Attachment').': '.$fname.'.'.$ft.'
';
+ my ($fname)
+ =($contrib{$idx.':attachmenturl'}=~m|/([^/]+)$|);
+ &Apache::lonnet::allowuploaded('/adm/feedback',
+ $contrib{$idx.':attachmenturl'});
+ $message.=''.&mt('Attachment').
+ ': '.
+ $fname.'
';
}
if ($message) {
if ($hidden) {
@@ -172,36 +249,43 @@ sub list_discussion {
if ($seeid) {
if ($hidden) {
$sender.=' '.&mt('Make Visible').'';
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '">'.&mt('Make Visible').'';
} else {
$sender.=' '.&mt('Hide').'';
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '">'.&mt('Hide').'';
}
$sender.=' '.&mt('Delete').'';
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '">'.&mt('Delete').'';
}
} else {
if ($screenname) {
$sender=''.$screenname.'';
}
}
- if (&Apache::lonnet::allowed('pch',
+ if (&discussion_open($status) &&
+ &Apache::lonnet::allowed('pch',
$ENV{'request.course.id'}.
($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
$sender.=' '.&mt('Reply').'';
+ $ressymb.':::'.$idx;
+ if ($newpostsflag) {
+ $sender .= '&previous='.$prevread;
+ }
+ $sender .= '" '.$target.'>'.&mt('Reply').'';
}
my $vgrlink;
- my $ctlink;
- if ($readids{$idx} == 1) {
- $ctlink = ''.&mt('Mark unread').'? '.
- '';
- } else {
- $ctlink = ''.&mt('Mark read').'? '.
- '';
- }
if ($viewgrades) {
$vgrlink=&Apache::loncommon::submlink('Submissions',
$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
@@ -213,70 +297,136 @@ sub list_discussion {
}
$alldiscussion{$thisindex}=$idx;
$index[$idx]=$thisindex;
- my $posttime = $contrib{$idx.':timestamp'};
my $spansize = 2;
- $discussionitems[$idx]='';
- if ($prevread > 0 && $prevread < $posttime) {
- $discussionitems[$idx] .= '| NEW | ';
- $spansize ++;
- }
- $discussionitems[$idx] .= ' '.
- ''.$subject.' '.
- $sender.' '.$vgrlink.' ('.
- localtime($posttime).')'.
- ' | '.
- $ctlink.' |
';
- if ($showonlyunread && $readids{$idx}) {
- $discussionitems[$idx] .= '| Check "Show all posts?" or "Mark unread?", then "Save read settings" to display message |
';
+ if ($showonlyunread && $prevread > $posttime) {
+ $notshown{$idx} = 1;
} else {
- $discussionitems[$idx] .= ''.$message.'
';
+ if ($prevread > 0 && $prevread <= $posttime) {
+ $newitem{$idx} = 1;
+ $discussionitems[$idx] .= '
+
+ | NEW | ';
+ } else {
+ $newitem{$idx} = 0;
+ $discussionitems[$idx] .= '
+
+ | | ';
+ }
+ $discussionitems[$idx] .= ' '.
+ ''.$subject.' '.
+ $sender.' '.$vgrlink.' ('.
+ localtime($posttime).') |
'.
+ '
'.$message.'
';
}
}
}
}
}
+
my $discussion='';
+
+ my $function = &Apache::loncommon::get_users_function();
+ my $color = &Apache::loncommon::designparm($function.'.tabbg',
+ $ENV{'user.domain'});
+ my %lt = &Apache::lonlocal::texthash(
+ 'cuse' => 'Current settings for this discussion',
+ 'allposts' => 'All posts',
+ 'unread' => 'New posts only',
+ 'ondisp' => 'Once displayed',
+ 'onmark' => 'Once marked read',
+ 'disa' => 'Posts to be displayed',
+ 'npce' => 'Posts cease to be marked "NEW"',
+ 'chgt' => 'Change to ',
+ );
+
+ my $currdisp = $lt{'allposts'};
+ my $currmark = $lt{'onmark'};
+ my $dispchange = $lt{'unread'};
+ my $markchange = $lt{'ondisp'};
+ my $displink = '/adm/feedback?onlyunread='.$ressymb;
+ my $marklink = '/adm/feedback?markondisp='.$ressymb;
+
+ if ($markondisp) {
+ $currmark = $lt{'ondisp'};
+ $markchange = $lt{'onmark'};
+ $marklink = '/adm/feedback?markonread='.$ressymb;
+ if ($newpostsflag) {
+ $marklink .= '&previous='.$prevread;
+ }
+ }
+
+ if ($showonlyunread) {
+ $currdisp = $lt{'unread'};
+ $dispchange = $lt{'allposts'};
+ $displink = '/adm/feedback?allposts='.$ressymb;
+ }
+
+ if ($newpostsflag) {
+ $displink .= '&previous='.$prevread;
+ }
+
if ($visible) {
-# Print a the discusssion
- $discussion .= '';
+ }
+ $discussion.='
';
}
if ($discussiononly) {
$discussion.=(<';
Note: in anonymous discussion, your name is visible only to
course faculty
Title:
-
+
Attachment (128 KB max size):
@@ -297,7 +447,8 @@ Attachment (128 KB max size): /g;
$quote=''.&Apache::lontexconvert::msgtexconverted($message).'
';
@@ -330,14 +482,19 @@ sub mail_screen {
$subject = 'Re: '.$contrib{$idx.':subject'};
}
}
+ if ($ENV{'form.previous'}) {
+ $prevtag = '';
+ }
}
- my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+ my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
+ my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders();
my $send=&mt('Send');
$r->print(<
The LearningOnline Network with CAPA
+$htmlheader