From 6cbb7546e04876dc8b8cb65bd8fbc914ff54cae3 Mon Sep 17 00:00:00 2001
From: modzeleg <g.modzelewski@protonmail.com>
Date: Thu, 18 Mar 2021 17:04:46 +0100
Subject: [PATCH] T139 date and time split operational

---
 src/main/resources/static/js/historyloader.js | 27 ++++++++++++++++---
 target/classes/static/js/historyloader.js     | 27 ++++++++++++++++---
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/static/js/historyloader.js b/src/main/resources/static/js/historyloader.js
index 7582177..fb3b555 100644
--- a/src/main/resources/static/js/historyloader.js
+++ b/src/main/resources/static/js/historyloader.js
@@ -2,8 +2,29 @@ var historyJson = {};
 const maxIterations = 30;
 
 function filterHistory(){
-    var dateFrom = $('#historyFrom').val();
-    var dateTo = $('#historyTo').val();
+    var dateFrom = new Date($('#historyFrom').val() + 'T' + $('#historyTimeFrom').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);
 }
 
@@ -45,6 +66,6 @@ function historyToHtml(){
     return innerHTML;
 }
 
-const displayHistory = function(){
+function displayHistory(){
     $('#historyTable tbody').html(historyToHtml());
 }
diff --git a/target/classes/static/js/historyloader.js b/target/classes/static/js/historyloader.js
index 7582177..fb3b555 100644
--- a/target/classes/static/js/historyloader.js
+++ b/target/classes/static/js/historyloader.js
@@ -2,8 +2,29 @@ var historyJson = {};
 const maxIterations = 30;
 
 function filterHistory(){
-    var dateFrom = $('#historyFrom').val();
-    var dateTo = $('#historyTo').val();
+    var dateFrom = new Date($('#historyFrom').val() + 'T' + $('#historyTimeFrom').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);
 }
 
@@ -45,6 +66,6 @@ function historyToHtml(){
     return innerHTML;
 }
 
-const displayHistory = function(){
+function displayHistory(){
     $('#historyTable tbody').html(historyToHtml());
 }