[freeside-commits] branch master updated. e7c2e62ad9e8bbcf6d5c9f2a19c9de77f2a71e64
Ivan
ivan at 420.am
Thu Sep 14 07:11:52 PDT 2017
The branch, master has been updated
via e7c2e62ad9e8bbcf6d5c9f2a19c9de77f2a71e64 (commit)
via 1a3fa08d028c48d71fc747cba959db9614c9a39e (commit)
from 5027e0e807b38364fc10c992ea50a2ad7d934986 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e7c2e62ad9e8bbcf6d5c9f2a19c9de77f2a71e64
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Sep 14 07:11:51 2017 -0700
employee statistics: omit common components
diff --git a/httemplate/search/access_user_log.html b/httemplate/search/access_user_log.html
index e18ac14..75bfa13 100644
--- a/httemplate/search/access_user_log.html
+++ b/httemplate/search/access_user_log.html
@@ -27,14 +27,37 @@ my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
push @extra_sql, "_date >= $beginning" if $beginning;
push @extra_sql, "_date <= $ending" if $ending;
-$hashref{usernum} = $cgi->param('usernum') if $cgi->param('usernum') =~ /^\d+$/;
+my $count_hr = '';
+if ( $cgi->param('usernum') =~ /^\d+$/ ) {
+ $hashref{usernum} = $cgi->param('usernum');
+ $count_hr = "WHERE usernum = ".$hashref{usernum};
+}
+
+if ( $cgi->param('skip_components') ) {
+ push @extra_sql, "path NOT IN ( '". join("','",
+ map "/var/www/html/freeside/$_", qw(
+ view/REAL_logo.cgi
+ misc/jsrsServer.html
+ misc/xmlhttp-reason-hint.html
+ config/config-image.cgi
+ misc/xmlhttp-part_pkg_taxproduct.html
+ misc/progress-popup.html
+ misc/file-upload.html
+ misc/confirm-censustract.html
+ misc/xmlhttp-address_standardize.html
+ misc/confirm-address_standardize.html
+ misc/xmlhttp-part_pkg_usageprice.html
+ )
+ ).
+ "' )";
+}
my $extra_sql = '';
$extra_sql .= (keys(%hashref) ? ' AND ' : ' WHERE ' ). join(' AND ', @extra_sql)
if @extra_sql;
+my $count_extra = $extra_sql;
$extra_sql .= ' GROUP BY pretty_path '
if $cgi->param('group_by') eq 'path';
-#warn $extra_sql;
my $query = {
'select' => join(' , ',
@@ -48,7 +71,6 @@ my $query = {
'extra_sql' => $extra_sql,
};
-#uuh, no, need dates and usernum too, but whatever for now
-my $count_query = 'SELECT COUNT(DISTINCT path) FROM access_user_log';
+my $count_query = "SELECT COUNT(DISTINCT path) FROM access_user_log $count_hr $count_extra";
</%init>
diff --git a/httemplate/search/report_access_user_log.html b/httemplate/search/report_access_user_log.html
index d43c742..209adfa 100644
--- a/httemplate/search/report_access_user_log.html
+++ b/httemplate/search/report_access_user_log.html
@@ -2,20 +2,21 @@
<FORM ACTION="access_user_log.html" METHOD="GET">
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+<INPUT TYPE="hidden" NAME="group_by" VALUE="<% $group_by %>">
- <INPUT TYPE="hidden" NAME="group_by" VALUE="<% $group_by %>">
-
- <TR>
- <TH CLASS="background" COLSPAN=2 ALIGN="left">
- <FONT SIZE="+1">Search options</FONT>
- </TH>
- </TR>
+ <FONT CLASS="fsinnerbox-title"><% emt('Search options') %></FONT>
+ <TABLE CLASS="fsinnerbox">
<& /elements/tr-input-beginning_ending.html &>
<& /elements/tr-select-user.html &>
+ <& /elements/tr-checkbox.html,
+ label => 'Omit components',
+ field => 'skip_components',
+ value => 'Y',
+ &>
+
</TABLE>
<BR>
commit 1a3fa08d028c48d71fc747cba959db9614c9a39e
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Sep 14 06:41:13 2017 -0700
employee access stats: fix dates and remove web path
diff --git a/httemplate/search/access_user_log.html b/httemplate/search/access_user_log.html
index 529ae86..e18ac14 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',
-----------------------------------------------------------------------
Summary of changes:
httemplate/search/access_user_log.html | 42 +++++++++++++++++++------
httemplate/search/report_access_user_log.html | 17 +++++-----
2 files changed, 41 insertions(+), 18 deletions(-)
More information about the freeside-commits
mailing list