From caccf3402de51a7d7304529fb0d2e5f2e20bcfc0 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Fri, 30 Oct 2020 11:11:31 +0100
Subject: [PATCH] FEAT #14949 TIME 0:25 fix css invalid user
---
src/frontend/app/visa/visa-workflow.component.html | 12 ++++++++----
src/frontend/app/visa/visa-workflow.component.scss | 7 +++++++
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/frontend/app/visa/visa-workflow.component.html b/src/frontend/app/visa/visa-workflow.component.html
index 6b060d1e13f..2688df32a3b 100755
--- a/src/frontend/app/visa/visa-workflow.component.html
+++ b/src/frontend/app/visa/visa-workflow.component.html
@@ -60,13 +60,17 @@
<mat-icon *ngIf="getCurrentVisaUserIndex() === i && (!adminMode || target === 'signatureBook')" class="fa fa-chevron-right fa-2x" mat-list-icon color="accent">
</mat-icon>
<mat-icon
- [ngClass]="{'fa fa-user fa-2x': functions.empty(diffusion.picture),'avatar': !functions.empty(diffusion.picture)}"
+ class="fa fa-2x"
+ [class.avatar]="!functions.empty(diffusion.picture)"
+ [class.fa-user]="functions.empty(diffusion.picture) && diffusion.isValid"
+ [class.fa-user-slash]="!diffusion.isValid"
+ [title]="!diffusion.isValid ? ('lang.userNotValid' | translate) : ''"
mat-list-icon color="primary"
[class.invalid]="!diffusion.hasPrivilege || !diffusion.isValid"
[style.background-image]="!functions.empty(diffusion.picture) ? 'url('+diffusion.picture+')' : ''" style="position: relative;">
<i *ngIf="!functions.empty(diffusion.process_comment)" class="far fa-comment-dots commentBubble" [matTooltip]="diffusion.process_comment"></i>
</mat-icon>
- <ng-container *ngIf="!adminMode || diffusion.process_date != null">
+ <ng-container *ngIf="(!adminMode || diffusion.process_date != null) && diffusion.isValid">
<mat-icon mat-list-icon class="fa-2x fa"
[title]="diffusion.process_comment !== null ? diffusion.process_comment : ''"
[class.fa-hourglass]="diffusion.process_date == null"
@@ -92,7 +96,7 @@
<div class="workflowLineSubLabel" [class.unauthorized]="!diffusion.hasPrivilege || !diffusion.isValid">
{{diffusion.item_entity}}
</div>
- <div class="workflowLineSubLabel" *ngIf="(showComment && ((!linkedToMaarchParapheur && adminMode && functions.empty(diffusion.process_date)) || (!linkedToMaarchParapheur && getCurrentVisaUserIndex() === i && !functions.empty(diffusion.process_comment)))) && diffusion.hasPrivilege">
+ <div class="workflowLineSubLabel" *ngIf="(showComment && ((!linkedToMaarchParapheur && adminMode && functions.empty(diffusion.process_date)) || (!linkedToMaarchParapheur && getCurrentVisaUserIndex() === i && !functions.empty(diffusion.process_comment)))) && diffusion.hasPrivilege && diffusion.isValid">
<mat-form-field>
<input matInput class="comment" maxlength="255" [disabled]="!adminMode || diffusion.process_date != null ||Â (target === 'signatureBook' && getCurrentVisaUserIndex() === i)" [placeholder]="this.translate.instant('lang.visaNote')" [(ngModel)]="diffusion.process_comment">
</mat-form-field>
@@ -114,7 +118,7 @@
<div *ngIf="!diffusion.hasPrivilege" class="invalid">
{{'lang.noPrivileges' | translate}}
</div>
- <div *ngIf="!diffusion.isValid" class="invalid">
+ <div *ngIf="!diffusion.isValid" class="invalid invalidMsg">
{{'lang.userNotValid' | translate}}
</div>
</div>
diff --git a/src/frontend/app/visa/visa-workflow.component.scss b/src/frontend/app/visa/visa-workflow.component.scss
index 63603117300..0d52d78e800 100644
--- a/src/frontend/app/visa/visa-workflow.component.scss
+++ b/src/frontend/app/visa/visa-workflow.component.scss
@@ -168,3 +168,10 @@
color: $warn;
text-decoration: line-through;
}
+
+.invalidMsg {
+ opacity: 0.5;
+ width: 150px;
+ white-space: break-spaces;
+ text-align: center;
+}
\ No newline at end of file
--
GitLab