From caed9228122b2b7587c943280e9772de50f66c31 Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+KrickRay@users.noreply.github.com> Date: Fri, 14 May 2021 18:37:30 +0300 Subject: [PATCH] FRONTEND-558: Responisve reports (#456) --- .../report-main-info.component.html | 12 +++++------- .../report-file/report-file.component.html | 4 ++-- .../report-file/report-file.component.scss | 5 +++++ .../report-files/report-files.component.html | 8 +++----- .../report-row-header.component.html | 15 ++++++++------- .../report-row/report-row.component.html | 10 +++++----- .../reports-search-filters.component.html | 9 ++++++--- .../reports/reports.component.html | 17 ++++++++++++----- .../indicators/status/status.component.scss | 1 + 9 files changed, 47 insertions(+), 34 deletions(-) diff --git a/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.html b/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.html index b3af87d5..9989050d 100644 --- a/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.html +++ b/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.html @@ -1,12 +1,10 @@ -
-
- +
+
+ {{ report.status | reportStatusName }} - {{ - report.reportType | reportTypeName - }} - {{ + {{ report.reportType | reportTypeName }} + {{ report.createdAt | date: 'dd MMMM yyyy, HH:mm:ss' }}
diff --git a/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.html b/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.html index 07f0ea77..b9743e3d 100644 --- a/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.html +++ b/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.html @@ -1,5 +1,5 @@ -
-
{{ file.filename }}
+
+
{{ file.filename }}
diff --git a/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.scss b/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.scss index 49bdd27d..b0928e95 100644 --- a/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.scss +++ b/src/app/sections/payment-section/reports/report-files/report-file/report-file.component.scss @@ -2,4 +2,9 @@ $dsh-report-file-height: 48px; .dsh-report-file { height: $dsh-report-file-height; + + &-name { + overflow: hidden; + text-overflow: ellipsis; + } } diff --git a/src/app/sections/payment-section/reports/report-files/report-files.component.html b/src/app/sections/payment-section/reports/report-files/report-files.component.html index 8032c797..77dd2193 100644 --- a/src/app/sections/payment-section/reports/report-files/report-files.component.html +++ b/src/app/sections/payment-section/reports/report-files/report-files.component.html @@ -1,11 +1,9 @@ -
-
+
+
{{ t('title') }}
-
- -
+
diff --git a/src/app/sections/payment-section/reports/reports-list/report-row-header/report-row-header.component.html b/src/app/sections/payment-section/reports/reports-list/report-row-header/report-row-header.component.html index 64ebc645..aaf069de 100644 --- a/src/app/sections/payment-section/reports/reports-list/report-row-header/report-row-header.component.html +++ b/src/app/sections/payment-section/reports/reports-list/report-row-header/report-row-header.component.html @@ -1,12 +1,13 @@ - {{ t('createdAt') }} - {{ t('status') }} - {{ t('type') }} - {{ t('period') }} + {{ t('createdAt') }} + {{ t('status') }} + {{ t('type') }} + {{ t('period') }} diff --git a/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.html b/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.html index 0f36060c..ca3829e5 100644 --- a/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.html +++ b/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.html @@ -1,12 +1,12 @@ - - + + {{ report.createdAt | date: 'dd MMMM yyyy, HH:mm' }} - + {{ report.status | reportStatusName }} - {{ report.reportType | reportTypeName }} - + {{ report.reportType | reportTypeName }} + {{ report.fromTime | date: 'dd MMMM yyyy' }} - {{ report.toTime | date: 'dd MMMM yyyy' }} diff --git a/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.html b/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.html index b2fe6099..29f49afc 100644 --- a/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.html +++ b/src/app/sections/payment-section/reports/reports-search-filters/reports-search-filters.component.html @@ -1,8 +1,11 @@
{{ t('dateRangeDescription') }}:

{{ r('title') }}

-
- +
+