Просмотр исходного кода

no data found initialized

master
Daniel 1 год назад
Родитель
Сommit
0804027872
12 измененных файлов: 30 добавлений и 27 удалений
  1. +1
    -1
      matsen-tool/src/app/_components/paging/paging.component.html
  2. +14
    -8
      matsen-tool/src/app/_components/paging/paging.component.ts
  3. +1
    -2
      matsen-tool/src/app/_components/search-select/search-select.component.ts
  4. +1
    -1
      matsen-tool/src/app/_views/contacts/contact-list/contact-list.component.ts
  5. +1
    -1
      matsen-tool/src/app/_views/documents/document-list/document-list.component.ts
  6. +3
    -3
      matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts
  7. +1
    -1
      matsen-tool/src/app/_views/posts/post-list/post-list.component.ts
  8. +4
    -6
      matsen-tool/src/app/_views/products/product-list/product-list.component.ts
  9. +1
    -1
      matsen-tool/src/app/_views/sales/sale-list/sale-list.component.ts
  10. +1
    -1
      matsen-tool/src/app/_views/sales/sales-detail/sales-detail.component.ts
  11. +1
    -1
      matsen-tool/src/app/_views/tasks/task-list/task-list.component.ts
  12. +1
    -1
      matsen-tool/src/app/_views/user/user-list/user-list.component.ts

+ 1
- 1
matsen-tool/src/app/_components/paging/paging.component.html Просмотреть файл

@@ -16,7 +16,7 @@
</mat-paginator> </mat-paginator>
</div> </div>
<ng-content></ng-content> <ng-content></ng-content>
<div *ngIf="dataLength <= 0" class="spt-no-entries">{{'form.no-data' | translate}}</div>
<div *ngIf="dataInitialized && dataLength <= 0" class="spt-no-entries">{{'form.no-data' | translate}}</div>
<div class="spt-tools single"> <div class="spt-tools single">
<mat-paginator *ngIf="dataLength > 0" class="" <mat-paginator *ngIf="dataLength > 0" class=""
[pageSizeOptions]="pageSizeOptions" [pageSizeOptions]="pageSizeOptions"


+ 14
- 8
matsen-tool/src/app/_components/paging/paging.component.ts Просмотреть файл

@@ -20,16 +20,17 @@ export class PagingComponent implements OnInit, AfterViewInit {


@ViewChild(MatPaginator) public paginator!: MatPaginator; @ViewChild(MatPaginator) public paginator!: MatPaginator;


private defaultPageSize: number = 10;
private defaultPageSizeOptions: number[] = [10,20,50];
protected defaultPageSize: number = 10;
protected defaultPageSizeOptions: number[] = [10,20,50];


public dataLength: number;
public pageEvent: PageEvent;
protected dataLength: number;
protected pageEvent: PageEvent;
protected pageIndex: number; protected pageIndex: number;
public searchForm!: FormGroup;
public loadingSub: Subscription;
public loading: boolean = false;
public showLoading: boolean = false;
protected searchForm!: FormGroup;
protected loadingSub: Subscription;
protected loading: boolean = false;
protected showLoading: boolean = false;
protected dataInitialized: boolean = false;


constructor( constructor(
private fb: FormBuilder, private fb: FormBuilder,
@@ -100,6 +101,11 @@ export class PagingComponent implements OnInit, AfterViewInit {
return this.pageSize; return this.pageSize;
} }


setDataLength(dataLength: number): void {
this.dataInitialized = true;
this.dataLength = dataLength;
}

clearForm() { clearForm() {
this.searchForm.get('inputText')!.setValue(''); this.searchForm.get('inputText')!.setValue('');
} }


+ 1
- 2
matsen-tool/src/app/_components/search-select/search-select.component.ts Просмотреть файл

@@ -55,10 +55,9 @@ export class SearchSelectComponent implements OnInit, AfterViewInit {
} }


setData(dataSource: any, data: any[], dataLength: number): void { setData(dataSource: any, data: any[], dataLength: number): void {
console.log(data);
this.dataSource = dataSource; this.dataSource = dataSource;
this.pagingComponent.dataSource = dataSource; this.pagingComponent.dataSource = dataSource;
this.pagingComponent.dataLength = dataLength;
this.pagingComponent.setDataLength(dataLength);
} }


getPagingComponent(): PagingComponent { getPagingComponent(): PagingComponent {


+ 1
- 1
matsen-tool/src/app/_views/contacts/contact-list/contact-list.component.ts Просмотреть файл

@@ -46,7 +46,7 @@ export class ContactListComponent implements OnInit, AfterViewInit {
).subscribe( ).subscribe(
data => { data => {
this.contacts = data["hydra:member"]; this.contacts = data["hydra:member"];
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
} }
); );
} }


+ 1
- 1
matsen-tool/src/app/_views/documents/document-list/document-list.component.ts Просмотреть файл

@@ -54,7 +54,7 @@ export class DocumentListComponent implements OnInit, AfterViewInit {
data => { data => {
this.documents = data["hydra:member"]; this.documents = data["hydra:member"];
this.dataSource = new MatTableDataSource<DocumentJsonld>(this.documents); this.dataSource = new MatTableDataSource<DocumentJsonld>(this.documents);
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
} }
); );
} }


