Skip to content

Predefined timespan #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheWitness merged 3 commits into from
Apr 9, 2026
+268 −265
Merged

Predefined timespan #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be56749
fix: Correcting issues with predefined timespan
TheWitness Apr 9, 2026
12e48e6
QA: Additional fixes for timespan work
TheWitness Apr 9, 2026
5a5e241
Merge branch 'develop' into predefined-timespan
TheWitness Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions js/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,9 @@ function applyFilter() {
strURL += '&removal='+$('#removal').val();
strURL += '&refresh='+$('#refresh').val();
strURL += '&grouping=' + ($('#grouping').length ? $('#grouping').val() : '0');

if ($('#predefined_timespan').val() == 0) {
strURL += '&date1='+$('#date1').val();
strURL += '&date2='+$('#date2').val();
} else {
strURL += '&predefined_timespan='+$('#predefined_timespan').val();
}
strURL += '&predefined_timespan='+$('#predefined_timespan').val();
strURL += '&date1='+$('#date1').val();
strURL += '&date2='+$('#date2').val();

loadPageNoHeader(strURL);
}
Expand Down Expand Up @@ -174,6 +170,8 @@ function initSyslogMain(config) {
var pageTab = config.pageTab || '';
var hostTerm = '';
var placeHolder = config.placeHolder || '';
var origDate1 = $('#date1').val();
var origDate2 = $('#date2').val();

// Make pageTab global for other functions
window.pageTab = pageTab;
Expand Down Expand Up @@ -322,20 +320,28 @@ function initSyslogMain(config) {
stepMinute: 1,
showAnim: 'slideDown',
numberOfMonths: 1,
timeFormat: 'HH:mm',
timeFormat: 'HH:mm:ss',
dateFormat: 'yy-mm-dd',
showButtonPanel: false
}).on('change', function() {
if ($('#date1').val() != origDate1) {
$('#predefined_timespan').val(0).selectmenu('refresh');
}
});

$('#date2').datetimepicker({
minuteGrid: 10,
stepMinute: 1,
showAnim: 'slideDown',
numberOfMonths: 1,
timeFormat: 'HH:mm',
timeFormat: 'HH:mm:ss',
dateFormat: 'yy-mm-dd',
showButtonPanel: false
});
}).on('change', function() {
if ($('#date2').val() != origDate2) {
$('#predefined_timespan').val(0).selectmenu('refresh');
}
});;
});
}

Expand Down
Loading
Loading