From: octo Date: Sat, 16 Apr 2005 09:53:53 +0000 (+0000) Subject: Added POD to Onis::Plugins::Weekdays X-Git-Tag: Release-0.8.0~11 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=30318d9847fb17c24933f450559ca7998baabaf0;p=onis.git Added POD to Onis::Plugins::Weekdays Added Weeksdays to Userdetails. Updated light-theme's stylesheet. Other themes are to do.. --- diff --git a/lib/Onis/Plugins/Userdetails.pm b/lib/Onis/Plugins/Userdetails.pm index 66aa39e..66e9903 100644 --- a/lib/Onis/Plugins/Userdetails.pm +++ b/lib/Onis/Plugins/Userdetails.pm @@ -10,6 +10,7 @@ use Onis::Data::Core (qw(get_main_nick register_plugin nick_to_name)); use Onis::Users (qw(ident_to_name get_link get_image)); use Onis::Plugins::Core (qw(get_core_nick_counters get_sorted_nicklist)); +use Onis::Plugins::Weekdays (qw(get_weekdays)); use Onis::Plugins::Conversations (qw(get_conversations)); use Onis::Plugins::Bignumbers (qw(get_bignumbers)); use Onis::Plugins::Interestingnumbers (qw(get_interestingnumbers)); @@ -136,8 +137,6 @@ sub output { my $nicks_ref = get_sorted_nicklist (); - my $max = $PLUGIN_MAX; - my $fh = get_filehandle (); my $trans = translate ('Detailed nick stats'); @@ -145,17 +144,19 @@ sub output my $max_time = 0; my $max_conv = 0; + my $max_weekday = 0; my @nicks = @$nicks_ref; my $nick_data = {}; - splice (@nicks, $max) if (scalar (@nicks) > $max); + splice (@nicks, $PLUGIN_MAX) if (scalar (@nicks) > $PLUGIN_MAX); for (@nicks) { my $nick = $_; $nick_data->{$nick} = get_core_nick_counters ($nick); + $nick_data->{$nick}{'weekdays'} = get_weekdays ($nick); $nick_data->{$nick}{'conversations'} = get_conversations ($nick); $nick_data->{$nick}{'bignumbers'} = get_bignumbers ($nick); $nick_data->{$nick}{'interestingnumbers'} = get_interestingnumbers ($nick); @@ -173,6 +174,17 @@ sub output $num = $ptr->[0] + $ptr->[1] + $ptr->[2] + $ptr->[3]; $max_conv = $num if ($max_conv < $num); } + + for (keys %{$nick_data->{$nick}{'weekdays'}}) + { + my $day = $_; + my $ptr = $nick_data->{$nick}{'weekdays'}{$day}; + + for (my $i = 0; $i < 4; $i++) + { + $max_weekday = $ptr->[$i] if ($max_weekday < $ptr->[$i]); + } + } } my $time_factor = 0; @@ -190,7 +202,7 @@ sub output print $fh qq#\n#, qq# \n#, - qq# \n#, + qq# \n#, qq# \n#; for (@nicks) @@ -201,7 +213,7 @@ sub output my $ptr = $nick_data->{$nick}; print $fh qq# \n#, - qq# \n#, + qq# \n#, qq# \n#, qq# \n#; @@ -304,51 +316,7 @@ sub output printf $fh (" $trans
\n", $num); } - # actions # TODO - # exclamation ratio # TODO - # # of nicks - # - # chats with - # lines per day - - print $fh qq# \n \n \n \n \n
$trans$trans
$print$print
\n#; - - if (defined ($ptr->{'chars'})) - { - print $fh qq# \n \n#; - - for (my $i = 0; $i < 24; $i++) - { - $num = 0; - - my $img = $V_IMAGES[int ($i / 6)]; - my $height; - - $num = $ptr->{'chars'}[$i]; - - $height = sprintf ("%.2f", 95 * $num / $max_time); - - print $fh qq# \n#; - } - - print $fh < - - - - - - -
$num chars
0-56-1112-1718-23
-EOF - } - else - { - print ' '; - } - - print $fh qq# 		\n#; + print $fh qq# \n#; if (%{$ptr->{'conversations'}}) { @@ -370,7 +338,7 @@ EOF $trans = translate ('Talks to'); print $fh < + @@ -383,13 +351,14 @@ EOF my $total = 0; print $fh " \n", - qq# \n#, - qq# \n#, + qq# \n \n"; @@ -412,6 +381,92 @@ EOF { print $fh ' '; } + print $fh qq# \n \n#, + qq# \n \n \n \n \n#; } print $fh "
$trans:
$other_name#; + qq# $other_name#; for (my $k = 0; $k < 4; $k++) { my $img = $H_IMAGES[$k]; - my $width = int (0.5 + ($conv_factor * $ptr->{'conversations'}{$other}{'nicks'}{$nick}[$k])) || 1; + my $num = $ptr->{'conversations'}{$other}{'nicks'}{$nick}[$k]; + my $width = sprintf ("%.2f", 95 * $num / $max_conv); print $fh qq##; + print $fh qq#style="width: $width\%;" />#; } print $fh "
\n#; + + if (defined ($ptr->{'chars'})) + { + print $fh qq# \n \n#; + + for (my $i = 0; $i < 24; $i++) + { + $num = 0; + + my $img = $V_IMAGES[int ($i / 6)]; + my $height; + + $num = $ptr->{'chars'}[$i]; + + $height = sprintf ("%.2f", 95 * $num / $max_time); + + print $fh qq# \n#; + } + + print $fh < + + + + + + +
$num chars
0-56-1112-1718-23
+EOF + } + else + { + print ' '; + } + + print $fh qq# 		\n#; + + #weekly + if (%{$nick_data->{$nick}{'weekdays'}}) + { + my $data = $nick_data->{$nick}{'weekdays'}; + my @days = (qw(mon tue wed thu fri sat sun)); + + print $fh qq# \n#, + qq# \n#; + + for (@days) + { + my $day = $_; + for (my $i = 0; $i < 4; $i++) + { + my $num = $nick_data->{$nick}{'weekdays'}{$day}[$i]; + my $height = sprintf ("%.2f", 95 * $num / $max_weekday); + my $class = ''; + my $img = $V_IMAGES[$i]; + + print $fh qq# \n#; + } + } + + print $fh qq# \n#, + qq# \n#; + + for (@days) + { + my $day = $_; + my $trans = translate ($day); + + print $fh qq# \n#; + } + + print $fh qq# \n#, + qq#
#, + qq##, + qq#
$trans
\n#; + } + + print $fh qq# 		\n#; + + #longterm + print $fh qq#  \n#; + + print $fh qq#
\n\n"; diff --git a/lib/Onis/Plugins/Weekdays.pm b/lib/Onis/Plugins/Weekdays.pm index dd27ad9..2a7172b 100644 --- a/lib/Onis/Plugins/Weekdays.pm +++ b/lib/Onis/Plugins/Weekdays.pm @@ -3,12 +3,23 @@ package Onis::Plugins::Weekdays; use strict; use warnings; +use Exporter; + use Onis::Config (qw(get_config)); use Onis::Html (qw(get_filehandle)); use Onis::Language (qw(translate)); use Onis::Data::Core (qw(register_plugin get_main_nick nick_to_ident nick_to_name)); use Onis::Data::Persistent (); +=head1 NAME + +Onis::Plugins::Weekdays - Activity based on weekdays + +=cut + +@Onis::Plugins::Weekdays::EXPORT_OK = (qw(get_weekdays)); +@Onis::Plugins::Weekdays::ISA = ('Exporter'); + register_plugin ('TEXT', \&add); register_plugin ('ACTION', \&add); register_plugin ('OUTPUT', \&output); @@ -26,13 +37,15 @@ qw( our $WeekdayData = {}; our @Weekdays = (qw(sun mon tue wed thu fri sat)); -our $BarHeight = 130; -if (get_config ('bar_height')) -{ - my $tmp = get_config ('bar_height'); - $tmp =~ s/\D//g; - $BarHeight = $tmp if ($tmp >= 10); -} +=head1 CONFIGURATION OPTIONS + +=over 4 + +=item B: I, I, I, I; + +Sets the images used for vertical bars. + +=cut our @VImages = get_config ('vertical_images'); if (scalar (@VImages) != 4) @@ -40,6 +53,10 @@ if (scalar (@VImages) != 4) @VImages = qw#images/ver0n.png images/ver1n.png images/ver2n.png images/ver3n.png#; } +=back + +=cut + my $VERSION = '$Id$'; print STDERR $/, __FILE__, ": $VERSION" if ($::DEBUG); @@ -122,7 +139,6 @@ sub output my $max = 0; my $total = 0; - my $bar_factor = 0; for (@order) { @@ -135,8 +151,6 @@ sub output } } - $bar_factor = $BarHeight / $max; - print $fh qq#\n \n#; for (@order) { @@ -167,3 +181,44 @@ sub output } print $fh " \n
\n\n"; } + +=head1 EXPORTED FUNCTIONS + +=over 4 + +=item B (I<$nick>) + +Returns a hashref with the weekday information for I<$nick>. Numbers are +character counters. The returned data has the following format: + + { + sun => [0, 0, 0, 0], + mon => [0, 0, 0, 0], + tue => [0, 0, 0, 0], + wed => [0, 0, 0, 0], + thu => [0, 0, 0, 0], + fri => [0, 0, 0, 0], + sat => [0, 0, 0, 0] + } + +=cut + +sub get_weekdays +{ + my $nick = shift; + + if (!defined ($WeekdayData->{$nick})) + { + return ({}); + } + + return ($WeekdayData->{$nick}); +} + +=back + +=head1 AUTHOR + +Florian octo Forster Eocto at verplant.orgE + +=cut diff --git a/lib/Onis/Users.pm b/lib/Onis/Users.pm index 8699be7..20c2e3f 100644 --- a/lib/Onis/Users.pm +++ b/lib/Onis/Users.pm @@ -341,3 +341,5 @@ sub get_image =head1 AUTHOR Florian octo Forster Eocto at verplant.orgE + +=cut diff --git a/reports/light-theme/style.css b/reports/light-theme/style.css index aae0209..8e2906a 100644 --- a/reports/light-theme/style.css +++ b/reports/light-theme/style.css @@ -221,12 +221,16 @@ table.userdetails td.convpartners td.bar img height: 4px; } -table.userdetails table.hours tr.bars +table.userdetails table.hours tr.bars, +table.userdetails table.weekdays tr.bars, +table.userdetails table.longterm tr.bars { height: 75px; } -table.userdetails table.hours tr.bars td.bar img +table.userdetails table.hours tr.bars td.bar img, +table.userdetails table.weekdays tr.bars td.bar img, +table.userdetails table.longterm tr.bars td.bar img { width: 3px; }