Skip to content
Snippets Groups Projects
Commit 344648f9 authored by naji's avatar naji
Browse files

fix: Recherche en langage français non fonctionnelle dans Pop-up Ajout de métadonnées

parent f0eb2aa5
No related branches found
No related tags found
......@@ -30,10 +30,10 @@
<mat-divider class="pastis-popup-separator"></mat-divider>
<mat-selection-list [disableRipple]="true" [ngModel]="addedItems"
(ngModelChange)="selectSedaElement($event)" class="list-box">
<mat-list *ngFor="let elementName of allowedChildrenNames | filterByName:filterName;"
<mat-list *ngFor="let element of allowedChildren | filterByName:filterName:sedaLanguage;"
class="list-item">
<span class="list-box-content">
<i id ="pastis-ico-complex-element" *ngIf="isElementComplex(elementName)" class="vitamui-icon vitamui-icon-complex-element-1-1">
<i id ="pastis-ico-complex-element" *ngIf="isElementComplex(element.Name)" class="vitamui-icon vitamui-icon-complex-element-1-1">
<span class="path1"></span><span class="path2"></span>
<span class="path3"></span><span class="path4"></span>
<span class="path5"></span>
......@@ -41,12 +41,12 @@
<span
class="text normal"
tooltip={{getDefinition(elementName)}}
tooltip={{getDefinition(element.Name)}}
placement="right"
show-delay="0"
tooltip-class="pastis-tooltip-class">{{onResolveName(elementName)}}</span>
tooltip-class="pastis-tooltip-class">{{onResolveName(element.Name)}}</span>
</span>
<span class="ajouter" (click)="onAddSelectedElement(elementName)">{{'USER_ACTION.ADD_METADATA.BOUTON_AJOUTER' | translate}}</span>
<span class="ajouter" (click)="onAddSelectedElement(element.Name)">{{'USER_ACTION.ADD_METADATA.BOUTON_AJOUTER' | translate}}</span>
<mat-divider class="pastis-popup-separator"></mat-divider>
</mat-list>
......
......@@ -129,7 +129,6 @@ export class UserActionAddMetadataComponent implements OnInit {
})
this.addedItems.length > 0 ? this.atLeastOneIsSelected = true : this.atLeastOneIsSelected = false
this.upateButtonStatusAndDataToSend();
this.allowedChildrenNames = new FilterByNamePipe().transform(this.allowedChildrenNames,this.filterName);
}
onAddSelectedElement(elementName: string){
......@@ -196,9 +195,14 @@ export class UserActionAddMetadataComponent implements OnInit {
@Pipe({name: 'filterByName'})
export class FilterByNamePipe implements PipeTransform {
transform(listOfNames: string[], nameToFilter: string): string[] {
if(!listOfNames) return null;
if(!nameToFilter) return listOfNames;
return listOfNames.filter(name => name.toLowerCase().indexOf(nameToFilter.toLowerCase()) >= 0);
transform(listOfElements: SedaData[], nameToFilter: string, sedaLanguage: boolean): SedaData[] {
if(!listOfElements) return null;
if(!nameToFilter) return listOfElements;
if(sedaLanguage){
return listOfElements.filter(element => element.Name != undefined).filter(element => element.Name.toLowerCase().indexOf(nameToFilter.toLowerCase()) >= 0);
}else{
return listOfElements.filter(element => element.NameFr != undefined).filter(element => element.NameFr.toLowerCase().indexOf(nameToFilter.toLowerCase()) >= 0);
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment