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/06/02 09:53:57 UTC

[incubator-dlab] branch DLAB-1703 created (now 6c49cbc)

This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a change to branch DLAB-1703
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


      at 6c49cbc  [DLAB-1703]: Fixed billing on Safari

This branch includes the following new commits:

     new 6c49cbc  [DLAB-1703]: Fixed billing on Safari

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@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 01/01: [DLAB-1703]: Fixed billing on Safari

Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch DLAB-1703
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 6c49cbc6b4b8ce09e408977aab1ec5eeb0db8ba7
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Jun 2 12:52:46 2020 +0300

    [DLAB-1703]: Fixed billing on Safari
---
 .../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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org