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

T139 History search displayed

Browse Source
This commit is contained in:
Gabriel Modzelewski
2021-03-18 14:41:36 +01:00
parent 927a18b694
commit a1ff300c8c
6 changed files with 140 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/resources/static/css/main.css
View File

@@ -279,9 +279,13 @@ input:focus {
} }
#historyFunction { #historyFunction {
margin-top: 30px; margin-top: 10px;
margin-bottom: 30px; margin-bottom: 30px;
width: 670px; width: 670px;
display: none;
}
#historyFunction.active {
display: flex; display: flex;
align-content: space-between; align-content: space-between;
} }
@@ -302,4 +306,23 @@ input:focus {
margin-right: 15px; 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;
}

17
src/main/resources/static/html/mock.html
View File

@@ -91,6 +91,7 @@
</table> </table>
</div> </div>
<div id="history" style="display:none;"> <div id="history" style="display:none;">
<button id="historyFilterSwitch">>Filters</button>
<div id="historyFunction"> <div id="historyFunction">
<div> <div>
<label for="historyFrom">From</label> <label for="historyFrom">From</label>
@@ -112,22 +113,6 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr>
<td>2020-02-02 10:56:23</td>
<td>Request received</td>
</tr>
<tr>
<td>2020-02-02 10:56:23</td>
<td>Request received</td>
</tr>
<tr>
<td>2020-02-02 10:56:23</td>
<td>Request received</td>
</tr>
<tr>
<td>2020-02-02 10:56:23</td>
<td>Request received</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>

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

@@ -1,8 +1,30 @@
var historyJson = {}; 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 searchHistory(){ function filterHistory(){
var dateFrom = $('#historyFrom').val(); var dateFrom = $('#historyFrom').val();
var dateTo = $('#historyTo').val(); var dateTo = $('#historyTo').val();
loadHistory(dateFrom, dateTo);
}
const startSearch = function(){
filterHistory();
}
$('#btn-searchHistory').click(startSearch);
const filterSwitch = function(){
$('#historyFunction').toggleClass("active");
}
$('#historyFilterSwitch').click(filterSwitch);
function loadHistory(dateFrom, dateTo){
console.log('Request send for history data')
var eventRequest = { var eventRequest = {
clientUUID : json[jsonIndex].clientUUID, clientUUID : json[jsonIndex].clientUUID,
localDateTimeFrom : dateFrom, localDateTimeFrom : dateFrom,
@@ -15,12 +37,30 @@ function searchHistory(){
data: JSON.stringify(eventRequest, null, 2), data: JSON.stringify(eventRequest, null, 2),
contentType: "application/json" contentType: "application/json"
}).done(function(data){ }).done(function(data){
console.log(data); // TODO: Add display function
historyJson = data; historyJson = data;
displayHistory();
}); });
} }
const startSearch = function(){ function historyToHtml(){
searchHistory(); console.log('generating history');
var innerHTML = '';
var iterations = historyJson.length <= maxIterations ? historyJson.length : maxIterations;
for(let i=0; i<iterations; i++){
innerHTML += '<tr>' +
'<td>' + historyJson[i].dateTimeStamp + '</td>' +
'<td>' + historyJson[i].interfaceName + '</td>' +
'</tr>';
}
console.log('history generated');
return innerHTML;
} }
$('#btn-searchHistory').click(startSearch);
const displayHistory = function(){
console.log('Setting history...');
$('#historyTable tbody').html(historyToHtml());
console.log('History set');
}
$(document).ready(loadHistory(defaultFrom, defaultTo));

25
target/classes/static/css/main.css
View File

@@ -279,9 +279,13 @@ input:focus {
} }
#historyFunction { #historyFunction {
margin-top: 30px; margin-top: 10px;
margin-bottom: 30px; margin-bottom: 30px;
width: 670px; width: 670px;
display: none;
}
#historyFunction.active {
display: flex; display: flex;
align-content: space-between; align-content: space-between;
} }
@@ -302,4 +306,23 @@ input:focus {
margin-right: 15px; 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;
}

17
target/classes/static/html/mock.html
View File

@@ -91,6 +91,7 @@
</table> </table>
</div> </div>
<div id="history" style="display:none;"> <div id="history" style="display:none;">
<button id="historyFilterSwitch">>Filters</button>
<div id="historyFunction"> <div id="historyFunction">
<div> <div>
<label for="historyFrom">From</label> <label for="historyFrom">From</label>
@@ -112,22 +113,6 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr>
<td>2020-02-02 10:56:23</td>
<td>Request received</td>
</tr>
<tr>
<td>2020-02-02 10:56:23</td>
<td>Request received</td>
</tr>
<tr>
<td>2020-02-02 10:56:23</td>
<td>Request received</td>
</tr>
<tr>
<td>2020-02-02 10:56:23</td>
<td>Request received</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>

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

@@ -1,8 +1,30 @@
var historyJson = {}; 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 searchHistory(){ function filterHistory(){
var dateFrom = $('#historyFrom').val(); var dateFrom = $('#historyFrom').val();
var dateTo = $('#historyTo').val(); var dateTo = $('#historyTo').val();
loadHistory(dateFrom, dateTo);
}
const startSearch = function(){
filterHistory();
}
$('#btn-searchHistory').click(startSearch);
const filterSwitch = function(){
$('#historyFunction').toggleClass("active");
}
$('#historyFilterSwitch').click(filterSwitch);
function loadHistory(dateFrom, dateTo){
console.log('Request send for history data')
var eventRequest = { var eventRequest = {
clientUUID : json[jsonIndex].clientUUID, clientUUID : json[jsonIndex].clientUUID,
localDateTimeFrom : dateFrom, localDateTimeFrom : dateFrom,
@@ -15,12 +37,30 @@ function searchHistory(){
data: JSON.stringify(eventRequest, null, 2), data: JSON.stringify(eventRequest, null, 2),
contentType: "application/json" contentType: "application/json"
}).done(function(data){ }).done(function(data){
console.log(data); // TODO: Add display function
historyJson = data; historyJson = data;
displayHistory();
}); });
} }
const startSearch = function(){ function historyToHtml(){
searchHistory(); console.log('generating history');
var innerHTML = '';
var iterations = historyJson.length <= maxIterations ? historyJson.length : maxIterations;
for(let i=0; i<iterations; i++){
innerHTML += '<tr>' +
'<td>' + historyJson[i].dateTimeStamp + '</td>' +
'<td>' + historyJson[i].interfaceName + '</td>' +
'</tr>';
}
console.log('history generated');
return innerHTML;
} }
$('#btn-searchHistory').click(startSearch);
const displayHistory = function(){
console.log('Setting history...');
$('#historyTable tbody').html(historyToHtml());
console.log('History set');
}
$(document).ready(loadHistory(defaultFrom, defaultTo));