diff --git a/src/app/profile/dashboard/dashboard.component.html b/src/app/profile/dashboard/dashboard.component.html index fe4fd81c3231358975f02386e41bd456a6a6e332..b775b30009659fdadd2e93eeaa6330313b1b69c4 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 3c4e3afcc898eb58da7c8e424dc8e59f2798864b..3235dfa65a00fab7253517d002e33b54256eaa60 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 d86227e1e9b35b0d90a291eb252ceaec7288e102..b1fd7ac82d91a331ff9d1fd8f8e54055b848b40c 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 (