Skip to content
Snippets Groups Projects
Commit b13a995d authored by AndiMajore's avatar AndiMajore
Browse files

updated view and task cards

parent 2cb9b60d
No related branches found
No related tags found
No related merge requests found
...@@ -10,12 +10,10 @@ ...@@ -10,12 +10,10 @@
> >
<div <div
*ngIf="task" *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"> <div class="column is-8">
<span class="is-capitalized" <span class="is-capitalized"
><app-fa-solid-icon ><app-fa-solid-icon
...@@ -24,8 +22,6 @@ ...@@ -24,8 +22,6 @@
Manual selection</span Manual selection</span
> >
</div> </div>
<div class="column">
</div>
</div> </div>
<div class="columns mb-0"> <div class="columns mb-0">
<div class="column is-8 pt-0 pb-0"> <div class="column is-8 pt-0 pb-0">
...@@ -33,8 +29,11 @@ ...@@ -33,8 +29,11 @@
</div> </div>
<div class="column pt-0 pb-0"> <div class="column pt-0 pb-0">
<a <a
(click)="analysis.removeTask(task)" (click)="analysis.removeView(task.token)"
class="has-text-danger is-pulled-right" 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> <app-fa-solid-icon icon="trash"></app-fa-solid-icon>
</a> </a>
......
...@@ -105,12 +105,11 @@ ...@@ -105,12 +105,11 @@
</div> </div>
<div <div
*ngIf="task.info.done" *ngIf="task.info.done"
(click)="open(task.token)" >
<div class="columns mb-0" (click)="open(task.token)"
pTooltip="Show analysis results" pTooltip="Show analysis results"
[tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'"
tooltipPosition="top" tooltipPosition="top">
>
<div class="columns mb-0">
<div class="column is-8"> <div class="column is-8">
<span class="is-capitalized" <span class="is-capitalized"
><app-fa-solid-icon ><app-fa-solid-icon
...@@ -139,6 +138,9 @@ ...@@ -139,6 +138,9 @@
<a <a
(click)="analysis.removeTask(task.token)" (click)="analysis.removeTask(task.token)"
class="has-text-danger is-pulled-right" 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> <app-fa-solid-icon icon="trash"></app-fa-solid-icon>
</a> </a>
......
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
} }
.small-box { .small-box {
margin: 0.5rem; //margin: 0.5rem;
padding: 0.5rem; //padding: 0.5rem;
background-color: var(--drgstn-panel-secondary) !important; background-color: var(--drgstn-panel-secondary) !important;
} }
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
</header> </header>
<div *ngIf="collapseViews"> <div *ngIf="collapseViews">
<div <div
class="card-content overflow task-list-container" class="overflow task-list-container"
*ngIf="analysis.viewTokens && analysis.viewTokens.length > 0" *ngIf="analysis.viewTokens && analysis.viewTokens.length > 0"
> >
<app-view-list [(token)]="selectedViewToken"></app-view-list> <app-view-list [(token)]="selectedViewToken"></app-view-list>
...@@ -579,7 +579,7 @@ ...@@ -579,7 +579,7 @@
</header> </header>
<div *ngIf="collapseTask"> <div *ngIf="collapseTask">
<div <div
class="card-content overflow task-list-container" class="overflow task-list-container"
*ngIf="analysis.tasks && analysis.tasks.length > 0" *ngIf="analysis.tasks && analysis.tasks.length > 0"
> >
<app-task-list [(token)]="selectedAnalysisToken"></app-task-list> <app-task-list [(token)]="selectedAnalysisToken"></app-task-list>
......
...@@ -132,6 +132,7 @@ export class AnalysisService { ...@@ -132,6 +132,7 @@ export class AnalysisService {
} }
removeTask(token) { removeTask(token) {
console.log(token)
this.tokens = this.tokens.filter((item) => item !== token); this.tokens = this.tokens.filter((item) => item !== token);
this.finishedTokens = this.finishedTokens.filter((item) => item !== token); this.finishedTokens = this.finishedTokens.filter((item) => item !== token);
this.tasks = this.tasks.filter((item) => item.token !== (token)); this.tasks = this.tasks.filter((item) => item.token !== (token));
......
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
color: var(--drgstn-success) !important; color: var(--drgstn-success) !important;
} }
app-task-list a, app-task-list a, app-view-list a,
a.card-header-icon { a.card-header-icon {
color: var(--drgstn-secondary) !important; color: var(--drgstn-secondary) !important;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment