From 6137d1c0d8643fdcdc1447f4f1099751dcfa9a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Fri, 23 Oct 2020 16:55:12 +0300 Subject: [PATCH] Removed duplicate flash/lightning icon --- apps/red-ui/src/app/icons/icons.module.ts | 2 +- .../project-listing-screen.component.html | 2 +- .../project-overview-screen.component.html | 2 +- .../project-overview-screen.component.ts | 43 ++++++++++--------- .../red-ui/src/assets/icons/general/flash.svg | 4 -- 5 files changed, 25 insertions(+), 28 deletions(-) delete mode 100644 apps/red-ui/src/assets/icons/general/flash.svg diff --git a/apps/red-ui/src/app/icons/icons.module.ts b/apps/red-ui/src/app/icons/icons.module.ts index cc91cb1a2..b492ecc2a 100644 --- a/apps/red-ui/src/app/icons/icons.module.ts +++ b/apps/red-ui/src/app/icons/icons.module.ts @@ -18,7 +18,7 @@ export class IconsModule { 'check', 'close', 'document', 'double-chevron-right', 'download', 'edit', 'error', 'folder', 'info', 'lightning', 'logout', 'menu', 'pages', 'plus', 'preview', 'refresh', 'report', 'secret', 'sort-asc', 'sort-desc', - 'status', 'trash', 'user', 'check-alt',"flash" + 'status', 'trash', 'user', 'check-alt', ]; for (const icon of icons) { diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html index b5c6bc238..71e3a2df3 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html @@ -74,7 +74,7 @@ {{pw.project.date | date:'mediumDate'}}
- + {{pw.project.dueDate | date:'mediumDate'}}
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html index bd97db018..0f6b49a6c 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html @@ -151,7 +151,7 @@ {{ appStateService.activeProject.project.date | date:'d MMM. yyyy' }}
- + {{appStateService.activeProject.project.dueDate | date:'mediumDate'}}
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts index 7c792c1f2..59efd5162 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts @@ -1,17 +1,17 @@ -import {Component, OnDestroy, OnInit} from '@angular/core'; -import {ActivatedRoute, Router} from '@angular/router'; -import {FileStatus, ReanalysisControllerService, StatusControllerService} from '@redaction/red-ui-http'; -import {NotificationService} from '../../notification/notification.service'; -import {AppStateService} from '../../state/app-state.service'; -import {FileDropOverlayService} from '../../upload/file-drop/service/file-drop-overlay.service'; -import {FileUploadModel} from '../../upload/model/file-upload.model'; -import {FileUploadService} from '../../upload/file-upload.service'; -import {UploadStatusOverlayService} from '../../upload/upload-status-dialog/service/upload-status-overlay.service'; -import {UserService} from '../../user/user.service'; -import {SortingOption} from '../../utils/types'; -import {DoughnutChartConfig} from '../../components/simple-doughnut-chart/simple-doughnut-chart.component'; -import {groupBy} from '../../utils/functions'; -import {DialogService} from '../../dialogs/dialog.service'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { FileStatus, ReanalysisControllerService, StatusControllerService } from '@redaction/red-ui-http'; +import { NotificationService } from '../../notification/notification.service'; +import { AppStateService } from '../../state/app-state.service'; +import { FileDropOverlayService } from '../../upload/file-drop/service/file-drop-overlay.service'; +import { FileUploadModel } from '../../upload/model/file-upload.model'; +import { FileUploadService } from '../../upload/file-upload.service'; +import { UploadStatusOverlayService } from '../../upload/upload-status-dialog/service/upload-status-overlay.service'; +import { UserService } from '../../user/user.service'; +import { SortingOption } from '../../utils/types'; +import { DoughnutChartConfig } from '../../components/simple-doughnut-chart/simple-doughnut-chart.component'; +import { groupBy } from '../../utils/functions'; +import { DialogService } from '../../dialogs/dialog.service'; @Component({ @@ -23,11 +23,11 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { private _selectedFileIds: string[] = []; public sortingOptions: SortingOption[] = [ - {label: 'project-overview.sorting.recent.label', order: 'desc', column: 'lastUpdated'}, - {label: 'project-overview.sorting.oldest.label', order: 'asc', column: 'lastUpdated'}, - {label: 'project-overview.sorting.alphabetically.label', order: 'asc', column: 'filename'}, - {label: 'project-overview.sorting.number-of-pages.label', order: 'asc', column: 'numberOfPages'}, - {label: 'project-overview.sorting.number-of-analyses.label', order: 'desc', column: 'numberOfAnalyses'} + { label: 'project-overview.sorting.recent.label', order: 'desc', column: 'lastUpdated' }, + { label: 'project-overview.sorting.oldest.label', order: 'asc', column: 'lastUpdated' }, + { label: 'project-overview.sorting.alphabetically.label', order: 'asc', column: 'filename' }, + { label: 'project-overview.sorting.number-of-pages.label', order: 'asc', column: 'numberOfPages' }, + { label: 'project-overview.sorting.number-of-analyses.label', order: 'desc', column: 'numberOfAnalyses' } ]; public sortingOption: SortingOption = this.sortingOptions[0]; public documentsChartData: DoughnutChartConfig[] = []; @@ -95,7 +95,7 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { const groups = groupBy(this.appStateService.activeProject.files, 'status'); this.documentsChartData = []; for (const key of Object.keys(groups)) { - this.documentsChartData.push({value: groups[key].length, color: key, label: key}); + this.documentsChartData.push({ value: groups[key].length, color: key, label: key }); } } @@ -118,7 +118,8 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { } public areAllFilesSelected() { - return this._selectedFileIds.length === this.appStateService.activeProject.files.length; + return this.appStateService.activeProject.files.length !== 0 && + this._selectedFileIds.length === this.appStateService.activeProject.files.length; } public isFileSelected(file: FileStatus) { diff --git a/apps/red-ui/src/assets/icons/general/flash.svg b/apps/red-ui/src/assets/icons/general/flash.svg deleted file mode 100644 index eb030e0ed..000000000 --- a/apps/red-ui/src/assets/icons/general/flash.svg +++ /dev/null @@ -1,4 +0,0 @@ - - -