135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Node search by date (but not time)

Browse Source
This commit is contained in:
Oliver Gorwits
2014-02-03 23:12:17 +00:00
parent a71a69aca4
commit 68275e6986
9 changed files with 73 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Netdisco/share/views/sidebar/report/ipinventory.tt
View File

@@ -31,6 +31,7 @@
<em class="muted">Seen within the date range:</em><br/>
<input class="nd_side-input" id="daterange"
type="text" name="daterange" value="[% params.daterange | html_entity %]"/>
</div>
</fieldset>
<fieldset>
@@ -72,27 +73,3 @@
<button id="[% report.tag %]_submit" type="submit" class="btn btn-info">
<i class="icon-search icon-large pull-left nd_navbar-icon"></i> Search IPs</button>
<script type = "text/javascript">
[%+ INCLUDE 'js/daterangepicker.js' -%]
[%+ INCLUDE 'js/moment.min.js' -%]
$('#daterange').daterangepicker({
ranges: {
'Today': [moment(), moment()],
'Yesterday': [moment().subtract('days', 1), moment().subtract('days', 1)],
'Last 7 Days': [moment().subtract('days', 6), moment()],
'Last 30 Days': [moment().subtract('days', 29), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract('month', 1).startOf('month'), moment().subtract('month', 1).endOf('month')]
},
startDate: moment().subtract('days', 29),
endDate: moment(),
minDate: '2004-01-01',
showDropdowns: true,
timePicker: false,
opens: 'left',
format: 'YYYY-MM-DD',
separator: ' to ',
}, function(start, end) {
$('#daterange span').html(start.format('MMM D, YYYY') + ' - ' + end.format('MMM D, YYYY'));
});
</script>

15
Netdisco/share/views/sidebar/search/node.tt
View File

@@ -38,6 +38,20 @@
<span class="nd_searchcheckbox uneditable-input">Partial Name</span>
</label>
</div>
<div class="clearfix">
<em class="muted">Date Range:</em><br/>
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="age_invert"
name="age_invert"[% ' checked="checked"' IF params.age_invert %]/>
</label>
<label class="nd_checkboxlabel" for="age_invert">
<span class="nd_searchcheckbox uneditable-input">Not within...</span>
</label>
</div>
<input class="nd_side-input" id="daterange"
type="text" name="daterange" value="[% params.daterange | html_entity %]"/>
</div>
<div class="clearfix">
<em class="muted">MAC address format:</em><br/>
<select id="nd_node-mac-format" name="mac_format">
@@ -48,3 +62,4 @@
</div>
<button id="[% tab.tag %]_submit" type="submit" class="btn btn-info">
<i class="icon-search icon-large pull-left nd_navbar-icon"></i> Search Nodes</button>