Strolch
/
strolch-wc-reports
mirror of https://github.com/strolch-li/strolch-wc-reports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Fixed small details

This commit is contained in:
Robert von Burg 2021-09-07 15:18:17 +02:00
parent 4ea59e1309
commit 1cda2ed87d
3 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -1,7 +1,7 @@
{ {
"name": "strolch-wc-reports", "name": "strolch-wc-reports",
"description": "Strolch WebComponent Reports", "description": "Strolch WebComponent Reports",
"version": "0.3.1", "version": "0.3.2",
"authors": [ "authors": [
"Robert von Burg" "Robert von Burg"
], ],

2
strolch-wc-reports-facet.html
View File

@ -252,7 +252,7 @@
if (newValue != null && oldValue != null) { if (newValue != null && oldValue != null) {
this.$.ajaxGetFields.params = { this.$.ajaxGetFields.params = {
query: newValue, query: newValue,
limit: this.facetLimit limit: 10
}; };
this.$.ajaxGetFields.generateRequest(); this.$.ajaxGetFields.generateRequest();
} }

61
strolch-wc-reports.html
View File

@ -34,7 +34,7 @@
@media screen { @media screen {
:host { :host {
--box-space: 12px; --box-space: 12px;
--facet-width-opened: 300px; --facet-width-opened: 350px;
--facet-width-closed: 22px; --facet-width-closed: 22px;
--facet-width: var(--facet-width-opened); --facet-width: var(--facet-width-opened);
--table-width: calc(100vw - var(--facet-width) - 30px); --table-width: calc(100vw - var(--facet-width) - 30px);
@ -60,7 +60,7 @@
#actionBar { #actionBar {
@apply(--layout-horizontal); @apply(--layout-horizontal);
width: 100%; width: calc(100vw - 30px);
padding: 0 12px; padding: 0 12px;
background-color: white; background-color: white;
} }
@ -116,10 +116,12 @@
flex-shrink: 0; flex-shrink: 0;
margin-left: 10px; margin-left: 10px;
margin-right: calc(var(--box-space) * 0.5); margin-right: calc(var(--box-space) * 0.5);
height: calc(100vh - 140px);
overflow: auto;
} }
strolch-wc-reports-facet { strolch-wc-reports-facet {
width: 300px; width: calc(var(--facet-width) - 20px);
} }
#facetContainer > strolch-wc-reports-facet:not(:last-of-type) { #facetContainer > strolch-wc-reports-facet:not(:last-of-type) {
@ -131,7 +133,7 @@
} }
strolch-wc-reports-table { strolch-wc-reports-table {
height: calc(100vh - 190px); height: calc(100vh - 195px);
width: var(--table-width); width: var(--table-width);
} }
@ -223,6 +225,10 @@
.limitBtn { .limitBtn {
min-width: inherit; min-width: inherit;
} }
.bold {
font-weight: bold;
}
} }
</style> </style>
@ -354,12 +360,15 @@
data="[[data]]"></strolch-wc-reports-table> data="[[data]]"></strolch-wc-reports-table>
<template is="dom-if" if="[[arrayFilled(data.rows)]]"> <template is="dom-if" if="[[data]]">
<div class="footer noprint"> <div class="footer noprint">
<div> <div>
<paper-button class="limitBtn" on-tap="setLimit">25</paper-button> <paper-button class$="[[getLimitBtnClass(25, data.limit)]]" on-tap="setLimit">25
<paper-button class="limitBtn" on-tap="setLimit">50</paper-button> </paper-button>
<paper-button class="limitBtn" on-tap="setLimit">100</paper-button> <paper-button class$="[[getLimitBtnClass(50, data.limit)]]" on-tap="setLimit">50
</paper-button>
<paper-button class$="[[getLimitBtnClass(100, data.limit)]]" on-tap="setLimit">100
</paper-button>
</div> </div>
<div> <div>
<div class="g-center"> <div class="g-center">
@ -373,7 +382,7 @@
</div> </div>
</div> </div>
<div> <div>
<p>[[localize('duration')]] [[data.duration]]</p> <p>[[localize('duration')]] [[data.duration]] / [[_getParallel(data.parallel)]]</p>
</div> </div>
</div> </div>
</template> </template>
@ -490,6 +499,12 @@
}, },
/* Computations */ /* Computations */
getLimitBtnClass: function (expected, actual) {
return expected !== actual ? "limitBtn" : "limitBtn bold";
},
_getParallel: function (parallel) {
return parallel === true ? "p" : "s"
},
/* Observers */ /* Observers */
observers: [ observers: [
@ -616,12 +631,11 @@
}, },
_getEnd: function (data) { _getEnd: function (data) {
if (this._hasNext(data)) return data.nextOffset; return data == null || data.rows == null ? 0 : data.offset + data.rows.length;
return data == null ? 0 : data.size;
}, },
_getSize: function (data) { _getSize: function (data) {
return data == null || data.size >= 2147483647 ? this.localize('unknown') : data.size; return data == null || data.size >= 2147483625 ? this.localize('unknown') : data.size;
}, },
_toFirstPage: function () { _toFirstPage: function () {
@ -633,27 +647,29 @@
this.queryReports(); this.queryReports();
}, },
_toNextPage: function () { _toNextPage: function () {
if (this.data.size >= 2147483647) { if (this.data.rows.length < this.data.limit)
this.offset = this.data.offset + this.data.limit; return;
} else { this.offset = this.data.offset + this.data.limit;
this.offset = this.data.nextOffset;
}
this.queryReports(); this.queryReports();
}, },
_toLastPage: function () { _toLastPage: function () {
if (this.data.lastOffset >= 2147483625)
return;
this.offset = this.data.lastOffset; this.offset = this.data.lastOffset;
this.queryReports(); this.queryReports();
}, },
setLimit: function (evt) { setLimit: function (evt) {
this.limit = Number.parseInt(evt.target.textContent.trim()); this.limit = Number.parseInt(evt.target.textContent.trim());
this.offset = 0;
this.queryReports(); this.queryReports();
}, },
filtersChanged: function (newValue) { filtersChanged: function (newValue) {
if (newValue != null) if (newValue != null) {
this.offset = 0;
this.queryReports(); this.queryReports();
}
}, },
queryReports: function () { queryReports: function () {
@ -703,15 +719,18 @@
// clear the previous view // clear the previous view
var restampTemplate = this.$.restampTemplate; var restampTemplate = this.$.restampTemplate;
restampTemplate.if = false; restampTemplate.if = false;
this.filtersReady = false;
this.data = null;
this.offset = 0;
this.allFilters = []; this.allFilters = [];
this.facets = []; this.facets = [];
// set the new report id // set the new report id
this.filtersReady = false;
var reportId = this.reports[this.selectedReportIndex].id; var reportId = this.reports[this.selectedReportIndex].id;
this.reportId = reportId; this.reportId = reportId;
this.$.ajaxGetFacets.params = { this.$.ajaxGetFacets.params = {
limit: this.facetLimit limit: 10
}; };
this.$.ajaxGetFacets.generateRequest(); this.$.ajaxGetFacets.generateRequest();
Strolch.setQueryParamValue("reportId", reportId); Strolch.setQueryParamValue("reportId", reportId);