+ 3
- 3
matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts Просмотреть файл

@@ -101,7 +101,7 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
data => { data => {
this.partners = data["hydra:member"]; this.partners = data["hydra:member"];
this.dataSource = new MatTableDataSource<PartnerJsonld>(this.partners); this.dataSource = new MatTableDataSource<PartnerJsonld>(this.partners);
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
} }
); );
} }
@@ -126,7 +126,7 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
} }
}); });
this.dataSource = new MatTableDataSource<PartnerJsonld>(this.partners); this.dataSource = new MatTableDataSource<PartnerJsonld>(this.partners);
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
} }
); );
} }
@@ -154,7 +154,7 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
} }
}); });
this.dataSource = new MatTableDataSource<PartnerJsonld>(this.partners); this.dataSource = new MatTableDataSource<PartnerJsonld>(this.partners);
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
} }
); );
} }


+ 1
- 1
matsen-tool/src/app/_views/posts/post-list/post-list.component.ts Просмотреть файл

@@ -87,7 +87,7 @@ export class PostListComponent implements OnInit, AfterViewInit {
).subscribe( ).subscribe(
data => { data => {
this.posts = data["hydra:member"]; this.posts = data["hydra:member"];
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
} }
); );
} }


+ 4
- 6
matsen-tool/src/app/_views/products/product-list/product-list.component.ts Просмотреть файл

@@ -96,7 +96,7 @@ export class ProductListComponent implements OnInit, AfterViewInit {
).subscribe( ).subscribe(
data => { data => {
this.products = data["hydra:member"]; this.products = data["hydra:member"];
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
this.dataSource = new MatTableDataSource<ProductJsonld>(this.products); this.dataSource = new MatTableDataSource<ProductJsonld>(this.products);
} }
); );
@@ -121,7 +121,7 @@ export class ProductListComponent implements OnInit, AfterViewInit {
} }


}) })
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
this.dataSource = new MatTableDataSource<ProductJsonld>(this.products); this.dataSource = new MatTableDataSource<ProductJsonld>(this.products);
} }
); );
@@ -146,7 +146,7 @@ export class ProductListComponent implements OnInit, AfterViewInit {
this.products.push(item.product); this.products.push(item.product);
} }
}) })
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
this.dataSource = new MatTableDataSource<ProductJsonld>(this.products); this.dataSource = new MatTableDataSource<ProductJsonld>(this.products);
} }
); );
@@ -168,14 +168,12 @@ export class ProductListComponent implements OnInit, AfterViewInit {
this.products.push(item.product); this.products.push(item.product);
} }
}) })
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
this.dataSource = new MatTableDataSource<ProductJsonld>(this.products); this.dataSource = new MatTableDataSource<ProductJsonld>(this.products);
} }
); );
} }




onSortChange = (sortState: Sort) => { onSortChange = (sortState: Sort) => {
this.pagingComponent.resetPageIndex() this.pagingComponent.resetPageIndex()




+ 1
- 1
matsen-tool/src/app/_views/sales/sale-list/sale-list.component.ts Просмотреть файл

@@ -62,7 +62,7 @@ export class SaleListComponent implements OnInit, AfterViewInit {
data => { data => {
this.sales = data["hydra:member"]; this.sales = data["hydra:member"];
this.dataSource = new MatTableDataSource<SaleJsonld>(this.sales); this.dataSource = new MatTableDataSource<SaleJsonld>(this.sales);
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
} }
) )
} }


+ 1
- 1
matsen-tool/src/app/_views/sales/sales-detail/sales-detail.component.ts Просмотреть файл

@@ -90,7 +90,7 @@ export class SalesDetailComponent implements OnInit, AfterViewInit {
).subscribe( ).subscribe(
data => { data => {
this.posts = data["hydra:member"]; this.posts = data["hydra:member"];
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
this.posts.forEach(posts => { this.posts.forEach(posts => {
if (posts.id) { if (posts.id) {
this.commentsVisibility.set(posts.id, false); this.commentsVisibility.set(posts.id, false);


+ 1
- 1
matsen-tool/src/app/_views/tasks/task-list/task-list.component.ts Просмотреть файл

@@ -87,7 +87,7 @@ export class TaskListComponent implements OnInit, AfterViewInit {
).subscribe( ).subscribe(
data => { data => {
this.tasks = data["hydra:member"]; this.tasks = data["hydra:member"];
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
this.tasks.forEach(task => { this.tasks.forEach(task => {
if (task.id) { if (task.id) {
this.taskNotesVisibility.set(task.id, false); this.taskNotesVisibility.set(task.id, false);


+ 1
- 1
matsen-tool/src/app/_views/user/user-list/user-list.component.ts Просмотреть файл

@@ -57,7 +57,7 @@ export class UserListComponent implements OnInit, AfterViewInit {
data => { data => {
this.users = data["hydra:member"]; this.users = data["hydra:member"];
this.dataSource = new MatTableDataSource<UserJsonld>(this.users); this.dataSource = new MatTableDataSource<UserJsonld>(this.users);
this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
this.pagingComponent.setDataLength(Number(data["hydra:totalItems"]));
} }
); );
} }


Загрузка…
Отмена
Сохранить