diff --git a/src/frontend/app/administration/list/list-administration.component.html b/src/frontend/app/administration/list/list-administration.component.html index 40075344fcf4ad3bc3033e54ec39f8c2f5bcb805..650fa67238cbc6488ae986dd4b256b4d77dc4a6d 100644 --- a/src/frontend/app/administration/list/list-administration.component.html +++ b/src/frontend/app/administration/list/list-administration.component.html @@ -45,7 +45,7 @@ </div> <div class="col-md-6 active-data"> - <h2><span class="title">{{lang.chosenDatas}}</span> <i class="fa fa-eraser removeAllDatas" color="warn" title="{{lang.removeAllDatas}}" (click)="removeAllData()"></i></h2> + <h2><span class="title">{{lang.chosenDatas}}</span> <i class="fa fa-minus-circle removeAllDatas" color="warn" title="{{lang.removeAllDatas}}" (click)="removeAllData()"></i></h2> <div cdkDropList #dataExportList="cdkDropList" [cdkDropListData]="exportModel.data" [cdkDropListConnectedTo]="[dataAvailableList]" class="cdk-list" (cdkDropListDropped)="drop($event)"> <div class="columns" *ngFor="let item of exportModel.data;let i = index" cdkDrag>{{item.label}} <i diff --git a/src/frontend/app/administration/list/list-administration.component.ts b/src/frontend/app/administration/list/list-administration.component.ts index c19b83ca6412ade72978859ecacd08d9f1db016e..cb135c84c5ab5c50d1d9ace8cc483b0c17850510 100644 --- a/src/frontend/app/administration/list/list-administration.component.ts +++ b/src/frontend/app/administration/list/list-administration.component.ts @@ -251,11 +251,9 @@ export class ListAdministrationComponent implements OnInit { if (event.previousContainer === event.container) { moveItemInArray(event.container.data, event.previousIndex, event.currentIndex); } else { - const fakeIndex = $j('.available-data .columns')[event.previousIndex].id; - const realIndex = this.dataAvailable.map((dataAv: any) => (dataAv.id)).indexOf(fakeIndex); transferArrayItem(event.previousContainer.data, event.container.data, - realIndex, + event.previousIndex, event.currentIndex); this.listFilter.nativeElement.value = ''; }