You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/03/20 09:28:20 UTC
[incubator-dlab] branch DLAB-1571 updated: Fixed small bugs
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1571
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1571 by this push:
new e726ab4 Fixed small bugs
new 4d17eb7 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
e726ab4 is described below
commit e726ab49e941771f602c8c5efaa8ce9ba5382fde
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Mar 20 11:27:50 2020 +0200
Fixed small bugs
---
.../reporting-grid/reporting-grid.component.html | 8 ++++----
.../reporting-grid/reporting-grid.component.scss | 15 +++++++++++----
.../src/app/reporting/toolbar/toolbar.component.html | 2 +-
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
index 78e3cda..0fb0fde 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
@@ -113,7 +113,7 @@
<ng-container matColumnDef="service">
<th mat-header-cell *matHeaderCellDef class="service">
- <span class="label"> Service </span>
+ <span class="label"> Product </span>
<button mat-icon-button aria-label="More" class="ar" (click)="toggleFilterRow()">
<i class="material-icons">
<span
@@ -123,8 +123,8 @@
</button>
</th>
<td mat-cell *matCellDef="let element">
- {{ element['service'] }}
- <span *ngIf="element.product">{{ element.product }}</span>
+ {{ element.product }}
+<!-- <span *ngIf="element.product">{{ element.product }}</span>-->
</td>
<td mat-footer-cell *matFooterCellDef class="table-footer"></td>
</ng-container>
@@ -137,7 +137,7 @@
<td mat-cell *matCellDef="let element">
{{ element.cost }} {{ element['currency'] }}
</td>
- <td mat-footer-cell *matFooterCellDef class="table-footer">
+ <td mat-footer-cell *matFooterCellDef class="table-footer total-cost">
Total <span *ngIf="reportData?.length"> {{ fullReport['total_cost'] }}
{{ fullReport['currency'] }}</span>
</td>
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
index 3b19ae7..bff6f6a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
@@ -101,9 +101,13 @@
min-width: 200px;
}
- .th_type {
+ .th_project{
width: 12%;
- min-width: 200px;
+ }
+
+ .th_type {
+ width: 10%;
+ min-width: 150px;
}
.th_status {
@@ -113,10 +117,9 @@
.th_charges {
width: 8%;
- min-width: 110px;
+ min-width: 140px;
padding-right: 15px;
text-align: right;
-
.label {
padding-top: 0;
}
@@ -184,6 +187,10 @@
border-top: 1px solid #E0E0E0;
transform: translateY(-1px);
border-bottom: none;
+ &.total-cost{
+ min-width: 140px;
+ padding-left: 0 !important;
+ }
}
@media screen and (max-width: 1280px) {
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html
index e79f3cb..583371e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html
@@ -19,7 +19,7 @@
<section class="toolbar">
<div class="info_color" *ngIf="reportData">
<div class="general">
- <div><span>Service base name: </span><strong>{{ reportData.service_base_name }}</strong></div>
+ <div><span>Service base name: </span><strong>{{ reportData.sbn }}</strong></div>
<div *ngIf="reportData.tag_resource_id"><span>Resource tag ID:
</span><strong>{{ reportData.tag_resource_id }}</strong></div>
<div class="report-period info_color" *ngIf="availablePeriodFrom && availablePeriodTo">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org