--- loncom/interface/lonwhatsnew.pm 2006/07/19 22:01:37 1.60
+++ loncom/interface/lonwhatsnew.pm 2006/11/23 00:02:38 1.64
@@ -1,5 +1,5 @@
#
-# $Id: lonwhatsnew.pm,v 1.60 2006/07/19 22:01:37 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.64 2006/11/23 00:02:38 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -286,11 +286,7 @@ sub display_actions_box {
$result = &store_courseinit_setting($uname,$udom,$cid,$initpage);
}
- my %threshold = (
- av_attempts => 2,
- degdiff => 0.5,
- numstudents => 2,
- );
+ my %threshold = ();
my %pagedesc = &Apache::lonlocal::texthash (
firstres => 'First resource',
whatsnew => "What's New? page",
@@ -468,9 +464,6 @@ sub display_threshold_config {
my $rowColor;
my @thresholditems = ("av_attempts","degdiff","numstudents");
- foreach my $item (@thresholditems) {
- $threshold{$item} = '';
- }
my %threshold_titles = &Apache::lonlocal::texthash(
av_attempts => 'Average number of attempts',
degdiff => 'Degree of difficulty',
@@ -687,7 +680,7 @@ sub display_launcher {
$critmsgcount,$critmsgs,$interval,$countunread) = @_;
if ($$checkallowed{$action}) {
- &start_box($r,$tabbg,$show,$headings,$action,$refpage);
+ &start_box($r,$tabbg,$show,$headings,$action,$refpage,$action);
if ($$show{$action}) {
if ($action eq 'handgrading') { # UNGRADED ITEMS
&display_handgrade($r,$tograde,$rowColor1,$rowColor2,
@@ -701,7 +694,7 @@ sub display_launcher {
} elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS
&display_abovethreshold($r,$refpage,$warnings,$triggered,
- $res_title);
+ $res_title);
} elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
&display_coursediscussion($r,$newdiscussions,$unread,
$countunread,$res_title,$rowColor1,$rowColor2);
@@ -739,7 +732,6 @@ sub getitems {
$cdom,$crs);
}
- my $warningnum = 0;
foreach my $resource (@allres) {
my $result = '';
my $applies = 0;
@@ -773,9 +765,8 @@ sub getitems {
# Maxtries and degree of difficulty for problem parts, unless handgradeable
if ($$show{'abovethreshold'}) {
- $warningnum = &check_thresholds($resource,$symb,\%resourcetracker,
- $triggered,$threshold,$warnings,
- $warningnum,$rowColor1,$rowColor2);
+ &check_thresholds($resource,$symb,\%resourcetracker,
+ $triggered,$threshold,$warnings);
}
}
@@ -839,8 +830,7 @@ sub check_bombed {
}
sub check_thresholds {
- my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings,
- $warningnum,$rowColor1,$rowColor2) = @_;
+ my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_;
# Compile maxtries and degree of difficulty for problem parts, unless handgradeable
my @parts = @{$resource->parts()};
my %stats;
@@ -885,46 +875,42 @@ sub check_thresholds {
}
}
if ($warning) {
- if ($warningnum%2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
- $$triggered{$symb}{rowColor} = $rowColor;
$$triggered{$symb}{title} = $resource->title;
+ my $partcount = 0;
+ @{$$triggered{$symb}{text}} = ();
foreach my $part (@parts) {
if (exists($stats{$part}{users})) {
my $resetname = 'reset_'.&escape($symb."\0".$part);
my $resettitle = 'title_'.&escape($symb."\0".$part);
- if ($$triggered{$symb}{numparts}) {
- $$triggered{$symb}{text} .= ''."\n";
- }
if (@parts > 1) {
- $$triggered{$symb}{text} .= '
- | part - '.$part.' | ';
+ $$triggered{$symb}{text}[$partcount] = '
+ part - '.$part.' | ';
} else {
- $$triggered{$symb}{text} .= '
- single part | ';
+ $$triggered{$symb}{text}[$partcount] = '
+ single part | ';
}
- $$triggered{$symb}{text} .= '
- '.$stats{$part}{users}.' |
- '.$stats{$part}{attempts}.' |
- '.$stats{$part}{degdiff}.' |
- '.$lastreset{$part}.' |
- |
-
';
- $$triggered{$symb}{numparts} ++;
+ $$triggered{$symb}{text}[$partcount] .= '
+ '.$stats{$part}{users}.' |
+ '.$stats{$part}{attempts}.' |
+ '.$stats{$part}{degdiff}.' |
+ '.$lastreset{$part}.' |
+ | ';
+ $partcount ++;
}
+ $$triggered{$symb}{numparts} = $partcount;
}
push(@{$warnings},$symb);
- $warningnum ++;
}
- return $warningnum;
}
sub get_curr_thresholds {
my ($threshold,$uname,$udom,$cid,$cdom,$crs) = @_;
+ # set default values
+ %$threshold = (av_attempts => 2,
+ degdiff => 0.5,
+ numstudents => 2
+ );
my %thresholdsettings = &Apache::lonnet::dump('nohist_whatsnew',$udom,
$uname,$cid.':threshold');
my $thresholdcount = 0;
@@ -1214,8 +1200,14 @@ sub display_abovethreshold {
' '."\n".
' '.
"\n");
- $r->print('| '.$lt{'reso'}.' | '.$lt{'part'}.' | '.$lt{'nust'}.' | '.$lt{'avat'}.' | '.$lt{'dedi'}.' | '.$lt{'lare'}.' | '.$lt{'reco'}.' |
');
+ $r->print(''.
+ '| '.$lt{'reso'}.' | '.
+ ''.$lt{'part'}.' | '.$lt{'nust'}.' | '.
+ ''.$lt{'avat'}.' | '.$lt{'dedi'}.' | '.
+ ''.$lt{'lare'}.' | '.$lt{'reco'}.' |
');
+ my $row;
foreach my $res (@{$warnings}) {
+ $row++;
my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
my $linkurl=&Apache::lonnet::clutter($url);
my $rowspan;
@@ -1223,11 +1215,26 @@ sub display_abovethreshold {
$rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"';
}
$linkurl .= '?symb='.&escape($res);
- $r->print('| '.$$triggered{$res}{title}.' | '.$$triggered{$res}{text});
+ my $css_class = $row%2?'LC_odd_row':'';
+ $r->print('
'.
+ '| '.
+ $$triggered{$res}{title}.' | ');
+ if (ref($$triggered{$res}{text}) eq 'ARRAY') {
+ $r->print($$triggered{$res}{text}[0]);
+ }
+ $r->print('
');
+ if (ref($$triggered{$res}{text}) eq 'ARRAY') {
+ if (@{$$triggered{$res}{text}} > 1) {
+ for (my $i=1; $i<@{$$triggered{$res}{text}}; $i++) {
+ $r->print(''.
+ $$triggered{$res}{text}[$i].'
');
+ }
+ }
+ }
}
- $r->print('
');
+ $r->print('
| ');
} else {
- $r->print('
'.$lt{'nopr'}.'
| ');
+ $r->print('| '.$lt{'nopr'}.' | ');
}
}
@@ -1516,7 +1523,7 @@ sub start_box {
chin => 'Change interval?',
chop => 'Change options?',
);
- my $showhide;
+ my ($showhide,$class);
if ($$show{$caller}) {
$showhide = 'Hide';
@@ -1548,6 +1555,7 @@ sub start_box {
'.$lt{'chth'}.' |
|
');
}
+ $class='class="LC_whatsnew"';
} elsif (($caller eq 'versionchanges') && ($$show{$caller})) {
if ($$show{$caller}) {
$r->print('
@@ -1563,10 +1571,10 @@ sub start_box {
');
}
}
- $r->print('
+ $r->print('
|
- |