This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 2020dc2 [DLAB-1703]: Fixed billing on Safari (#776)
2020dc2 is described below
commit 2020dc23ea5fbb6e3865094f7aa73472c5730e9b
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Tue Jun 2 12:54:36 2020 +0300
[DLAB-1703]: Fixed billing on Safari (#776)
---
.../resources/webapp/src/app/reporting/toolbar/toolbar.component.html | 4 ++--
.../resources/webapp/src/app/reporting/toolbar/toolbar.component.ts | 4 ++--
.../cost-details-dialog/cost-details-dialog.component.html | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
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 583371e..eb47510 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
@@ -24,8 +24,8 @@
</span><strong>{{ reportData.tag_resource_id }}</strong></div>
<div class="report-period info_color" *ngIf="availablePeriodFrom &&
availablePeriodTo">
<span>Available reporting period from:</span>
- <strong>{{ availablePeriodFrom | date }} </strong>
- to: <strong>{{ availablePeriodTo | date }}</strong>
+ <strong>{{ availablePeriodFrom.join('/') | date }} </strong>
+ to: <strong>{{ availablePeriodTo.join('/') | date }}</strong>
</div>
</div>
</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.ts
index 5272e37..d550d76 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.ts
@@ -35,8 +35,8 @@ export class ToolbarComponent implements OnInit,
AfterViewInit {
readonly DICTIONARY = DICTIONARY;
value: any;
reportData: any;
- availablePeriodFrom: string;
- availablePeriodTo: string;
+ availablePeriodFrom: [];
+ availablePeriodTo: [];
subscriptions: Subscription = new Subscription();
healthStatus: GeneralEnvironmentStatus;
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html
index 1331f5f..17fe71a 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html
@@ -50,8 +50,8 @@
</div>
<div class="service">{{ item.product }}</div>
<!-- <div class="resource-type" >{{ item.resourse_type
}}</div>-->
- <div class="usage-date-start">{{ item.from | date }}</div>
- <div class="usage-date-end">{{ item.to | date }}</div>
+ <div class="usage-date-start">{{ item.from.join('/') | date
}}</div>
+ <div class="usage-date-end">{{ item.to.join('/') | date
}}</div>
<div class="cost-currency">{{ item.cost }} {{ item.currency
}}</div>
</mat-list-item>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
