diff --git a/apps/maarch_entreprise/js/angular/app/profile.component.ts b/apps/maarch_entreprise/js/angular/app/profile.component.ts index db96e6826725b65a12de7843879cf61692361f5c..d113003b04d6a2ce0fa7beee697e7e06cb2441f9 100755 --- a/apps/maarch_entreprise/js/angular/app/profile.component.ts +++ b/apps/maarch_entreprise/js/angular/app/profile.component.ts @@ -3,7 +3,7 @@ import { MediaMatcher } from '@angular/cdk/layout'; import { HttpClient } from '@angular/common/http'; import { LANG } from './translate.component'; import { NotificationService } from './notification.service'; -import { MatPaginator, MatTableDataSource, MatSort, MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { MatPaginator, MatTableDataSource, MatSort, MatDialog, MatDialogRef } from '@angular/material'; import { AutoCompletePlugin } from '../plugins/autocomplete.plugin'; @@ -23,6 +23,7 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit { private _mobileQueryListener : () => void; mobileQuery : MediaQueryList; dialogRef : MatDialogRef<any>; + coreUrl : string; lang : any = LANG; @@ -59,6 +60,7 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit { displayedColumns = ['event_date','info']; dataSource = new MatTableDataSource(this.histories); + @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; applyFilter(filterValue: string) { diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php index df8f174f624119cb0fbc9e82c4f81c6c34046a4f..135f52907a425e2a60f63a5264d8ef8ad4503275 100644 --- a/src/app/user/controllers/UserController.php +++ b/src/app/user/controllers/UserController.php @@ -375,8 +375,7 @@ class UserController } return $response->withJson([ - 'baskets' => BasketModel::getBasketsByUserId(['userId' => $user['user_id'], 'unneededBasketId' => ['IndexingBasket']]), - 'redirectedBaskets' => BasketModel::getRedirectedBasketsByUserId(['userId' => $user['user_id']]) + 'baskets' => BasketModel::getBasketsByUserId(['userId' => $user['user_id'], 'unneededBasketId' => ['IndexingBasket']]) ]); } @@ -411,8 +410,7 @@ class UserController ]); return $response->withJson([ - 'baskets' => BasketModel::getBasketsByUserId(['userId' => $user['user_id'], 'unneededBasketId' => ['IndexingBasket']]), - 'redirectedBaskets' => BasketModel::getRedirectedBasketsByUserId(['userId' => $user['user_id']]) + 'baskets' => BasketModel::getBasketsByUserId(['userId' => $user['user_id'], 'unneededBasketId' => ['IndexingBasket']]) ]); }