Skip to content
Snippets Groups Projects
Verified Commit f3d4a04d authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #10742 TIME 0:10 show user deleted in visa circuit

parent 0e055b29
No related branches found
No related tags found
No related merge requests found
...@@ -13,15 +13,18 @@ ...@@ -13,15 +13,18 @@
<mat-list-item *ngFor="let diffusion of visaWorkflow;let i=index" [class.current]="diffusion.current"> <mat-list-item *ngFor="let diffusion of visaWorkflow;let i=index" [class.current]="diffusion.current">
<mat-icon *ngIf="diffusion.userPicture !== undefined" class="avatar" mat-list-icon color="primary" <mat-icon *ngIf="diffusion.userPicture !== undefined" class="avatar" mat-list-icon color="primary"
[style.background-image]="'url('+diffusion.userPicture+')'"></mat-icon> [style.background-image]="'url('+diffusion.userPicture+')'"></mat-icon>
<div *ngIf="diffusion.userPicture === undefined" mat-list-icon class="avatar"> <div *ngIf="diffusion.userPicture === undefined && diffusion.userDisplay !== ''" mat-list-icon class="avatar">
<mat-spinner diameter="50"></mat-spinner> <mat-spinner diameter="50"></mat-spinner>
</div> </div>
<p class="userSubstitute" mat-line *ngIf="diffusion.current && diffusion.userId !== signaturesService.userLogged.id"> <p class="userSubstitute" mat-line *ngIf="diffusion.current && diffusion.userId !== signaturesService.userLogged.id">
{{'lang.substituteMsg' | translate}} {{'lang.substituteMsg' | translate}}
</p> </p>
<h4 mat-line class="userDisplay primary"> <h4 mat-line *ngIf="diffusion.userDisplay != ''" class="userDisplay primary">
{{diffusion.userDisplay}} {{diffusion.userDisplay}}
</h4> </h4>
<p mat-line *ngIf="diffusion.userDisplay == ''" class="userDisplayDel red">
{{'lang.userDeleted' | translate}}
</p>
<p mat-line style="display: flex;"> <p mat-line style="display: flex;">
<span class="workflowData" style="text-align:left"> <span class="workflowData" style="text-align:left">
<span class="workflowSubData" *ngIf="diffusion.processDate == null && diffusion.current"> <span class="workflowSubData" *ngIf="diffusion.processDate == null && diffusion.current">
......
...@@ -22,6 +22,11 @@ ...@@ -22,6 +22,11 @@
font-size: 25px !important; font-size: 25px !important;
} }
.userDisplayDel {
font-style: italic;
font-size: 14px !important;
}
.workflowData { .workflowData {
flex: 1; flex: 1;
text-align: right; text-align: right;
......
...@@ -21,8 +21,9 @@ export class VisaWorkflowComponent implements OnInit { ...@@ -21,8 +21,9 @@ export class VisaWorkflowComponent implements OnInit {
constructor(public http: HttpClient, public signaturesService: SignaturesContentService) { } constructor(public http: HttpClient, public signaturesService: SignaturesContentService) { }
ngOnInit(): void { ngOnInit(): void {
console.log(this.visaWorkflow);
this.visaWorkflow.forEach((element: any) => { this.visaWorkflow.forEach((element: any) => {
if (element.userPicture === undefined ) { if (element.userPicture === undefined && element.userDisplay !== '') {
this.http.get('../rest/users/' + element.userId + '/picture') this.http.get('../rest/users/' + element.userId + '/picture')
.subscribe((data: any) => { .subscribe((data: any) => {
element.userPicture = data.picture; element.userPicture = data.picture;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment