Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-10 13:49:17 +01:00
Code Issues Projects Releases Wiki Activity

Added view fields to the query

Browse Source
This commit is contained in:
Risto Lahtela 2021-01-08 22:46:52 +02:00
parent 47b3921204
commit 80e5d797b5
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Plan/common/src/main/resources/assets/plan/web/js/query.js
View File

@ -4,6 +4,12 @@ let filterCount = 0;
id: "DOM id",
options...
}*/
const filterView = {
dateAfter: null,
timeAfter: null,
dateBefore: null,
timeBefore: null
};
const filterQuery = [];
class Filter {
@ -233,7 +239,7 @@ function setFilterOption(
isValidFunction,
correctionFunction
) {
const query = filterQuery.find(function (f) {
const query = id === 'view' ? filterView : filterQuery.find(function (f) {
return f.id === id;
});
const element = $(`#${elementId}`);
@ -257,7 +263,9 @@ function performQuery() {
query.push(filter.toObject());
}
jsonRequest(`./v1/query?q=${encodeURIComponent(JSON.stringify(query))}`, function (json, error) {
const encodedQuery = encodeURIComponent(JSON.stringify(query));
const encodedView = encodeURIComponent(JSON.stringify(filterView));
jsonRequest(`./v1/query?q=${encodedQuery}&view=${encodedView}`, function (json, error) {
console.log(filterQuery);
if (json) console.log(json);
if (error) console.error(error);

2
Plan/common/src/main/resources/assets/plan/web/js/sb-admin-2.js
View File

@ -19,7 +19,7 @@ function openTab(openIndex) {
const tabWidthPercent = -100 / tabCount;
const verticalScrollPercent = slideIndex * tabWidthPercent;
content.style.transition = "0.5s";
content.style.transform = "translate3d(" + verticalScrollPercent + "%,0px,0)";
content.style.transform = `translate3d(${verticalScrollPercent}%,0px,0)`;
}
function openPage() {

16
Plan/common/src/main/resources/assets/plan/web/query.html
View File

@ -93,7 +93,9 @@
<div class="input-group-text"><i class="far fa-calendar"></i></div>
</div>
<input class="form-control" id="viewFromDateField"
placeholder="31/12/2016" type="text">
onkeyup="setFilterOption('view', 'viewFromDateField', 'dateBefore', isValidDate, correctDate)"
placeholder="31/12/2016"
type="text">
</div>
</div>
<div class="col-2">
@ -103,7 +105,9 @@
<div class="input-group-text"><i class="far fa-clock"></i></div>
</div>
<input class="form-control" id="viewFromTimeField"
placeholder="23:59" type="text">
onkeyup="setFilterOption('view', 'viewFromTimeField', 'timeBefore', isValidTime, correctTime)"
placeholder="23:59"
type="text">
</div>
</div>
<div class="col-auto">
@ -115,7 +119,9 @@
<div class="input-group-text"><i class="far fa-calendar"></i></div>
</div>
<input class="form-control" id="viewToDateField"
placeholder="23/03/2020" type="text">
onkeyup="setFilterOption('view', 'viewToDateField', 'dateAfter', isValidDate, correctDate)"
placeholder="23/03/2020"
type="text">
</div>
</div>
<div class="col-2">
@ -124,7 +130,9 @@
<div class="input-group-text"><i class="far fa-clock"></i></div>
</div>
<input class="form-control" id="viewToTimeField"
placeholder="21:26" type="text">
onkeyup="setFilterOption('view', 'viewToTimeField', 'timeAfter', isValidTime, correctTime)"
placeholder="21:26"
type="text">
</div>
</div>
</div>