You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2020/12/07 16:39:54 UTC
[incubator-datalab] branch DATALAB-2151 created (now 5b0ecbd)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DATALAB-2151
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at 5b0ecbd [DATALAB-2151]: Fixed calendar and sticky footer on Safari browser
This branch includes the following new commits:
new 5b0ecbd [DATALAB-2151]: Fixed calendar and sticky footer on Safari browser
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: [DATALAB-2151]: Fixed calendar and
sticky footer on Safari browser
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2151
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 5b0ecbd80cd36080ce801b06a8a2ce15f997ee17
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Dec 7 18:39:10 2020 +0200
[DATALAB-2151]: Fixed calendar and sticky footer on Safari browser
---
.../audit/audit-grid/audit-grid.component.scss | 1 +
.../reporting-grid/reporting-grid.component.scss | 2 ++
.../reporting-grid/reporting-grid.component.ts | 41 ++++++++++++++++++++++
.../resources/webapp/src/assets/styles/_theme.scss | 7 +++-
4 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
index f21a152..836bd7d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
@@ -103,6 +103,7 @@
th {
padding: 5px;
font-size: 13px;
+ z-index: 103 !important;
}
.filter-field {
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss
index ebdafb0..2699cd4 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss
@@ -92,6 +92,8 @@
th {
padding: 5px;
font-size: 13px;
+ z-index: 103 !important;
+
}
.filter-field {
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
index c555c45..d11c9aa 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
@@ -93,6 +93,7 @@ export class ReportingGridComponent implements OnInit {
this.tableEl = this.table._elementRef.nativeElement;
}, 1000);
this.checkFilters();
+ // this.compareFilters();
}
onUpdate($event): void {
@@ -106,6 +107,46 @@ export class ReportingGridComponent implements OnInit {
.filter(v => this.filteredReportData[v] && this.filteredReportData[v].length > 0).length > 0;
}
+ // compareFilters() {
+ // const previousData = {
+ // datalabId: '',
+ // date_end: '',
+ // date_start: '',
+ // locale: undefined,
+ // products: [],
+ // projects: [],
+ // resource_type: [1],
+ // shapes: [],
+ // statuses: [],
+ // users: [],
+ // };
+ //
+ // const currentData = {
+ // datalabId: '',
+ // date_end: '',
+ // date_start: '',
+ // locale: undefined,
+ // products: [],
+ // projects: [],
+ // resource_type: [],
+ // shapes: [],
+ // statuses: [],
+ // users: [],
+ // };
+ //
+ // console.log(Object.keys(currentData).every(el => {
+ // if (Array.isArray(el)) {
+ // if (previousData[el].length !== currentData[el].length) {
+ // return true;
+ // } else {
+ // return false;
+ // }
+ // } else {
+ // return previousData[el] !== currentData[el];
+ // }
+ // }));
+ // }
+
refreshData(fullReport, report) {
this.reportData = [...report];
this.fullReport = fullReport;
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index ec8fee0..fc3887c 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -847,6 +847,7 @@ mat-progress-bar {
#range-picker {
display: flex;
justify-content: center;
+ z-index: 120;
}
#range-picker path#Shape {
@@ -872,6 +873,10 @@ mat-progress-bar {
&.is-to:after {
left: 250px;
}
+
+ &.is-opened{
+ display: flex;
+ }
}
#range-picker .ng-daterangepicker .calendar::after {
@@ -1007,7 +1012,7 @@ mat-progress-bar {
.billing-page-wrapper{
tfoot{
position: sticky;
- z-index: 1;
+ z-index: 102;
bottom: 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org