diff --git a/src/frontend/app/visa/visa-workflow.component.html b/src/frontend/app/visa/visa-workflow.component.html index 96ea5dd31fb22fcecb18992298503aff54a367b5..a73098da0d319a8d75cab54bb5bcd1373a3a1af5 100644 --- a/src/frontend/app/visa/visa-workflow.component.html +++ b/src/frontend/app/visa/visa-workflow.component.html @@ -54,8 +54,8 @@ [cdkDragDisabled]="!adminMode || !functions.empty(diffusion.process_date)" [class.notDraggable]="!adminMode || !functions.empty(diffusion.process_date)" [class.notEditable]="!adminMode" - [class.processed]="diffusion.process_date != null && ['Circuit Interrompu','A terminé le circuit'].indexOf(diffusion.process_comment) === -1" - [class.interrupt]="diffusion.process_date != null && ['Circuit Interrompu','A terminé le circuit'].indexOf(diffusion.process_comment) > -1"> + [class.processed]="diffusion.process_date != null && [lang.visaWorkflowInterrupted, lang.hasInterruptedWorkflow].indexOf(diffusion.process_comment) === -1" + [class.interrupt]="diffusion.process_date != null && [lang.visaWorkflowInterrupted, lang.hasInterruptedWorkflow].indexOf(diffusion.process_comment) > -1"> <mat-icon *ngIf="getCurrentVisaUserIndex() === i && !adminMode" class="fa fa-chevron-right fa-2x" mat-list-icon color="accent"> </mat-icon> <mat-icon @@ -67,12 +67,12 @@ <mat-icon mat-list-icon class="fa-2x fa" [title]="diffusion.process_comment" [class.fa-hourglass]="diffusion.process_date == null" - [class.fa-thumbs-up]="diffusion.process_date != null && ['Circuit Interrompu','A terminé le circuit'].indexOf(diffusion.process_comment) === -1" - [class.fa-hand-paper]="diffusion.process_date != null && diffusion.process_comment === 'A terminé le circuit'" - [class.fa-times]="diffusion.process_date != null && diffusion.process_comment === 'Circuit Interrompu'" + [class.fa-thumbs-up]="diffusion.process_date != null && [lang.visaWorkflowInterrupted, lang.hasInterruptedWorkflow].indexOf(diffusion.process_comment) === -1" + [class.fa-hand-paper]="diffusion.process_date != null && diffusion.process_comment === lang.hasInterruptedWorkflow" + [class.fa-times]="diffusion.process_date != null && diffusion.process_comment === lang.visaWorkflowInterrupted" - [class.valid]="diffusion.process_date != null && ['Circuit Interrompu','A terminé le circuit'].indexOf(diffusion.process_comment) === -1" - [class.invalid]="diffusion.process_date != null && ['Circuit Interrompu','A terminé le circuit'].indexOf(diffusion.process_comment) > -1" + [class.valid]="diffusion.process_date != null && [lang.visaWorkflowInterrupted, lang.hasInterruptedWorkflow].indexOf(diffusion.process_comment) === -1" + [class.invalid]="diffusion.process_date != null && [lang.visaWorkflowInterrupted, lang.hasInterruptedWorkflow].indexOf(diffusion.process_comment) > -1" style="opacity:0.5;"></mat-icon> </ng-container> @@ -84,7 +84,7 @@ <div class="workflowLineSubLabel"> {{diffusion.item_entity}} </div> - <div *ngIf="diffusion.process_date != null && ['Circuit Interrompu','A terminé le circuit'].indexOf(diffusion.process_comment) === -1" class="workflowLineProcessDate" + <div *ngIf="diffusion.process_date != null && [lang.visaWorkflowInterrupted, lang.hasInterruptedWorkflow].indexOf(diffusion.process_comment) === -1" class="workflowLineProcessDate" title='{{diffusion.process_date | fullDate}}' color="accent">{{diffusion.requested_signature ? lang.signedUserDate : lang.approvedUserDate}} {{diffusion.process_date | timeAgo : 'full'}}</div> @@ -109,4 +109,4 @@ </mat-list> <div *ngIf="loading" style="display:flex;padding: 10px;"> <mat-spinner style="margin:auto;"></mat-spinner> -</div> \ No newline at end of file +</div> diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 5b5bf54a1ceca191314ef65f2f47060bb030517a..e9e39cd12ba12c1dfdec141f35a4fbf6c636f53e 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1393,6 +1393,8 @@ export const LANG_EN = { "modelSaved" : "Model saved", "visaWorkflowUpdated" : "Visa workflow updated", "visaWorkflowDeleted" : "Visa workflow deleted", + "visaWorkflowInterrupted" : "Interrupted workflow", + "hasInterruptedWorkflow" : "Has interrupted the workflow", "publicModel" : "Public model", "privateModel" : "Private model", "moveVisaUserErr1" : "You cannot move", diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index ae22ea5882c9057248276d8ef49e378a4c990468..78ddb665033d565c45c82f7222bda46b51159504 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1433,6 +1433,8 @@ export const LANG_FR = { "modelSaved" : "Modèle sauvegardé", "visaWorkflowUpdated" : "Circuit de visa modifié", "visaWorkflowDeleted" : "Circuit de visa supprimé", + "visaWorkflowInterrupted" : "Circuit interrompu", + "hasInterruptedWorkflow" : "A terminé le circuit", "publicModel" : "Modèle public", "privateModel" : "Modèle privé", "moveVisaUserErr1" : "Vous ne pouvez pas déplacer", diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index eda0d1f10e37adad37c139a5ccefc324c4687060..c6e7540e2d3aa696825d1d3a0691befe5391c70d 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1446,4 +1446,6 @@ export const LANG_NL = { "interrupted": "Interrupted", //_TO_TRANSLATE "addOpinionReason": "Please fill the opinion reason", //_TO_TRANSLATE "opinionLimitDate": "Opinion limit date", //_TO_TRANSLATE + "visaWorkflowInterrupted" : "Interrupted workflow",//_TO_TRANSLATE + "hasInterruptedWorkflow" : "Has interrupted the workflow",//_TO_TRANSLATE };