projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing up numbers and totals
[clearscm.git]
/
maps
/
bin
/
detail.cgi
diff --git
a/maps/bin/detail.cgi
b/maps/bin/detail.cgi
index
f4885fd
..
ee2d2f4
100755
(executable)
--- a/
maps/bin/detail.cgi
+++ b/
maps/bin/detail.cgi
@@
-240,7
+240,11
@@
sub Body($) {
} # unless
} # unless
} # unless
} # unless
- my ($list, $sequence, $comment);
+ $hit_count //= '';
+
+ my $list = '';
+ my $sequence = 0;
+ my $comment = '';
# Parse rule
if ($rule) {
# Parse rule
if ($rule) {
@@
-259,6
+263,7
@@
sub Body($) {
$rule =~ s/\\@/\@/;
} # if
$rule =~ s/\\@/\@/;
} # if
+ $sequence //= 0;
$next++;
# Start Sender line
$next++;
# Start Sender line
@@
-311,12
+316,18
@@
sub Body($) {
}, $comment;
print end_Tr;
}, $comment;
print end_Tr;
+ my $msgnbr = 0;
+
for my $rec (@$msgs) {
for my $rec (@$msgs) {
+ $msgnbr++;
+
# We increased $next earlier so do not add 1 here
if (($next % $lines) == (@senders % $lines)) {
$dataclass = 'tablebottomdata';
# We increased $next earlier so do not add 1 here
if (($next % $lines) == (@senders % $lines)) {
$dataclass = 'tablebottomdata';
- $rightclass = 'tablebottomright';
- $subjectclass = 'subjectbottom';
+ $rightclass = 'tablebottomright' if $msgnbr == @$msgs;
+
+ # Only subjectbottom the last message
+ $subjectclass = 'subjectbottom' if $msgnbr == @$msgs;
} # if
if ($date eq substr ($rec->{timestamp}, 0, 10)) {
} # if
if ($date eq substr ($rec->{timestamp}, 0, 10)) {
@@
-336,11
+347,11
@@
sub Body($) {
-class => $subjectclass,
-colspan => 4,
}, a {
-class => $subjectclass,
-colspan => 4,
}, a {
- -href => "display.cgi?sender=$sender;msg_date=$rec->{timestamp}",
+ -href
=> "display.cgi?sender=$sender;msg_date=$rec->{timestamp}",
}, ' ' . $rec->{subject},
}, ' ' . $rec->{subject},
- td {-class
=> $rightclass,
- -width
=> '150',
- -align
=> 'right'}, span {-class => 'date'}, $rec->{date} . ' ',
+ td {-class => $rightclass,
+ -width => '150',
+ -align => 'right'}, span {-class => 'date'}, $rec->{date} . ' ',
];
} # for
} # for
];
} # for
} # for
@@
-388,8
+399,10
@@
if ($date eq '') {
$condition .= "type = '$type' and timestamp > '$sod' and timestamp < '$eod'";
} # if
$condition .= "type = '$type' and timestamp > '$sod' and timestamp < '$eod'";
} # if
-$total = CountLog(
+# Need to count distinct on sender
+$total = CountLogDistinct(
userid => $userid,
userid => $userid,
+ column => 'sender',
additional => $condition,
);
additional => $condition,
);