T139 Filter switch removed

src/main/resources/static/css/main.css

@@ -279,13 +279,9 @@ input:focus {
 }
 
 #historyFunction {
-    margin-top: 10px;
+    margin-top: 30px;
     margin-bottom: 30px;
     width: 670px;
-    display: none;
-}
-
-#historyFunction.active {
     display: flex;
     align-content: space-between;
 }
@@ -306,23 +302,5 @@ input:focus {
     margin-right: 15px;
 }
 
-#historyFilterSwitch {
-    width: 100%;
-    font-size: 18px;
-    cursor: pointer;
-    border: 0;
-	padding: 0;
-	background: 0;
-    outline: 0;
-    text-align: left;
-    margin-top: 30px;
-    margin-bottom: 30px;
-    margin-left: 15px;
-
-}
-
-#historyFilterSwitch:hover {
-    color: orange;
-}
 
 

src/main/resources/static/html/mock.html

@@ -91,7 +91,6 @@
                         </table>
                     </div>
                     <div id="history" style="display:none;">
-                        <button id="historyFilterSwitch">>Filters</button>
                         <div id="historyFunction">
                             <div>
                                 <label for="historyFrom">From</label>

src/main/resources/static/js/historyloader.js

@@ -1,10 +1,5 @@
 var historyJson = {};
 const maxIterations = 30;
-var filters = false;
-var defaultTo = new Date();
-defaultTo.setDate(defaultTo.getDate + 1);
-var defaultFrom = new Date();
-defaultFrom.setDate(defaultFrom.getDate - 30);
 
 function filterHistory(){
     var dateFrom = $('#historyFrom').val();
@@ -17,10 +12,6 @@ const startSearch = function(){
 }
 $('#btn-searchHistory').click(startSearch);
 
-const filterSwitch = function(){
-    $('#historyFunction').toggleClass("active");
-}
-
 $('#historyFilterSwitch').click(filterSwitch);
 
 function loadHistory(dateFrom, dateTo){
@@ -37,14 +28,12 @@ function loadHistory(dateFrom, dateTo){
         data: JSON.stringify(eventRequest, null, 2),
         contentType: "application/json"
     }).done(function(data){
-        // TODO: Add display function
         historyJson = data;
         displayHistory();
     });
 }
 
 function historyToHtml(){
-    console.log('generating history');
     var innerHTML = '';
     var iterations = historyJson.length <= maxIterations ? historyJson.length : maxIterations;
     for(let i=0; i<iterations; i++){
@@ -53,14 +42,9 @@ function historyToHtml(){
             '<td>' + historyJson[i].interfaceName + '</td>' +
         '</tr>';
     }
-    console.log('history generated');
     return innerHTML;
 }
 
 const displayHistory = function(){
-    console.log('Setting history...');
     $('#historyTable tbody').html(historyToHtml());
-    console.log('History set');
 }
-
-$(document).ready(loadHistory(defaultFrom, defaultTo));

target/classes/static/css/main.css

@@ -279,13 +279,9 @@ input:focus {
 }
 
 #historyFunction {
-    margin-top: 10px;
+    margin-top: 30px;
     margin-bottom: 30px;
     width: 670px;
-    display: none;
-}
-
-#historyFunction.active {
     display: flex;
     align-content: space-between;
 }
@@ -306,23 +302,5 @@ input:focus {
     margin-right: 15px;
 }
 
-#historyFilterSwitch {
-    width: 100%;
-    font-size: 18px;
-    cursor: pointer;
-    border: 0;
-	padding: 0;
-	background: 0;
-    outline: 0;
-    text-align: left;
-    margin-top: 30px;
-    margin-bottom: 30px;
-    margin-left: 15px;
-
-}
-
-#historyFilterSwitch:hover {
-    color: orange;
-}
 
 

target/classes/static/html/mock.html

@@ -91,7 +91,6 @@
                         </table>
                     </div>
                     <div id="history" style="display:none;">
-                        <button id="historyFilterSwitch">>Filters</button>
                         <div id="historyFunction">
                             <div>
                                 <label for="historyFrom">From</label>

target/classes/static/js/historyloader.js

@@ -1,10 +1,5 @@
 var historyJson = {};
 const maxIterations = 30;
-var filters = false;
-var defaultTo = new Date();
-defaultTo.setDate(defaultTo.getDate + 1);
-var defaultFrom = new Date();
-defaultFrom.setDate(defaultFrom.getDate - 30);
 
 function filterHistory(){
     var dateFrom = $('#historyFrom').val();
@@ -17,10 +12,6 @@ const startSearch = function(){
 }
 $('#btn-searchHistory').click(startSearch);
 
-const filterSwitch = function(){
-    $('#historyFunction').toggleClass("active");
-}
-
 $('#historyFilterSwitch').click(filterSwitch);
 
 function loadHistory(dateFrom, dateTo){
@@ -37,14 +28,12 @@ function loadHistory(dateFrom, dateTo){
         data: JSON.stringify(eventRequest, null, 2),
         contentType: "application/json"
     }).done(function(data){
-        // TODO: Add display function
         historyJson = data;
         displayHistory();
     });
 }
 
 function historyToHtml(){
-    console.log('generating history');
     var innerHTML = '';
     var iterations = historyJson.length <= maxIterations ? historyJson.length : maxIterations;
     for(let i=0; i<iterations; i++){
@@ -53,14 +42,9 @@ function historyToHtml(){
             '<td>' + historyJson[i].interfaceName + '</td>' +
         '</tr>';
     }
-    console.log('history generated');
     return innerHTML;
 }
 
 const displayHistory = function(){
-    console.log('Setting history...');
     $('#historyTable tbody').html(historyToHtml());
-    console.log('History set');
 }
-
-$(document).ready(loadHistory(defaultFrom, defaultTo));