diff --git a/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts b/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts index 2ab98c0912de5cc76d7bab3b2719894b6d7caff8..9d0a3ddaa6e10e03385911202eb324c9640a92e4 100755 --- a/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts +++ b/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts @@ -108,7 +108,7 @@ export class DiffusionModelAdministrationComponent implements OnInit { const item = { id: this.diffusionModel.id, type: 'entity' - } + }; setTimeout(async () => { this.appVisaWorkflow.resetWorkflow(); @@ -122,7 +122,7 @@ export class DiffusionModelAdministrationComponent implements OnInit { const item = { id: this.diffusionModel.id, type: 'entity' - } + }; setTimeout(async () => { this.appAvisWorkflow.resetWorkflow(); await this.appAvisWorkflow.addItemToWorkflow(item); diff --git a/src/frontend/app/avis/avis-workflow.component.ts b/src/frontend/app/avis/avis-workflow.component.ts index 4ed7b31407ddbe30d6b9b8b58902ba69a0fc0776..0d50a4f258a4d783fceeab35a36014f0a85327b1 100644 --- a/src/frontend/app/avis/avis-workflow.component.ts +++ b/src/frontend/app/avis/avis-workflow.component.ts @@ -4,7 +4,7 @@ import { LANG } from '../translate.component'; import { NotificationService } from '../notification.service'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { FunctionsService } from '../../service/functions.service'; -import { tap, exhaustMap, map, startWith, catchError, finalize, filter, debounceTime, switchMap } from 'rxjs/operators'; +import { tap, exhaustMap, map, startWith, catchError, finalize, filter } from 'rxjs/operators'; import { FormControl } from '@angular/forms'; import { LatinisePipe } from 'ngx-pipes'; import { Observable, of } from 'rxjs'; @@ -317,7 +317,7 @@ export class AvisWorkflowComponent implements OnInit { difflist_type: 'entity_id' }); }); - this.avisWorkflowClone = JSON.parse(JSON.stringify(this.avisWorkflow.items)) + this.avisWorkflowClone = JSON.parse(JSON.stringify(this.avisWorkflow.items)); this.loading = false; resolve(true); }, (err: any) => { @@ -458,7 +458,7 @@ export class AvisWorkflowComponent implements OnInit { this.http.get(`../../rest/listTemplates/${item.id}`).pipe( tap((data: any) => { this.avisWorkflow.items = this.avisWorkflow.items.concat( - data.listTemplate.items.map((itemTemplate: any) => { + data.listTemplate.items.filter((itemTemplate: any) => itemTemplate.hasPrivilege === true).map((itemTemplate: any) => { return { item_id: itemTemplate.item_id, item_type: 'user', @@ -483,11 +483,7 @@ export class AvisWorkflowComponent implements OnInit { } emptyWorkflow() { - if (this.avisWorkflow.items.length === 0) { - return true; - } else { - return false; - } + return this.avisWorkflow.items.length === 0; } workflowEnd() { diff --git a/src/frontend/app/visa/visa-workflow.component.scss b/src/frontend/app/visa/visa-workflow.component.scss index 84ae8441a865a0459acd8ea3a2bf31e090eb2145..a62b4f809831bd8259569e61816c9ed9bb9f2cfe 100644 --- a/src/frontend/app/visa/visa-workflow.component.scss +++ b/src/frontend/app/visa/visa-workflow.component.scss @@ -162,4 +162,4 @@ .comment:disabled { color: black; -} \ No newline at end of file +} diff --git a/src/frontend/app/visa/visa-workflow.component.ts b/src/frontend/app/visa/visa-workflow.component.ts index 588e8424f231f6ba280493e12b6950d686d625b4..468b721264e24124f3a83b99f181c773df7e4bfc 100644 --- a/src/frontend/app/visa/visa-workflow.component.ts +++ b/src/frontend/app/visa/visa-workflow.component.ts @@ -4,7 +4,7 @@ import { LANG } from '../translate.component'; import { NotificationService } from '../notification.service'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { FunctionsService } from '../../service/functions.service'; -import { tap, exhaustMap, map, startWith, catchError, finalize, filter, debounceTime, switchMap } from 'rxjs/operators'; +import { tap, exhaustMap, map, startWith, catchError, finalize, filter } from 'rxjs/operators'; import { FormControl } from '@angular/forms'; import { LatinisePipe } from 'ngx-pipes'; import { Observable, of } from 'rxjs'; @@ -12,8 +12,6 @@ import { MatDialog } from '@angular/material'; import { AddVisaModelModalComponent } from './addVisaModel/add-visa-model-modal.component'; import { ConfirmComponent } from '../../plugins/modal/confirm.component'; -declare function $j(selector: any): any; - @Component({ selector: 'app-visa-workflow', templateUrl: 'visa-workflow.component.html', @@ -107,8 +105,6 @@ export class VisaWorkflowComponent implements OnInit { resolve(true); }); }); - - } loadVisaSignUsersList() {