From 1a3fa08d028c48d71fc747cba959db9614c9a39e Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 14 Sep 2017 06:41:13 -0700 Subject: [PATCH] employee access stats: fix dates and remove web path --- httemplate/search/access_user_log.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/httemplate/search/access_user_log.html b/httemplate/search/access_user_log.html index 529ae8698..e18ac1440 100644 --- a/httemplate/search/access_user_log.html +++ b/httemplate/search/access_user_log.html @@ -8,22 +8,22 @@ '#', 'Avg time', ], - 'fields' => [ sub { shift->path }, + 'fields' => [ sub { shift->pretty_path }, sub { shift->num_entries }, sub { shift->avg_render_seconds }, ], - 'sort_fields' => [qw( path num_entries avg_render_seconds )], + 'sort_fields' => [qw( pretty_path num_entries avg_render_seconds )], &> <%init> die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); + unless $FS::CurrentUser::CurrentUser->access_right('Employee Reports'); my %hashref = (); my @extra_sql = (); -my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '_date'); +my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); push @extra_sql, "_date >= $beginning" if $beginning; push @extra_sql, "_date <= $ending" if $ending; @@ -32,13 +32,13 @@ $hashref{usernum} = $cgi->param('usernum') if $cgi->param('usernum') =~ /^\d+$/; my $extra_sql = ''; $extra_sql .= (keys(%hashref) ? ' AND ' : ' WHERE ' ). join(' AND ', @extra_sql) if @extra_sql; -$extra_sql .= ' GROUP BY path ' +$extra_sql .= ' GROUP BY pretty_path ' if $cgi->param('group_by') eq 'path'; -warn $extra_sql; +#warn $extra_sql; my $query = { 'select' => join(' , ', - 'path', + "regexp_replace(path, '^/var/www/(html/)?freeside/', '') as pretty_path", 'COUNT(*) AS num_entries', 'ROUND(AVG(COALESCE(render_seconds,0)),1) '. ' AS avg_render_seconds', -- 2.11.0