From 45a7d4f468d9ebf0ea5db1457c5a9ff92f3e6c32 Mon Sep 17 00:00:00 2001 From: mrlemaire Date: Wed, 12 Jun 2024 12:01:37 +0000 Subject: [PATCH] mise ajour du 12/06/2024 --- src/app/admin-test/admin-test.component.ts | 2 +- src/app/app.component.ts | 11 ++++++----- src/app/core/layout/sidebar/nav-data.ts | 6 +++++- src/app/reversements/reversement/reversement.routes.ts | 5 +++++ src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.scss | 2 +- src/app/utilisateurs/view-user/view-user.component.html | 10 +++++++++- src/app/utilisateurs/view-user/view-user.component.ts | 40 ++++++---------------------------------- 7 files changed, 33 insertions(+), 43 deletions(-) diff --git a/src/app/admin-test/admin-test.component.ts b/src/app/admin-test/admin-test.component.ts index a292eb3..8a98087 100644 --- a/src/app/admin-test/admin-test.component.ts +++ b/src/app/admin-test/admin-test.component.ts @@ -84,7 +84,7 @@ export class AdminTestComponent implements OnInit { 'type_paiement_label', 'service', 'status', - 'commentaire', + // 'commentaire', // 'etat', ]; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 1b25df4..9a1dbb8 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,12 +1,13 @@ import { Component } from '@angular/core'; import { RouterOutlet } from '@angular/router'; +import { FooterComponent } from "./core/layout/footer/footer.component"; @Component({ - selector: 'bgui-root', - standalone: true, - imports: [RouterOutlet], - templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'], + selector: 'bgui-root', + standalone: true, + templateUrl: './app.component.html', + styleUrls: ['./app.component.scss'], + imports: [RouterOutlet, FooterComponent] }) export class AppComponent { title = "Beas'y"; diff --git a/src/app/core/layout/sidebar/nav-data.ts b/src/app/core/layout/sidebar/nav-data.ts index 03c8c7c..12a6164 100644 --- a/src/app/core/layout/sidebar/nav-data.ts +++ b/src/app/core/layout/sidebar/nav-data.ts @@ -16,7 +16,7 @@ export const navbarData: MenuItem[] = [ items: [ { routeLink: 'transactions/suivi-transaction', - label: ' Suivi des transactions ', + label: 'Suivi des transferts ', }, { routeLink: 'transactions/suivi-paiement', @@ -37,6 +37,10 @@ export const navbarData: MenuItem[] = [ routeLink: 'reversements/reversement', label: ' Reversements ', }, + { + routeLink: 'reversements/paiement', + label: ' Suivi des paiements ', + }, ], }, diff --git a/src/app/reversements/reversement/reversement.routes.ts b/src/app/reversements/reversement/reversement.routes.ts index 9b378db..d100312 100644 --- a/src/app/reversements/reversement/reversement.routes.ts +++ b/src/app/reversements/reversement/reversement.routes.ts @@ -2,6 +2,7 @@ import type { Routes } from '@angular/router'; import { ReversementsComponent } from '../reversements.component'; import { ReversementComponent } from './reversement/reversement.component'; import { DemandeComponent } from './demande/demande.component'; +import { PaiementComponent } from './paiement/paiement.component'; export const reversementRoutes: Routes = [ { @@ -17,6 +18,10 @@ export const reversementRoutes: Routes = [ path: 'demande', component: DemandeComponent, }, + { + path: 'paiement', + component: PaiementComponent, + }, ], }, ]; diff --git a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.scss b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.scss index 94d3464..a00fb28 100644 --- a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.scss +++ b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.scss @@ -17,7 +17,7 @@ table { .bold-text { - color:blue; + color:rgb(0, 0, 0); font-weight: bold; font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ } diff --git a/src/app/utilisateurs/view-user/view-user.component.html b/src/app/utilisateurs/view-user/view-user.component.html index 17c6d66..011fbee 100644 --- a/src/app/utilisateurs/view-user/view-user.component.html +++ b/src/app/utilisateurs/view-user/view-user.component.html @@ -89,7 +89,7 @@
- + + + Filter + diff --git a/src/app/utilisateurs/view-user/view-user.component.ts b/src/app/utilisateurs/view-user/view-user.component.ts index 4b9b1f0..c1f518c 100644 --- a/src/app/utilisateurs/view-user/view-user.component.ts +++ b/src/app/utilisateurs/view-user/view-user.component.ts @@ -3,25 +3,17 @@ import { CommonModule } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, ViewChild } from '@angular/core'; -import { ReactiveFormsModule, FormsModule } from '@angular/forms'; -import { MatButtonModule } from '@angular/material/button'; -import { MatCardModule, MatCardTitle } from '@angular/material/card'; -import { MatCheckboxModule } from '@angular/material/checkbox'; +import { FormsModule } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; -import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { MatMenuModule } from '@angular/material/menu'; import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator'; import { MatSnackBar } from '@angular/material/snack-bar'; import { MatTableDataSource, MatTableModule } from '@angular/material/table'; -import { Router, RouterLink, RouterOutlet } from '@angular/router'; +import { Router, RouterLink } from '@angular/router'; import { map } from 'rxjs/internal/operators/map'; import { IUtilisateur } from 'src/app/_interfaces/utilisateur/user'; import { UserService } from 'src/app/_services/utilisateur/user.service'; -import { CarouselComponent } from 'src/app/shared/carousel/carousel.component'; -import { FilterBarComponent } from 'src/assets/filter-bar/filter-bar.component'; -import { EditUserComponent } from '../edit-user/edit-user.component'; import * as XLSX from 'xlsx'; @Component({ @@ -29,24 +21,12 @@ import * as XLSX from 'xlsx'; standalone: true, imports: [ CommonModule, - MatPaginator, MatTableModule, - MatFormFieldModule, MatInputModule, - CarouselComponent, - MatCardModule, - MatCardTitle, - ReactiveFormsModule, - MatButtonModule, MatIconModule, - MatCheckboxModule, - RouterOutlet, - MatPaginatorModule, RouterLink, FormsModule, - MatMenuModule, - FilterBarComponent, - EditUserComponent, + MatPaginatorModule, ], templateUrl: './view-user.component.html', styleUrl: './view-user.component.scss', @@ -82,23 +62,15 @@ export class ViewUserComponent { const userData = JSON.parse(jsonData); const results = userData.results; console.log('UserData==> Results:', results); - this.dataSource = userData.results; + this.dataSource.data = userData.results; }); } - // ngAfterViewInit() { - // this.dataSource.paginator = this.paginator; - // this.dataSource.paginator.pageIndex = this.paginator.pageSize; - // } + ngAfterViewInit() { this.dataSource.paginator = this.paginator; this.dataSource.paginator.pageIndex = this.paginator.pageSize; } - editUser() { - throw new Error('Method not implemented.'); - } - deleteUser() { - throw new Error('Method not implemented.'); - } + displayedColumns: string[] = [ // 'id', 'username', -- libgit2 0.27.1