ngOnInit() {
this.eiJobsDataSource.loadJobs();
this.eiProducersDataSource.loadProducers();
- this.jobsDataSource = this.eiJobsDataSource.jobsDataSource();
+ this.jobsDataSource = new MatTableDataSource(this.eiJobsDataSource.eiJobs());
this.producersDataSource = new MatTableDataSource(this.eiProducersDataSource.eiProducers());
this.jobsFormControl.valueChanges.subscribe(value => {
refreshTables() {
this.eiJobsDataSource.loadJobs();
- this.jobsDataSource = this.eiJobsDataSource.jobsDataSource();
+ this.jobsDataSource.data = this.eiJobsDataSource.eiJobs();
this.eiProducersDataSource.loadProducers();
this.producersDataSource.data = this.eiProducersDataSource.eiProducers();
}
import { EIJob } from '../interfaces/ei.types';
import { EIService } from '../services/ei/ei.service';
-import { MatTableDataSource } from '@angular/material';
-import { ViewChild } from '@angular/core';
-import { MatSort } from '@angular/material/sort';
-import { delay } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
export class EIJobDataSource {
private jobs: Array<EIJob> = [];
- private dataSource: MatTableDataSource<any> = new MatTableDataSource();
- @ViewChild(MatSort, { static: true }) sort: MatSort;
-
- public jobsDataSource(): MatTableDataSource<any> {
- return this.dataSource;
+ public eiJobs(): EIJob[] {
+ return this.jobs;
}
private loadingSubject = new BehaviorSubject<boolean>(false);
producerIds.forEach(id => {
this.getJobsForProducer(id);
});
- //this.dataSource = new MatTableDataSource();
- this.dataSource.data = this.jobs;
- this.dataSource.sort = this.sort;
- console.log("datasource: "+this.dataSource.data);
});
this.rowCount = this.jobs.length;
}
private getJobsForProducer(id: string) {
console.log('Getting jobs for producer ID: ', id);
- this.eiSvc.getJobsForProducer(id)//.pipe(delay(5000))
+ this.eiSvc.getJobsForProducer(id)
.subscribe(producerJobs => {
- this.jobs = this.jobs.concat(producerJobs);
- console.log("producerJobs: "+producerJobs);
-
+ this.jobs = this.jobs.concat(producerJobs);
});
}
}