R11/release11-tools-mocked-services
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

T139 date and time split operational

Browse Source
This commit is contained in:
Gabriel Modzelewski
2021-03-18 17:04:46 +01:00
parent 4d8e34ba27
commit 6cbb7546e0
2 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/resources/static/js/historyloader.js
View File

@@ -2,8 +2,29 @@ var historyJson = {};
const maxIterations = 30; const maxIterations = 30;
function filterHistory(){ function filterHistory(){
var dateFrom = $('#historyFrom').val(); var dateFrom = new Date($('#historyFrom').val() + 'T' + $('#historyTimeFrom').val());
var dateTo = $('#historyTo').val(); console.log(dateFrom);
var dateTo = new Date($('#historyTo').val() + 'T' + $('#historyTimeTo').val());
console.log(dateTo);
// var dateFrom = new Date();
// var dateTo = new Date();
// var timeFrom = new Date();
// var timeTo = new Date();
// dateFrom = Date.parse($('#historyFrom').val());
// console.log(dateFrom);
// dateTo = Date.parse($('#historyTo').val());
// console.log(dateTo);
// timeFrom = Date.parse($('#historyTimeFrom').val());
// console.log(timeFrom);
// timeTo = Date.parse($('#historyToFrom').val());
// console.log(timeTo);
// dateFrom.setTime(timeFrom);
// console.log(dateFrom);
// dateTo.setTime(timeTo);
// console.log(dateTo);
loadHistory(dateFrom, dateTo); loadHistory(dateFrom, dateTo);
} }
@@ -45,6 +66,6 @@ function historyToHtml(){
return innerHTML; return innerHTML;
} }
const displayHistory = function(){ function displayHistory(){
$('#historyTable tbody').html(historyToHtml()); $('#historyTable tbody').html(historyToHtml());
} }

27
target/classes/static/js/historyloader.js
View File

@@ -2,8 +2,29 @@ var historyJson = {};
const maxIterations = 30; const maxIterations = 30;
function filterHistory(){ function filterHistory(){
var dateFrom = $('#historyFrom').val(); var dateFrom = new Date($('#historyFrom').val() + 'T' + $('#historyTimeFrom').val());
var dateTo = $('#historyTo').val(); console.log(dateFrom);
var dateTo = new Date($('#historyTo').val() + 'T' + $('#historyTimeTo').val());
console.log(dateTo);
// var dateFrom = new Date();
// var dateTo = new Date();
// var timeFrom = new Date();
// var timeTo = new Date();
// dateFrom = Date.parse($('#historyFrom').val());
// console.log(dateFrom);
// dateTo = Date.parse($('#historyTo').val());
// console.log(dateTo);
// timeFrom = Date.parse($('#historyTimeFrom').val());
// console.log(timeFrom);
// timeTo = Date.parse($('#historyToFrom').val());
// console.log(timeTo);
// dateFrom.setTime(timeFrom);
// console.log(dateFrom);
// dateTo.setTime(timeTo);
// console.log(dateTo);
loadHistory(dateFrom, dateTo); loadHistory(dateFrom, dateTo);
} }
@@ -45,6 +66,6 @@ function historyToHtml(){
return innerHTML; return innerHTML;
} }
const displayHistory = function(){ function displayHistory(){
$('#historyTable tbody').html(historyToHtml()); $('#historyTable tbody').html(historyToHtml());
} }