From b13a995d26a32184279a47b8ada2a4602315d965 Mon Sep 17 00:00:00 2001 From: AndiMajore <andi.majore@googlemail.com> Date: Wed, 3 May 2023 19:50:59 +0200 Subject: [PATCH] updated view and task cards --- .../view-list/view-list.component.html | 15 +++++++-------- .../view-list/view-list.component.scss | 2 ++ .../components/task-list/task-list.component.html | 12 +++++++----- .../components/task-list/task-list.component.scss | 5 +++-- .../explorer-page/explorer-page.component.html | 4 ++-- src/app/services/analysis/analysis.service.ts | 1 + src/stylesheets/theme-styles.scss | 2 +- 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/app/components/analysis-panel/view-list/view-list.component.html b/src/app/components/analysis-panel/view-list/view-list.component.html index ad817043..b868d021 100644 --- a/src/app/components/analysis-panel/view-list/view-list.component.html +++ b/src/app/components/analysis-panel/view-list/view-list.component.html @@ -10,12 +10,10 @@ > <div *ngIf="task" - (click)="open(task.token)" - pTooltip="Show selection view" - [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" - tooltipPosition="top" > - <div class="columns mb-0"> + <div class="columns mb-0" (click)="open(task.token)" pTooltip="Show selection view" + [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" + tooltipPosition="top"> <div class="column is-8"> <span class="is-capitalized" ><app-fa-solid-icon @@ -24,8 +22,6 @@ Manual selection</span > </div> - <div class="column"> - </div> </div> <div class="columns mb-0"> <div class="column is-8 pt-0 pb-0"> @@ -33,8 +29,11 @@ </div> <div class="column pt-0 pb-0"> <a - (click)="analysis.removeTask(task)" + (click)="analysis.removeView(task.token)" class="has-text-danger is-pulled-right" + pTooltip="Delete view" + [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" + tooltipPosition="top" > <app-fa-solid-icon icon="trash"></app-fa-solid-icon> </a> diff --git a/src/app/components/analysis-panel/view-list/view-list.component.scss b/src/app/components/analysis-panel/view-list/view-list.component.scss index e69de29b..139597f9 100644 --- a/src/app/components/analysis-panel/view-list/view-list.component.scss +++ b/src/app/components/analysis-panel/view-list/view-list.component.scss @@ -0,0 +1,2 @@ + + diff --git a/src/app/components/task-list/task-list.component.html b/src/app/components/task-list/task-list.component.html index 8a45779a..ef5e2ab2 100644 --- a/src/app/components/task-list/task-list.component.html +++ b/src/app/components/task-list/task-list.component.html @@ -105,12 +105,11 @@ </div> <div *ngIf="task.info.done" - (click)="open(task.token)" - pTooltip="Show analysis results" - [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" - tooltipPosition="top" > - <div class="columns mb-0"> + <div class="columns mb-0" (click)="open(task.token)" + pTooltip="Show analysis results" + [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" + tooltipPosition="top"> <div class="column is-8"> <span class="is-capitalized" ><app-fa-solid-icon @@ -139,6 +138,9 @@ <a (click)="analysis.removeTask(task.token)" class="has-text-danger is-pulled-right" + pTooltip="Delete task" + [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" + tooltipPosition="top" > <app-fa-solid-icon icon="trash"></app-fa-solid-icon> </a> diff --git a/src/app/components/task-list/task-list.component.scss b/src/app/components/task-list/task-list.component.scss index 15694445..fb3bd11d 100644 --- a/src/app/components/task-list/task-list.component.scss +++ b/src/app/components/task-list/task-list.component.scss @@ -26,7 +26,8 @@ } .small-box { - margin: 0.5rem; - padding: 0.5rem; + //margin: 0.5rem; + //padding: 0.5rem; background-color: var(--drgstn-panel-secondary) !important; } + diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html index d2628a88..9919c622 100644 --- a/src/app/pages/explorer-page/explorer-page.component.html +++ b/src/app/pages/explorer-page/explorer-page.component.html @@ -530,7 +530,7 @@ </header> <div *ngIf="collapseViews"> <div - class="card-content overflow task-list-container" + class="overflow task-list-container" *ngIf="analysis.viewTokens && analysis.viewTokens.length > 0" > <app-view-list [(token)]="selectedViewToken"></app-view-list> @@ -579,7 +579,7 @@ </header> <div *ngIf="collapseTask"> <div - class="card-content overflow task-list-container" + class="overflow task-list-container" *ngIf="analysis.tasks && analysis.tasks.length > 0" > <app-task-list [(token)]="selectedAnalysisToken"></app-task-list> diff --git a/src/app/services/analysis/analysis.service.ts b/src/app/services/analysis/analysis.service.ts index 88a810ea..14fd10ab 100644 --- a/src/app/services/analysis/analysis.service.ts +++ b/src/app/services/analysis/analysis.service.ts @@ -132,6 +132,7 @@ export class AnalysisService { } removeTask(token) { + console.log(token) this.tokens = this.tokens.filter((item) => item !== token); this.finishedTokens = this.finishedTokens.filter((item) => item !== token); this.tasks = this.tasks.filter((item) => item.token !== (token)); diff --git a/src/stylesheets/theme-styles.scss b/src/stylesheets/theme-styles.scss index d227b714..215aa3ce 100644 --- a/src/stylesheets/theme-styles.scss +++ b/src/stylesheets/theme-styles.scss @@ -143,7 +143,7 @@ color: var(--drgstn-success) !important; } - app-task-list a, + app-task-list a, app-view-list a, a.card-header-icon { color: var(--drgstn-secondary) !important; } -- GitLab