diff --git a/src/frontend/app/process/process.component.html b/src/frontend/app/process/process.component.html index b5ec5b245d31ef684afaf8aff17a4a638cf6e08f..f40ee6226771cde481a2cccd5359b346fc14b5cb 100644 --- a/src/frontend/app/process/process.component.html +++ b/src/frontend/app/process/process.component.html @@ -76,9 +76,9 @@ <app-diffusions-list *ngIf="currentTool === 'diffusionList' && !loading" #appDiffusionsList [adminMode]="false" [resId]="currentResourceInformations.resId" [expanded]="true"> </app-diffusions-list> - <app-visa-workflow *ngIf="currentTool === 'visa' && !loading" #appVisaWorkflow + <app-visa-workflow *ngIf="currentTool === 'visaCircuit' && !loading" #appVisaWorkflow [resId]="currentResourceInformations.resId" [adminMode]="privilegeService.hasCurrentUserPrivilege('config_visa_workflow')"></app-visa-workflow> - <app-avis-workflow *ngIf="currentTool === 'avis' && !loading" #appAvisWorkflow + <app-avis-workflow *ngIf="currentTool === 'opinionCircuit' && !loading" #appAvisWorkflow [resId]="currentResourceInformations.resId" [adminMode]="privilegeService.hasCurrentUserPrivilege('config_avis_workflow')"></app-avis-workflow> <app-attachments-list *ngIf="currentTool === 'attachments' && !loading" #appAttachmentsList [resId]="currentResourceInformations.resId" [target]="'process'" @@ -244,10 +244,10 @@ <app-diffusions-list *ngIf="modal.id === 'diffusionList' && !loading" #appDiffusionsList [adminMode]="false" [resId]="currentResourceInformations.resId" [expanded]="true"> </app-diffusions-list> - <app-visa-workflow *ngIf="modal.id === 'visa' && !loading" [adminMode]="privilegeService.hasCurrentUserPrivilege('config_visa_workflow')" #appVisaWorkflow + <app-visa-workflow *ngIf="modal.id === 'visaCircuit' && !loading" [adminMode]="privilegeService.hasCurrentUserPrivilege('config_visa_workflow')" #appVisaWorkflow [resId]="currentResourceInformations.resId" > </app-visa-workflow> - <app-avis-workflow *ngIf="modal.id === 'avis' && !loading" #appAvisWorkflow + <app-avis-workflow *ngIf="modal.id === 'opinionCircuit' && !loading" #appAvisWorkflow [resId]="currentResourceInformations.resId" [adminMode]="privilegeService.hasCurrentUserPrivilege('config_avis_workflow')"> </app-avis-workflow> <app-attachments-list *ngIf="modal.id === 'attachments' && !loading" #appAttachmentsList @@ -270,7 +270,7 @@ <mat-icon style="height:auto;font-size:20px;" class="fas fa-check"></mat-icon> </button> <button mat-fab [title]="lang.saveModifications" - *ngIf="appVisaWorkflow !== undefined && appVisaWorkflow.isModified() && modal.id === 'visa'" + *ngIf="appVisaWorkflow !== undefined && appVisaWorkflow.isModified() && modal.id === 'visaCircuit'" (click)="saveVisaWorkflow()" color="accent"> <mat-icon style="height:auto;font-size:20px;" class="fas fa-check"></mat-icon> </button> diff --git a/src/frontend/app/process/process.component.ts b/src/frontend/app/process/process.component.ts index 01474838c9eb5e8369ef5de503fc12208148eafe..ea224df339d3340927778c3912c765b30da1ae27 100755 --- a/src/frontend/app/process/process.component.ts +++ b/src/frontend/app/process/process.component.ts @@ -103,13 +103,13 @@ export class ProcessComponent implements OnInit { count: 0 }, { - id: 'visa', + id: 'visaCircuit', icon: 'fas fa-list-ol', label: this.lang.visaWorkflow, count: 0 }, { - id: 'avis', + id: 'opinionCircuit', icon: 'fas fa-comment-alt', label: this.lang.avis, count: 0 @@ -254,7 +254,7 @@ export class ProcessComponent implements OnInit { loadBadges() { this.processTool.forEach(element => { element.count = this.currentResourceInformations[element.id] !== undefined ? this.currentResourceInformations[element.id] : 0; - }); + }); } loadSenders() { @@ -500,9 +500,9 @@ export class ProcessComponent implements OnInit { return true; } else if (this.currentTool === 'diffusionList' && this.appDiffusionsList !== undefined && this.appDiffusionsList.isModified()) { return true; - } else if (this.currentTool === 'visa' && this.appVisaWorkflow !== undefined && this.appVisaWorkflow.isModified()) { + } else if (this.currentTool === 'visaCircuit' && this.appVisaWorkflow !== undefined && this.appVisaWorkflow.isModified()) { return true; - } else if (this.currentTool === 'avis' && this.appAvisWorkflow !== undefined && this.appAvisWorkflow.isModified()) { + } else if (this.currentTool === 'opinionCircuit' && this.appAvisWorkflow !== undefined && this.appAvisWorkflow.isModified()) { return true; } else { return false; @@ -522,9 +522,9 @@ export class ProcessComponent implements OnInit { this.indexingForm.saveData(this.currentUserId, this.currentGroupId, this.currentBasketId); } else if (this.currentTool === 'diffusionList' && this.appDiffusionsList !== undefined) { this.appDiffusionsList.saveListinstance(); - } else if (this.currentTool === 'visa' && this.appVisaWorkflow !== undefined) { + } else if (this.currentTool === 'visaCircuit' && this.appVisaWorkflow !== undefined) { this.appVisaWorkflow.saveVisaWorkflow(); - } else if (this.currentTool === 'avis' && this.appAvisWorkflow !== undefined) { + } else if (this.currentTool === 'opinionCircuit' && this.appAvisWorkflow !== undefined) { this.appAvisWorkflow.saveAvisWorkflow(); } } diff --git a/src/frontend/app/visa/visa-workflow.component.ts b/src/frontend/app/visa/visa-workflow.component.ts index 20f452be792b92def51355402418255967062e65..8d884b874b03f6afff111c4586187ec6c87d692b 100644 --- a/src/frontend/app/visa/visa-workflow.component.ts +++ b/src/frontend/app/visa/visa-workflow.component.ts @@ -324,8 +324,10 @@ export class VisaWorkflowComponent implements OnInit { this.getMaarchParapheurUserAvatar(item.externalId.maarchParapheur, this.visaWorkflow.items.length - 1); } } else if (item.type === 'user') { + + this.visaWorkflow.items.push({ - item_id: 0, + item_id: item.id, item_type: 'user', item_entity: item.entity, labelToDisplay: item.label,