Commit 45a7d4f4 by zadi francice

mise ajour du 12/06/2024

parent 20c9df30
...@@ -84,7 +84,7 @@ export class AdminTestComponent implements OnInit { ...@@ -84,7 +84,7 @@ export class AdminTestComponent implements OnInit {
'type_paiement_label', 'type_paiement_label',
'service', 'service',
'status', 'status',
'commentaire', // 'commentaire',
// 'etat', // 'etat',
]; ];
......
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { RouterOutlet } from '@angular/router'; import { RouterOutlet } from '@angular/router';
import { FooterComponent } from "./core/layout/footer/footer.component";
@Component({ @Component({
selector: 'bgui-root', selector: 'bgui-root',
standalone: true, standalone: true,
imports: [RouterOutlet],
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'], styleUrls: ['./app.component.scss'],
imports: [RouterOutlet, FooterComponent]
}) })
export class AppComponent { export class AppComponent {
title = "Beas'y"; title = "Beas'y";
......
...@@ -16,7 +16,7 @@ export const navbarData: MenuItem[] = [ ...@@ -16,7 +16,7 @@ export const navbarData: MenuItem[] = [
items: [ items: [
{ {
routeLink: 'transactions/suivi-transaction', routeLink: 'transactions/suivi-transaction',
label: ' Suivi des transactions ', label: 'Suivi des transferts ',
}, },
{ {
routeLink: 'transactions/suivi-paiement', routeLink: 'transactions/suivi-paiement',
...@@ -37,6 +37,10 @@ export const navbarData: MenuItem[] = [ ...@@ -37,6 +37,10 @@ export const navbarData: MenuItem[] = [
routeLink: 'reversements/reversement', routeLink: 'reversements/reversement',
label: ' Reversements ', label: ' Reversements ',
}, },
{
routeLink: 'reversements/paiement',
label: ' Suivi des paiements ',
},
], ],
}, },
......
...@@ -2,6 +2,7 @@ import type { Routes } from '@angular/router'; ...@@ -2,6 +2,7 @@ import type { Routes } from '@angular/router';
import { ReversementsComponent } from '../reversements.component'; import { ReversementsComponent } from '../reversements.component';
import { ReversementComponent } from './reversement/reversement.component'; import { ReversementComponent } from './reversement/reversement.component';
import { DemandeComponent } from './demande/demande.component'; import { DemandeComponent } from './demande/demande.component';
import { PaiementComponent } from './paiement/paiement.component';
export const reversementRoutes: Routes = [ export const reversementRoutes: Routes = [
{ {
...@@ -17,6 +18,10 @@ export const reversementRoutes: Routes = [ ...@@ -17,6 +18,10 @@ export const reversementRoutes: Routes = [
path: 'demande', path: 'demande',
component: DemandeComponent, component: DemandeComponent,
}, },
{
path: 'paiement',
component: PaiementComponent,
},
], ],
}, },
]; ];
...@@ -17,7 +17,7 @@ table { ...@@ -17,7 +17,7 @@ table {
.bold-text { .bold-text {
color:blue; color:rgb(0, 0, 0);
font-weight: bold; font-weight: bold;
font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ font-size: 16px; /* Ajustez la taille de la police selon vos besoins */
} }
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</a> </a>
</div> </div>
<div class="example-container mat-elevation-z8" style="margin-top: 40px"> <div class="example-container mat-elevation-z8" style="margin-top: 40px">
<mat-form-field> <!-- <mat-form-field>
<mat-label>Filter</mat-label> <mat-label>Filter</mat-label>
<input <input
class="textFilter" class="textFilter"
...@@ -97,6 +97,14 @@ ...@@ -97,6 +97,14 @@
(keyup)="applyFilter($event)" (keyup)="applyFilter($event)"
placeholder="Ex. ium" placeholder="Ex. ium"
#input /> #input />
</mat-form-field> -->
<mat-form-field>
<mat-label>Filter</mat-label>
<input
matInput
(keyup)="applyFilter($event)"
placeholder="Ex. ium"
#input />
</mat-form-field> </mat-form-field>
<mat-table [dataSource]="dataSource" matSort> <mat-table [dataSource]="dataSource" matSort>
......
...@@ -3,25 +3,17 @@ ...@@ -3,25 +3,17 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Component, ViewChild } from '@angular/core'; import { Component, ViewChild } from '@angular/core';
import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule, MatCardTitle } from '@angular/material/card';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatDialog } from '@angular/material/dialog'; import { MatDialog } from '@angular/material/dialog';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input'; import { MatInputModule } from '@angular/material/input';
import { MatMenuModule } from '@angular/material/menu';
import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator'; import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator';
import { MatSnackBar } from '@angular/material/snack-bar'; import { MatSnackBar } from '@angular/material/snack-bar';
import { MatTableDataSource, MatTableModule } from '@angular/material/table'; 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 { map } from 'rxjs/internal/operators/map';
import { IUtilisateur } from 'src/app/_interfaces/utilisateur/user'; import { IUtilisateur } from 'src/app/_interfaces/utilisateur/user';
import { UserService } from 'src/app/_services/utilisateur/user.service'; 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'; import * as XLSX from 'xlsx';
@Component({ @Component({
...@@ -29,24 +21,12 @@ import * as XLSX from 'xlsx'; ...@@ -29,24 +21,12 @@ import * as XLSX from 'xlsx';
standalone: true, standalone: true,
imports: [ imports: [
CommonModule, CommonModule,
MatPaginator,
MatTableModule, MatTableModule,
MatFormFieldModule,
MatInputModule, MatInputModule,
CarouselComponent,
MatCardModule,
MatCardTitle,
ReactiveFormsModule,
MatButtonModule,
MatIconModule, MatIconModule,
MatCheckboxModule,
RouterOutlet,
MatPaginatorModule,
RouterLink, RouterLink,
FormsModule, FormsModule,
MatMenuModule, MatPaginatorModule,
FilterBarComponent,
EditUserComponent,
], ],
templateUrl: './view-user.component.html', templateUrl: './view-user.component.html',
styleUrl: './view-user.component.scss', styleUrl: './view-user.component.scss',
...@@ -82,23 +62,15 @@ export class ViewUserComponent { ...@@ -82,23 +62,15 @@ export class ViewUserComponent {
const userData = JSON.parse(jsonData); const userData = JSON.parse(jsonData);
const results = userData.results; const results = userData.results;
console.log('UserData==> Results:', 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() { ngAfterViewInit() {
this.dataSource.paginator = this.paginator; this.dataSource.paginator = this.paginator;
this.dataSource.paginator.pageIndex = this.paginator.pageSize; this.dataSource.paginator.pageIndex = this.paginator.pageSize;
} }
editUser() {
throw new Error('Method not implemented.');
}
deleteUser() {
throw new Error('Method not implemented.');
}
displayedColumns: string[] = [ displayedColumns: string[] = [
// 'id', // 'id',
'username', 'username',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment