This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1943 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 68ca7cea4ac2634e9762894db627f9eb3defaa94 Author: Dmytro_Gnatyshyn <[email protected]> AuthorDate: Sat Jul 18 10:05:39 2020 +0300 [DLAB-1943]: Changed date picker size --- .../audit-toolbar/audit-toolbar.component.scss | 27 ++++++++++++++++++---- .../audit/audit-toolbar/audit-toolbar.component.ts | 24 +++++++++++++++++-- .../reporting/toolbar/toolbar.component.scss | 15 ++++++------ 3 files changed, 53 insertions(+), 13 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.scss index 744bfdc..50fdda3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.scss @@ -95,7 +95,9 @@ section.toolbar { #range-picker .ng-daterangepicker .calendar .side-container .side-button.is-active, #range-picker .ng-daterangepicker .input-section .label-txt { color: #35afd5; -} + display: unset; + font-size: 13px; + } #range-picker .ng-daterangepicker .calendar .calendar-container .day-num.is-active, #range-picker .ng-daterangepicker .calendar .calendar-container .days .day-num:hover { @@ -124,6 +126,8 @@ section.toolbar { #range-picker .ng-daterangepicker .input-section .value-txt { color: #718ba6; + display: unset; + padding-left: 5px; } #range-picker .ng-daterangepicker .input-section .value-txt.untouched, @@ -132,9 +136,24 @@ section.toolbar { } #range-picker .ng-daterangepicker .input-section .value-txt.untouched::after { - content: 'Select date'; + content: 'date'; position: absolute; - top: 22px; - left: 34px; + top: 9px; + left: 61px; color: #718ba6; } + +#range-picker .ng-daterangepicker { + height: 37px; + width: 350px; + + .d-none{ + display: none; + } + + .input-section { + height: 37px; + padding-right: 30px; + } + +} diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts index cc4933e..3e14abe 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts @@ -68,6 +68,14 @@ export class AuditToolbarComponent implements OnInit, AfterViewInit { // this.subscriptions.add(this.healthStatusService.statusData.pipe(skip(1)).subscribe(result => { // this.healthStatus = result; // })); + const rangeLabels = <NodeListOf<Element>>document.querySelectorAll('.value-txt'); + const labels = <NodeListOf<Element>>document.querySelectorAll('.label-txt'); + const addedText = document.createTextNode('From date'); + labels[0].innerHTML = 'From date'; + labels[1].innerHTML = 'To date'; + for (let label = 0; label < rangeLabels.length; ++label) { + rangeLabels[label].classList.add('d-none'); + } } ngAfterViewInit() { @@ -76,14 +84,20 @@ export class AuditToolbarComponent implements OnInit, AfterViewInit { setDateRange() { const availableRange = JSON.parse(localStorage.getItem('report_period')); - + const rangeLabels = <NodeListOf<Element>>document.querySelectorAll('.value-txt'); + for (let label = 0; label < rangeLabels.length; ++label) { + rangeLabels[label].classList.remove('d-none'); + console.log('remove'); + } this.availablePeriodFrom = availableRange.start_date; this.availablePeriodTo = availableRange.end_date; } clearRangePicker(): void { const rangeLabels = <NodeListOf<Element>>document.querySelectorAll('.value-txt'); - + for (let label = 0; label < rangeLabels.length; ++label) { + rangeLabels[label].classList.add('d-none'); + } for (let label = 0; label < rangeLabels.length; ++label) rangeLabels[label].classList.add('untouched'); } @@ -94,8 +108,14 @@ export class AuditToolbarComponent implements OnInit, AfterViewInit { for (let label = 0; label < rangeLabels.length; ++label) if (rangeLabels[label].classList.contains('untouched')) { rangeLabels[label].classList.remove('untouched'); + rangeLabels[label].classList.remove('d-none'); } + + const labels = <NodeListOf<Element>>document.querySelectorAll('.label-txt'); + labels[0].innerHTML = 'From:'; + labels[1].innerHTML = 'To:'; + const reportDateRange = dateRange.split('-'); this.setRangeOption.emit({ start_date: reportDateRange[0].split('/').join('-'), diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.scss index 4a150bf..0eabe23 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.scss @@ -94,6 +94,7 @@ section.toolbar { #range-picker .ng-daterangepicker .calendar .side-container .side-button.is-active, #range-picker .ng-daterangepicker .input-section .label-txt { + display: unset; color: #35afd5; } @@ -131,10 +132,10 @@ section.toolbar { color: #fff; } -#range-picker .ng-daterangepicker .input-section .value-txt.untouched::after { - content: 'Select date'; - position: absolute; - top: 22px; - left: 34px; - color: #718ba6; -} +//#range-picker .ng-daterangepicker .input-section .value-txt.untouched::after { +// content: 'date'; +// position: absolute; +// top: 22px; +// left: 34px; +// color: #718ba6; +//} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
