diff --git a/Netdisco/Changes b/Netdisco/Changes index a396f732..fe78e744 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -1,3 +1,9 @@ +2.027008_002 - 2014-06-23 + + [BUG FIXES] + + * Subnets report date range fixed, but (unnecessary?) "not" option removed + 2.027008_001 - 2014-06-23 [NEW FEATURES] diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/SubnetUtilization.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/SubnetUtilization.pm index 372b5e51..99bb3e60 100644 --- a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/SubnetUtilization.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/SubnetUtilization.pm @@ -20,8 +20,13 @@ __PACKAGE__->result_source_instance->view_definition(<<'ENDSQL'); FROM subnets s1, node_ip ni WHERE s1.net <<= ?::cidr AND ni.ip <<= s1.net - AND ni.time_last >= ? - AND ni.time_last <= ? + AND (( + ni.time_first IS null + AND ni.time_last IS null + ) OR ( + ni.time_last >= ? + AND ni.time_last <= ? + )) AND s1.last_discover >= ? UNION SELECT DISTINCT net, di.alias as ip diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm index b955f1b7..aa4232e4 100644 --- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm +++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm @@ -18,15 +18,12 @@ get '/ajax/content/report/subnets' => require_login sub { my $agenot = param('age_invert') || '0'; my ( $start, $end ) = param('daterange') =~ /(\d+-\d+-\d+)/gmx; - if ($agenot) { - my $tmp = $end; - $end = $start; - $start = $tmp; - } + $start = $start . ' 00:00:00'; + $end = $end . ' 23:59:59'; my @results = schema('netdisco')->resultset('Virtual::SubnetUtilization') ->search(undef,{ - bind => [ $subnet, $start, $end, $end, $subnet, $end, $end ], + bind => [ $subnet, $start, $end, $start, $subnet, $start, $start ], })->hri->all; return unless scalar @results; diff --git a/Netdisco/share/views/ajax/report/subnets.tt b/Netdisco/share/views/ajax/report/subnets.tt index 7f26be6d..82c0c9a8 100644 --- a/Netdisco/share/views/ajax/report/subnets.tt +++ b/Netdisco/share/views/ajax/report/subnets.tt @@ -11,7 +11,7 @@ [% FOREACH row IN results %] - + [% row.subnet | html_entity %] [% row.subnet_size | format_number %] [% row.active | format_number %] diff --git a/Netdisco/share/views/sidebar/report/subnets.tt b/Netdisco/share/views/sidebar/report/subnets.tt index 02bdbda4..27db0844 100644 --- a/Netdisco/share/views/sidebar/report/subnets.tt +++ b/Netdisco/share/views/sidebar/report/subnets.tt @@ -10,6 +10,7 @@ +