From 440801dde58bb905c0dd0b15bd7b8b7edc747197 Mon Sep 17 00:00:00 2001 From: Marlene Simondant <msimondant@grandlyon.com> Date: Tue, 18 Mar 2025 16:35:33 +0100 Subject: [PATCH] Hide action column is we are in the history --- src/app/profile/dashboard/dashboard.component.html | 2 ++ .../orientations-table/orientations-table.component.html | 5 +++-- .../orientations-table/orientations-table.component.ts | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/profile/dashboard/dashboard.component.html b/src/app/profile/dashboard/dashboard.component.html index fe4fd81c3..b775b3000 100644 --- a/src/app/profile/dashboard/dashboard.component.html +++ b/src/app/profile/dashboard/dashboard.component.html @@ -124,6 +124,7 @@ *ngIf="orientationsDashboard?.myOrientations.history.length > 0" [from]="'myOrientations'" [orientations]="orientationsDashboard?.myOrientations.history" + [history]="true" /> <!-- If there is no results --> <div *ngIf="orientationsDashboard?.myOrientations.history.length === 0" class="empty"> @@ -199,6 +200,7 @@ *ngIf="orientationsDashboard?.todoOrientations.history.length > 0" [from]="'todoOrientations'" [orientations]="orientationsDashboard?.todoOrientations.history" + [history]="true" /> <!-- If there is no results --> <div *ngIf="orientationsDashboard?.todoOrientations.history.length === 0" class="empty"> diff --git a/src/app/profile/dashboard/orientations-table/orientations-table.component.html b/src/app/profile/dashboard/orientations-table/orientations-table.component.html index 3c4e3afcc..3235dfa65 100644 --- a/src/app/profile/dashboard/orientations-table/orientations-table.component.html +++ b/src/app/profile/dashboard/orientations-table/orientations-table.component.html @@ -5,7 +5,8 @@ <div>Structure choisie</div> <div>Statut</div> <div *ngIf="from === 'myOrientations'">Type d'orientation</div> - <div *ngIf="from !== 'myOrientations'">Action</div> + <div *ngIf="from !== 'myOrientations' && !history">Action</div> + <div *ngIf="from !== 'myOrientations' && history"> </div> <div> </div> </div> <a @@ -107,7 +108,7 @@ [iconName]="this.orientationService.getTagProperty('type', orientation.accompanimentType, 'icon')" /> <app-tag-item - *ngIf="from !== 'myOrientations' && orientation.action" + *ngIf="from !== 'myOrientations' && orientation.action && !history" [label]="this.orientationService.getTagProperty('action', orientation.action, 'label')" [size]="'small'" [color]="this.orientationService.getTagProperty('action', orientation.action, 'color')" diff --git a/src/app/profile/dashboard/orientations-table/orientations-table.component.ts b/src/app/profile/dashboard/orientations-table/orientations-table.component.ts index d86227e1e..b1fd7ac82 100644 --- a/src/app/profile/dashboard/orientations-table/orientations-table.component.ts +++ b/src/app/profile/dashboard/orientations-table/orientations-table.component.ts @@ -15,6 +15,7 @@ export class OrientationsTableComponent { @Input() orientations: any[]; @Input() from: string; + @Input() history?: boolean; public isUrgent(orientation): boolean { return ( -- GitLab