Skip to content
Snippets Groups Projects
Verified Commit 47e6fbf6 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FIX #10007 TIME 0:20 fix order data available export

parent eda781ec
No related branches found
No related tags found
No related merge requests found
...@@ -2,8 +2,6 @@ import { NgModule } from '@angular/core'; ...@@ -2,8 +2,6 @@ import { NgModule } from '@angular/core';
import { SharedModule } from '../app-common.module'; import { SharedModule } from '../app-common.module';
import { SortPipe } from '../../plugins/sorting.pipe';
//import { MenuComponent } from '../menu/menu.component'; //import { MenuComponent } from '../menu/menu.component';
//import { MenuNavComponent } from '../menu/menu-nav.component'; //import { MenuNavComponent } from '../menu/menu-nav.component';
//import { MenuTopComponent } from '../menu/menu-top.component'; //import { MenuTopComponent } from '../menu/menu-top.component';
...@@ -93,7 +91,6 @@ import { ShippingAdministrationComponent } from './shipping/shippin ...@@ -93,7 +91,6 @@ import { ShippingAdministrationComponent } from './shipping/shippin
DoctypesAdministrationRedirectModalComponent, DoctypesAdministrationRedirectModalComponent,
DiffusionModelsAdministrationComponent, DiffusionModelsAdministrationComponent,
DiffusionModelAdministrationComponent, DiffusionModelAdministrationComponent,
SortPipe,
VersionsUpdateAdministrationComponent, VersionsUpdateAdministrationComponent,
DocserversAdministrationComponent, DocserversAdministrationComponent,
DocserverAdministrationComponent, DocserverAdministrationComponent,
......
...@@ -11,6 +11,7 @@ import { RouterModule } from '@angular/router'; ...@@ -11,6 +11,7 @@ import { RouterModule } from '@angular/router';
import { DragDropModule } from '@angular/cdk/drag-drop'; import { DragDropModule } from '@angular/cdk/drag-drop';
/*PLUGINS IMPORTS*/ /*PLUGINS IMPORTS*/
import { SortPipe } from '../plugins/sorting.pipe';
import { PdfViewerModule } from 'ng2-pdf-viewer'; import { PdfViewerModule } from 'ng2-pdf-viewer';
//import { SimplePdfViewerModule } from 'simple-pdf-viewer'; //import { SimplePdfViewerModule } from 'simple-pdf-viewer';
import { NgStringPipesModule } from 'ngx-pipes'; import { NgStringPipesModule } from 'ngx-pipes';
...@@ -71,6 +72,7 @@ export class MyHammerConfig extends HammerGestureConfig { ...@@ -71,6 +72,7 @@ export class MyHammerConfig extends HammerGestureConfig {
HeaderPanelComponent, HeaderPanelComponent,
SearchHomeComponent, SearchHomeComponent,
BasketHomeComponent, BasketHomeComponent,
SortPipe,
TimeAgoPipe, TimeAgoPipe,
TimeLimitPipe, TimeLimitPipe,
FilterListPipe, FilterListPipe,
...@@ -97,6 +99,7 @@ export class MyHammerConfig extends HammerGestureConfig { ...@@ -97,6 +99,7 @@ export class MyHammerConfig extends HammerGestureConfig {
HttpClientModule, HttpClientModule,
RouterModule, RouterModule,
AppMaterialModule, AppMaterialModule,
SortPipe,
TimeAgoPipe, TimeAgoPipe,
TimeLimitPipe, TimeLimitPipe,
FilterListPipe, FilterListPipe,
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<div class="col-md-6 available-data"> <div class="col-md-6 available-data">
<h2><span class="title">{{lang.availableDatas}}</span> <i class="fa fa-plus-circle removeAllDatas" color="primary" title="{{lang.addAllDatas}}" (click)="addAllData()"></i></h2> <h2><span class="title">{{lang.availableDatas}}</span> <i class="fa fa-plus-circle removeAllDatas" color="primary" title="{{lang.addAllDatas}}" (click)="addAllData()"></i></h2>
<div cdkDropList #dataAvailableList="cdkDropList" [cdkDropListData]="dataAvailable" [cdkDropListConnectedTo]="[dataExportList]" class="cdk-list" (cdkDropListDropped)="drop($event)"> <div cdkDropList #dataAvailableList="cdkDropList" [cdkDropListData]="dataAvailable" [cdkDropListConnectedTo]="[dataExportList]" class="cdk-list" (cdkDropListDropped)="drop($event)">
<div class="columns" *ngFor="let item of dataAvailable | filterList:listFilter.value:'label'" <div class="columns" *ngFor="let item of dataAvailable | sortBy: 'label' | filterList:listFilter.value:'label'"
cdkDrag id="{{item.value}}">{{item.label}} <i class="fa fa-plus" color="primary" style="cursor:pointer;" cdkDrag id="{{item.value}}">{{item.label}} <i class="fa fa-plus" color="primary" style="cursor:pointer;"
(click)="addData(item)"></i></div> (click)="addData(item)"></i></div>
<div *ngIf="dataAvailable.length == 0" class="noData">{{lang.noDataAvailable}}</div> <div *ngIf="dataAvailable.length == 0" class="noData">{{lang.noDataAvailable}}</div>
......
...@@ -4,13 +4,14 @@ import { LANG } from '../../translate.component'; ...@@ -4,13 +4,14 @@ import { LANG } from '../../translate.component';
import { NotificationService } from '../../notification.service'; import { NotificationService } from '../../notification.service';
import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop'; import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
import { MAT_DIALOG_DATA } from '@angular/material'; import { MAT_DIALOG_DATA } from '@angular/material';
import { SortPipe } from '../../../plugins/sorting.pipe';
declare function $j(selector: any): any; declare function $j(selector: any): any;
@Component({ @Component({
templateUrl: "export.component.html", templateUrl: "export.component.html",
styleUrls: ['export.component.scss'], styleUrls: ['export.component.scss'],
providers: [NotificationService], providers: [NotificationService, SortPipe],
}) })
export class ExportComponent implements OnInit { export class ExportComponent implements OnInit {
...@@ -227,7 +228,7 @@ export class ExportComponent implements OnInit { ...@@ -227,7 +228,7 @@ export class ExportComponent implements OnInit {
@ViewChild('listFilter') private listFilter: any; @ViewChild('listFilter') private listFilter: any;
constructor(public http: HttpClient, private notify: NotificationService, @Inject(MAT_DIALOG_DATA) public data: any) { } constructor(public http: HttpClient, private notify: NotificationService, @Inject(MAT_DIALOG_DATA) public data: any, private sortPipe: SortPipe) { }
ngOnInit(): void { ngOnInit(): void {
this.dataAvailableClone = JSON.parse(JSON.stringify(this.dataAvailable)); this.dataAvailableClone = JSON.parse(JSON.stringify(this.dataAvailable));
...@@ -337,6 +338,7 @@ export class ExportComponent implements OnInit { ...@@ -337,6 +338,7 @@ export class ExportComponent implements OnInit {
removeData(i: number) { removeData(i: number) {
transferArrayItem(this.exportModel.data, this.dataAvailable, i, this.dataAvailable.length); transferArrayItem(this.exportModel.data, this.dataAvailable, i, this.dataAvailable.length);
this.sortPipe.transform(this.dataAvailable, 'label');
} }
removeAllData() { removeAllData() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment