Skip to content
Snippets Groups Projects
Commit 440801dd authored by Marlène SIMONDANT's avatar Marlène SIMONDANT
Browse files

Hide action column is we are in the history

parent 05d5e60c
Branches
Tags
2 merge requests!993Notif,!983feat(dashboard) : create dashboard !
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
*ngIf="orientationsDashboard?.myOrientations.history.length > 0" *ngIf="orientationsDashboard?.myOrientations.history.length > 0"
[from]="'myOrientations'" [from]="'myOrientations'"
[orientations]="orientationsDashboard?.myOrientations.history" [orientations]="orientationsDashboard?.myOrientations.history"
[history]="true"
/> />
<!-- If there is no results --> <!-- If there is no results -->
<div *ngIf="orientationsDashboard?.myOrientations.history.length === 0" class="empty"> <div *ngIf="orientationsDashboard?.myOrientations.history.length === 0" class="empty">
...@@ -199,6 +200,7 @@ ...@@ -199,6 +200,7 @@
*ngIf="orientationsDashboard?.todoOrientations.history.length > 0" *ngIf="orientationsDashboard?.todoOrientations.history.length > 0"
[from]="'todoOrientations'" [from]="'todoOrientations'"
[orientations]="orientationsDashboard?.todoOrientations.history" [orientations]="orientationsDashboard?.todoOrientations.history"
[history]="true"
/> />
<!-- If there is no results --> <!-- If there is no results -->
<div *ngIf="orientationsDashboard?.todoOrientations.history.length === 0" class="empty"> <div *ngIf="orientationsDashboard?.todoOrientations.history.length === 0" class="empty">
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<div>Structure choisie</div> <div>Structure choisie</div>
<div>Statut</div> <div>Statut</div>
<div *ngIf="from === 'myOrientations'">Type d'orientation</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">&nbsp;</div>
<div>&nbsp;</div> <div>&nbsp;</div>
</div> </div>
<a <a
...@@ -107,7 +108,7 @@ ...@@ -107,7 +108,7 @@
[iconName]="this.orientationService.getTagProperty('type', orientation.accompanimentType, 'icon')" [iconName]="this.orientationService.getTagProperty('type', orientation.accompanimentType, 'icon')"
/> />
<app-tag-item <app-tag-item
*ngIf="from !== 'myOrientations' && orientation.action" *ngIf="from !== 'myOrientations' && orientation.action && !history"
[label]="this.orientationService.getTagProperty('action', orientation.action, 'label')" [label]="this.orientationService.getTagProperty('action', orientation.action, 'label')"
[size]="'small'" [size]="'small'"
[color]="this.orientationService.getTagProperty('action', orientation.action, 'color')" [color]="this.orientationService.getTagProperty('action', orientation.action, 'color')"
......
...@@ -15,6 +15,7 @@ export class OrientationsTableComponent { ...@@ -15,6 +15,7 @@ export class OrientationsTableComponent {
@Input() orientations: any[]; @Input() orientations: any[];
@Input() from: string; @Input() from: string;
@Input() history?: boolean;
public isUrgent(orientation): boolean { public isUrgent(orientation): boolean {
return ( return (
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment