diff --git a/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html b/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html
index 8b1d8832b21573ca1b5928a26c26ede4b24771a8..e3354ef0fc273cd415fd8ab9e5e3f27a8507cddd 100755
--- a/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html
+++ b/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html
@@ -14,13 +14,10 @@
</div>
</div>
<mat-tab-group>
- <mat-tab *ngIf="data.action.keyword == 'redirect'||data.action.keyword == 'indexing'">
+ <mat-tab *ngIf="data.action.keyword == 'redirect'">
<ng-template mat-tab-label *ngIf="data.action.keyword == 'redirect'">
{{lang.redirects}}
</ng-template>
- <ng-template mat-tab-label *ngIf="data.action.keyword == 'indexing'">
- {{lang.indexing}}
- </ng-template>
<mat-accordion>
<mat-expansion-panel (opened)="initService()">
<mat-expansion-panel-header>
@@ -33,34 +30,6 @@
</mat-form-field>
<div id="jstree"></div>
</mat-expansion-panel>
- <mat-expansion-panel *ngIf="data.action.keyword == 'indexing'" [disabled]="data.action.id_status != '_NOSTATUS_'">
- <mat-expansion-panel-header>
- <mat-panel-title>
- {{lang.toStatuses}}
- <mat-icon *ngIf="data.action.id_status != '_NOSTATUS_'" color="warn"
- class="fa fa-exclamation-circle" matTooltip="{{lang.toStatusesDesc}}" style="cursor:help"></mat-icon>
- </mat-panel-title>
-
- </mat-expansion-panel-header>
- <mat-form-field class="example-chip-list">
- <mat-chip-list #chipList class="mat-chip-list-stacked">
- <mat-chip *ngFor="let status of selectedStatuses;let i = index" selectable="true" removable="true" (removed)="remove(i)"
- style="cursor:pointer;margin:5px;border-radius:0px;display:flex;">
- <b>{{i+1}})</b> {{status.idToDisplay}}
- <span style="flex: 1 1 auto;"></span>
- <mat-icon matChipRemove class="fa fa-times"></mat-icon>
- </mat-chip>
- <input placeholder="{{lang.availableStatuses}}" #statusInput [formControl]="statusCtrl" [matAutocomplete]="auto" [matChipInputFor]="chipList"
- style="flex: 1 0 0px;width: 100%;">
- </mat-chip-list>
- <mat-autocomplete #auto="matAutocomplete">
- <mat-option *ngFor="let status of filteredStatuses | async" [value]="status.id" (click)="add(status)">
- {{status.idToDisplay}}
- </mat-option>
- </mat-autocomplete>
- </mat-form-field>
-
- </mat-expansion-panel>
<mat-expansion-panel (opened)="initService2()" *ngIf="data.action.keyword == 'redirect'">
<mat-expansion-panel-header>
<mat-panel-title>
diff --git a/src/frontend/app/administration/basket/basket-administration.component.ts b/src/frontend/app/administration/basket/basket-administration.component.ts
index 16318c34840f6d4d9f063d42c6e8d9e78a2d0000..5341b9aee3aca9736b49ea32c7ec932a161b7181 100755
--- a/src/frontend/app/administration/basket/basket-administration.component.ts
+++ b/src/frontend/app/administration/basket/basket-administration.component.ts
@@ -5,7 +5,6 @@ import { MatPaginator, MatTableDataSource, MatSort, MatDialog, MatDialogRef, MAT
import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service';
import { HeaderService } from '../../../service/header.service';
-import { AutoCompletePlugin } from '../../../plugins/autocomplete.plugin';
import { FormControl } from '@angular/forms';
import { AppService } from '../../../service/app.service';
@@ -339,16 +338,12 @@ export class BasketAdministrationComponent implements OnInit {
templateUrl: "basket-administration-settings-modal.component.html",
styles: [".mat-dialog-content{height: 65vh;}"]
})
-export class BasketAdministrationSettingsModalComponent extends AutoCompletePlugin {
+export class BasketAdministrationSettingsModalComponent {
lang: any = LANG;
allEntities: any[] = [];
- statuses: any;
- selectedStatuses: any[] = [];
- statusCtrl = new FormControl();
constructor(public http: HttpClient, @Inject(MAT_DIALOG_DATA) public data: any, public dialogRef: MatDialogRef<BasketAdministrationSettingsModalComponent>) {
- super(http, ['statuses']);
}
@ViewChild('statusInput') statusInput: ElementRef;
@@ -423,36 +418,6 @@ export class BasketAdministrationSettingsModalComponent extends AutoCompletePlug
}, () => {
location.href = "index.php";
});
- this.http.get(this.coreUrl + 'rest/statuses')
- .subscribe((response: any) => {
- this.statuses = response.statuses;
- response.statuses.forEach((status: any) => {
- if (this.data.action.statuses.indexOf(status.id) > -1) {
- this.selectedStatuses[this.data.action.statuses.indexOf(status.id)] = { idToDisplay: status.label_status, id: status.id };
- }
- });
- });
- }
-
- remove(index: number): void {
- this.selectedStatuses.splice(index, 1);
- this.statusCtrl.setValue(null);
- this.statusInput.nativeElement.value = '';
- }
-
- add(status: any): void {
- let isIn = false;
-
- this.selectedStatuses.forEach((statusList: any) => {
- if (status.id == statusList.id) {
- isIn = true;
- }
- });
- if (!isIn) {
- this.selectedStatuses.push(status);
- this.statusCtrl.setValue(null);
- this.statusInput.nativeElement.value = '';
- }
}
initService() {
@@ -578,10 +543,6 @@ export class BasketAdministrationSettingsModalComponent extends AutoCompletePlug
}
saveSettings() {
- this.data.action.statuses = [];
- this.selectedStatuses.forEach((status: any) => {
- this.data.action.statuses.push(status.id);
- });
this.dialogRef.close(this.data);
}
}
diff --git a/src/frontend/app/administration/basket/list/list-administration.component.html b/src/frontend/app/administration/basket/list/list-administration.component.html
index 1cf9025d86b6520920ad2cce6ca8bbdecdd94d1f..af56f06c41f6a1c3bc6afec6330d4ef35a420838 100644
--- a/src/frontend/app/administration/basket/list/list-administration.component.html
+++ b/src/frontend/app/administration/basket/list/list-administration.component.html
@@ -1,17 +1,27 @@
+<mat-form-field>
+ <mat-label>Ouverture la page</mat-label>
+ <mat-select [(ngModel)]="selectedListEvent">
+ <mat-option *ngFor="let event of listEvent" [value]="event.value">
+ {{lang[event.id]}}
+ </mat-option>
+ </mat-select>
+</mat-form-field>
<mat-toolbar class="editorTool">
<span>
- <button color="primary" *ngIf="displayMode=='label'" mat-icon-button (click)="toggleData()" title="{{lang.preview}}">
+ <button color="primary" *ngIf="displayMode=='label'" mat-icon-button (click)="toggleData()"
+ title="{{lang.preview}}">
<mat-icon fontSet="fas" fontIcon="fa-eye"></mat-icon>
</button>
- <button color="primary" *ngIf="displayMode=='sample'" mat-icon-button (click)="toggleData()" title="{{lang.edition}}">
+ <button color="primary" *ngIf="displayMode=='sample'" mat-icon-button (click)="toggleData()"
+ title="{{lang.edition}}">
<mat-icon fontSet="fas" fontIcon="fa-edit"></mat-icon>
</button>
</span>
<span class="area">
<form>
<mat-form-field appearance="outline" floatLabel="never">
- <input id="availableData" name="availableData" type="text" matInput [formControl]="dataControl" placeholder="{{lang.availableDatas}}"
- [matAutocomplete]="auto">
+ <input id="availableData" name="availableData" type="text" matInput [formControl]="dataControl"
+ placeholder="{{lang.availableDatas}}" [matAutocomplete]="auto">
<mat-autocomplete #auto="matAutocomplete" (optionSelected)="addData($event)">
<mat-option *ngFor="let item of filteredDataOptions | async" [value]="item" class="dataList">
<span class="dataIcon">
@@ -26,7 +36,8 @@
</form>
</span>
<span>
- <button color="warn" mat-button (click)="removeAllData()" style="float:right;" [disabled]="displayMode=='sample'">
+ <button color="warn" mat-button (click)="removeAllData()" style="float:right;"
+ [disabled]="displayMode=='sample'">
{{lang.eraseAll}}
</button>
</span>
@@ -41,28 +52,38 @@
</button>
<mat-menu #menu="matMenu">
<button mat-menu-item (click)="removeData(item,itData)">
- <mat-icon class="secondaryInformations_icon" color="warn" fontSet="fas" fontIcon="fa-trash fa-2x"></mat-icon>
+ <mat-icon class="secondaryInformations_icon" color="warn" fontSet="fas"
+ fontIcon="fa-trash fa-2x"></mat-icon>
<span>{{lang.delete}}</span>
</button>
<mat-divider></mat-divider>
- <button [class.isSelectedMenu]="item.cssClasses.indexOf('boldFontData') > -1" mat-menu-item (click)="setStyle(item,'boldFontData')">
+ <button [class.isSelectedMenu]="item.cssClasses.indexOf('boldFontData') > -1" mat-menu-item
+ (click)="setStyle(item,'boldFontData')">
<mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-bold fa-2x"></mat-icon>
<span>{{lang.fontBold}}</span>
</button>
- <button [class.isSelectedMenu]="item.cssClasses.indexOf('align_leftData') > -1" mat-menu-item (click)="setStyle(item,'align_leftData')">
- <mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-align-left fa-2x"></mat-icon>
+ <button [class.isSelectedMenu]="item.cssClasses.indexOf('align_leftData') > -1" mat-menu-item
+ (click)="setStyle(item,'align_leftData')">
+ <mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-align-left fa-2x">
+ </mat-icon>
<span>{{lang.alignLeft}}</span>
</button>
- <button [class.isSelectedMenu]="item.cssClasses.indexOf('align_centerData') > -1" mat-menu-item (click)="setStyle(item,'align_centerData')">
- <mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-align-center fa-2x"></mat-icon>
+ <button [class.isSelectedMenu]="item.cssClasses.indexOf('align_centerData') > -1" mat-menu-item
+ (click)="setStyle(item,'align_centerData')">
+ <mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-align-center fa-2x">
+ </mat-icon>
<span>{{lang.alignCenter}}</span>
</button>
- <button [class.isSelectedMenu]="item.cssClasses.indexOf('align_rightData') > -1" mat-menu-item (click)="setStyle(item,'align_rightData')">
- <mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-align-right fa-2x"></mat-icon>
+ <button [class.isSelectedMenu]="item.cssClasses.indexOf('align_rightData') > -1" mat-menu-item
+ (click)="setStyle(item,'align_rightData')">
+ <mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-align-right fa-2x">
+ </mat-icon>
<span>{{lang.alignRight}}</span>
</button>
- <button [class.isSelectedMenu]="item.cssClasses.indexOf('bigFontData') > -1" mat-menu-item (click)="setStyle(item,'bigFontData')">
- <mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-text-height fa-2x"></mat-icon>
+ <button [class.isSelectedMenu]="item.cssClasses.indexOf('bigFontData') > -1" mat-menu-item
+ (click)="setStyle(item,'bigFontData')">
+ <mat-icon class="secondaryInformations_icon" fontSet="fas" fontIcon="fa-text-height fa-2x">
+ </mat-icon>
<span>{{lang.fontBig}}</span>
</button>
</mat-menu>
@@ -77,7 +98,8 @@
<span class="resultCol" *ngFor="let item of displayedMainData;let i=index" [class]="item.cssClasses.join(' ')">
<span *ngIf="i == 0">
<mat-icon *ngIf="displayMode=='label'" color="primary" class="fm fm-letter fm-2x"></mat-icon>
- <mat-icon *ngIf="displayMode=='sample'" color="warn" class="fm fm-letter-status-inprogress fm-2x"></mat-icon><br />
+ <mat-icon *ngIf="displayMode=='sample'" color="warn" class="fm fm-letter-status-inprogress fm-2x">
+ </mat-icon><br />
<span class="resultCol_chrono">{{item[displayMode]}}</span>
</span>
<span *ngIf="i == 1">
@@ -86,10 +108,12 @@
</span>
<mat-button-toggle-group class="actions" multiple>
<button color="primary" mat-icon-button title="{{lang.notes}}" [disabled]="displayMode == 'label'">
- <mat-icon [matBadgeHidden]="displayMode == 'label'" fontSet="fas" matBadge="2" fontIcon="fa-comments fa-2x"></mat-icon>
+ <mat-icon [matBadgeHidden]="displayMode == 'label'" fontSet="fas" matBadge="2"
+ fontIcon="fa-comments fa-2x"></mat-icon>
</button>
<button color="primary" mat-icon-button title="{{lang.attachments}}" [disabled]="displayMode == 'label'">
- <mat-icon [matBadgeHidden]="displayMode == 'label'" fontSet="fas" matBadge="7" fontIcon="fa-paperclip fa-2x"></mat-icon>
+ <mat-icon [matBadgeHidden]="displayMode == 'label'" fontSet="fas" matBadge="7"
+ fontIcon="fa-paperclip fa-2x"></mat-icon>
</button>
<button color="primary" mat-icon-button title="{{lang.diffusionList}}" [disabled]="displayMode == 'label'">
<mat-icon fontSet="fas" fontIcon="fa-sitemap fa-2x"></mat-icon>
diff --git a/src/frontend/app/administration/basket/list/list-administration.component.ts b/src/frontend/app/administration/basket/list/list-administration.component.ts
index 2cd2daa4b8f96919df176554837d0e93ebcddbeb..4332e78fd836275a659f634c2311dfd7861276dd 100644
--- a/src/frontend/app/administration/basket/list/list-administration.component.ts
+++ b/src/frontend/app/administration/basket/list/list-administration.component.ts
@@ -129,6 +129,26 @@ export class ListAdministrationComponent implements OnInit {
displayMode: string = 'label';
dataControl = new FormControl();
filteredDataOptions: Observable<string[]>;
+ listEvent: any[] = [
+ {
+ id: 'noEventList',
+ value: 'noEvent'
+ },
+ {
+ id: 'eventVisaMail',
+ value: 'visaMail'
+ },
+ {
+ id: 'eventProcessDoc',
+ value: 'processDoc'
+ },
+ {
+ id: 'eventViewDoc',
+ value: 'viewDoc'
+ }
+ ];
+ selectedListEvent: string = null;
+ selectedListEventClone: string = null;
@Input('currentBasketGroup') private basketGroup: any;
@@ -150,6 +170,8 @@ export class ListAdministrationComponent implements OnInit {
this.displayedSecondaryData.push(this.availableData[indexData]);
this.availableData.splice(indexData, 1);
});
+ this.selectedListEvent = this.basketGroup.list_event === null ? 'noEvent' : this.basketGroup.list_event;
+ this.selectedListEventClone = this.selectedListEvent;
this.displayedSecondaryDataClone = JSON.parse(JSON.stringify(this.displayedSecondaryData));
}
@@ -216,6 +238,7 @@ export class ListAdministrationComponent implements OnInit {
}
saveTemplate() {
+ this.selectedListEvent = this.selectedListEvent === 'noEvent' ? null : this.selectedListEvent;
let template: any = [];
this.displayedSecondaryData.forEach((element: any) => {
template.push(
@@ -227,10 +250,13 @@ export class ListAdministrationComponent implements OnInit {
);
});
- this.http.put("../../rest/baskets/" + this.basketGroup.basket_id + "/groups/" + this.basketGroup.group_id, { 'list_display': template })
+ this.http.put("../../rest/baskets/" + this.basketGroup.basket_id + "/groups/" + this.basketGroup.group_id, { 'list_display': template, 'list_event': this.selectedListEvent })
.subscribe(() => {
this.displayedSecondaryDataClone = JSON.parse(JSON.stringify(this.displayedSecondaryData));
this.basketGroup.list_display = template;
+ this.selectedListEvent = this.selectedListEvent === null ? 'noEvent' : this.selectedListEvent;
+ this.basketGroup.list_event = this.selectedListEvent;
+ this.selectedListEventClone = this.selectedListEvent;
this.notify.success(this.lang.resultPageUpdated);
}, (err) => {
this.notify.error(err.error.errors);
@@ -249,7 +275,7 @@ export class ListAdministrationComponent implements OnInit {
}
checkModif() {
- if (JSON.stringify(this.displayedSecondaryData) === JSON.stringify(this.displayedSecondaryDataClone)) {
+ if (JSON.stringify(this.displayedSecondaryData) === JSON.stringify(this.displayedSecondaryDataClone) && this.selectedListEvent === this.selectedListEventClone) {
return true
} else {
return false;
@@ -258,6 +284,7 @@ export class ListAdministrationComponent implements OnInit {
cancelModification() {
this.displayedSecondaryData = JSON.parse(JSON.stringify(this.displayedSecondaryDataClone));
+ this.selectedListEvent = this.selectedListEventClone;
this.availableData = JSON.parse(JSON.stringify(this.availableDataClone));
let indexData: number = 0;
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index b27230532ffc6269f3010ba29b7c5688670fb6a3..84afaf501a54bc43ecff4639b9dd16465c5dd15d 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1080,4 +1080,8 @@ export const LANG_FR = {
"keywordAdded" : "Mot-clé ajouté",
"keywordDeleted" : "Mot-clé supprimé",
"actionsInfo" : "Seule les actions avec \"confirmation simple\" et \"clôturer un courrier\" seront affichés",
+ "noEventList" : "Ne rien faire",
+ "eventVisaMail" : "Parapheur",
+ "eventProcessDoc" : "Fiche de traitement",
+ "eventViewDoc" : "Visionneuse de document",
};
\ No newline at end of file
diff --git a/src/frontend/plugins/autocomplete.plugin.ts b/src/frontend/plugins/autocomplete.plugin.ts
deleted file mode 100755
index 3faedd86cbb9437d201065bcda43597f7c4159bb..0000000000000000000000000000000000000000
--- a/src/frontend/plugins/autocomplete.plugin.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { ActivatedRoute, Router } from '@angular/router';
-import { FormControl } from '@angular/forms';
-import { Observable, empty } from 'rxjs';
-import { startWith, map, debounceTime, filter, distinctUntilChanged, switchMap } from 'rxjs/operators';
-import { validateConfig } from '@angular/router/src/config';
-
-declare const angularGlobals: any;
-
-export class AutoCompletePlugin {
- coreUrl: string;
- userCtrl: FormControl;
- visaUserCtrl: FormControl;
- statusCtrl: FormControl;
- elementCtrl: FormControl;
- filteredVisaUsers: Observable<any[]>;
- filteredUsers: Observable<any[]>;
- filteredElements: Observable<any[]>;
- filteredStatuses: Observable<any[]>;
- visaUserList: any[] = [];
- userList: any[] = [];
- elemList: any[] = [];
- statusesList: any[] = [];
-
- constructor(public http: HttpClient, target: any[]) {
- this.coreUrl = angularGlobals.coreUrl;
-
- if (target.indexOf('users') != -1) {
- this.userCtrl = new FormControl();
- this.userCtrl.valueChanges.pipe(
- debounceTime(300),
- filter(value => value ? value.length > 2 : false),
- distinctUntilChanged(),
- switchMap(data => this.http.get(this.coreUrl + 'rest/autocomplete/users', { params: { "search": data } }))
- ).subscribe((response: any) => {
- this.filteredUsers = this.userCtrl.valueChanges
- .pipe(
- startWith(''),
- map(user => user ? this.autocompleteFilterUser(user) : response.slice())
- );
- });
- }
- if (target.indexOf('adminUsers') != -1) {
- this.userCtrl = new FormControl();
- this.userCtrl.valueChanges.pipe(
- debounceTime(300),
- filter(value => value.length > 2),
- distinctUntilChanged(),
- switchMap(data => this.http.get(this.coreUrl + 'rest/autocomplete/users/administration', { params: { "search": data } }))
- ).subscribe((response: any) => {
- this.filteredUsers = this.userCtrl.valueChanges
- .pipe(
- startWith(''),
- map(user => user ? this.autocompleteFilterUser(user) : response.slice())
- );
- });
- }
-
- if (target.indexOf('signatureBookUsers') != -1) {
- this.userCtrl = new FormControl();
- this.userCtrl.valueChanges.pipe(
- debounceTime(300),
- filter(value => value ? value.length > 2 : false),
- distinctUntilChanged(),
- switchMap(data => this.http.get(this.coreUrl + 'rest/autocomplete/maarchParapheurUsers', { params: { "search": data } }))
- ).subscribe((response: any) => {
- this.filteredUsers = this.userCtrl.valueChanges
- .pipe(
- startWith(''),
- map(user => user ? this.autocompleteFilterUser(user) : response.slice())
- );
- });
- }
-
- if (target.indexOf('signatureBookUsersNotLinked') != -1) {
- this.userCtrl = new FormControl();
- this.userCtrl.valueChanges.pipe(
- debounceTime(300),
- filter(value => value ? value.length > 2 : false),
- distinctUntilChanged(),
- switchMap(data => this.http.get(this.coreUrl + 'rest/autocomplete/maarchParapheurUsers', { params: { "search": data, "exludeAlreadyConnected": 'true' } }))
- ).subscribe((response: any) => {
- this.filteredUsers = this.userCtrl.valueChanges
- .pipe(
- startWith(''),
- map(user => user ? this.autocompleteFilterUser(user) : response.slice())
- );
- });
- }
-
- if (target.indexOf('statuses') != -1) {
- this.statusCtrl = new FormControl();
- this.http.get(this.coreUrl + 'rest/autocomplete/statuses')
- .subscribe((data: any) => {
- this.statusesList = data;
- this.filteredStatuses = this.statusCtrl.valueChanges
- .pipe(
- startWith(''),
- map(status => status ? this.autocompleteFilterStatuses(status) : this.statusesList.slice())
- );
- }, () => {
- location.href = "index.php";
- });
- }
- if (target.indexOf('usersAndEntities') != -1) {
- this.elementCtrl = new FormControl();
- this.elemList = [];
-
- this.elementCtrl.valueChanges.pipe(
- debounceTime(300),
- filter(value => value.length > 2),
- distinctUntilChanged(),
- switchMap(data => this.http.get(this.coreUrl + 'rest/autocomplete/users', { params: { "search": data } }))
- ).subscribe((response: any) => {
- this.elemList = response;
- });
-
- this.elementCtrl.valueChanges.pipe(
- debounceTime(300),
- filter(value => value.length > 2),
- distinctUntilChanged(),
- switchMap(data => this.http.get(this.coreUrl + 'rest/autocomplete/entities', { params: { "search": data } }))
- ).subscribe((response: any) => {
- this.elemList = this.elemList.concat(response);
- this.filteredElements = this.elementCtrl.valueChanges
- .pipe(
- startWith(''),
- map(elem => elem ? this.autocompleteFilterUser(elem) : this.elemList.slice())
- );
- });
- }
- if (target.indexOf('entities') != -1) {
- this.elementCtrl = new FormControl();
- this.elementCtrl.valueChanges.pipe(
- debounceTime(300),
- filter(value => value ? value.length > 2 : false),
- distinctUntilChanged(),
- switchMap(data => this.http.get(this.coreUrl + 'rest/autocomplete/entities', { params: { "search": data } }))
- ).subscribe((response: any) => {
- this.filteredElements = this.elementCtrl.valueChanges
- .pipe(
- startWith(''),
- map(elem => elem ? this.autocompleteFilterUser(elem) : response.slice())
- );
- });
-
- } else if (target.indexOf('visaUsers') != -1) {
- this.visaUserCtrl = new FormControl();
- this.visaUserCtrl.valueChanges.pipe(
- debounceTime(300),
- filter(value => value.length > 2),
- distinctUntilChanged(),
- switchMap(data => this.http.get(this.coreUrl + 'rest/autocomplete/users/visa', { params: { "search": data } }))
- ).subscribe((response: any) => {
- if (response.length == 0) {
- this.visaUserCtrl.setErrors({'noResult': true})
- }
- this.filteredVisaUsers = this.visaUserCtrl.valueChanges
- .pipe(
- startWith(''),
- map(user => user ? this.autocompleteFilterUser(user) : response.slice())
- );
- });
-
- } else {
-
- }
-
- }
-
- autocompleteFilterVisaUser(name: string) {
- return this.visaUserList.filter(user =>
- user.idToDisplay.toLowerCase().indexOf(name.toLowerCase()) >= 0);
- }
-
- autocompleteFilterUser(name: string) {
- return this.userList.filter(user =>
- user.idToDisplay.toLowerCase().indexOf(name.toLowerCase()) >= 0);
- }
-
- autocompleteFilterStatuses(name: string) {
- return this.statusesList.filter(status =>
- status.idToDisplay.toLowerCase().indexOf(name.toLowerCase()) >= 0);
- }
-
- autocompleteFilterElements(name: string) {
- return this.elemList.filter(elem =>
- elem.idToDisplay.toLowerCase().indexOf(name.toLowerCase()) >= 0);
- }
-}
\ No newline at end of file
diff --git a/src/frontend/service/header.service.ts b/src/frontend/service/header.service.ts
index 52d38666dcf9e7ace612e5f8b80d6aedd29d0c57..c5c9c3154a7a3c5d7564eb95bb671778ee148800 100755
--- a/src/frontend/service/header.service.ts
+++ b/src/frontend/service/header.service.ts
@@ -36,7 +36,6 @@ export class HeaderService {
this.http.get('../../rest/shortcuts').pipe(
filter(() => this.shortcut === null),
tap((data: any) => this.setShortcut(data.shortcuts)),
- tap(() => console.log(this.shortcut)),
catchError((err: any) => {
console.log(err);
return of(false);