From dea29409c1f341510e89f383aef6e5752566863e Mon Sep 17 00:00:00 2001 From: zadi francice Date: Fri, 17 May 2024 18:09:37 +0000 Subject: [PATCH] 17/05/2024 --- src/app/_interfaces/trafics/transaction/transaction.ts | 51 +++++++++++++++++---------------------------------- src/app/_services/trafics/transaction/transaction.service.ts | 12 ++++++++++-- src/app/admin-test/admin-test.component.html | 90 ++++++++++++++++++++---------------------------------------------------------------------- src/app/admin-test/admin-test.component.ts | 47 ++++++++++++++++++++++++++--------------------- src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html | 2 +- src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.ts | 2 +- src/app/utilisateurs/create-users/create-users.component.html | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ src/app/utilisateurs/create-users/create-users.component.scss | 3 +++ src/app/utilisateurs/utilisateurs.component.html | 10 ++++++++++ src/assets/images/clipboard2-fill.svg | 4 ++++ 10 files changed, 197 insertions(+), 135 deletions(-) create mode 100644 src/assets/images/clipboard2-fill.svg diff --git a/src/app/_interfaces/trafics/transaction/transaction.ts b/src/app/_interfaces/trafics/transaction/transaction.ts index 43c6273..41ceaec 100644 --- a/src/app/_interfaces/trafics/transaction/transaction.ts +++ b/src/app/_interfaces/trafics/transaction/transaction.ts @@ -1,46 +1,29 @@ +export interface ITypeOperateur { + id_type_paiement: number; + label: string; + total_montant: number; +} + export interface ITransaction { - transaction_id: number; type_paiement: number; type_paiement_label: string; marchand: string; service: string; montant: number; - date: Date; + date: string; commentaire: string; etat: boolean; status: number; reference: string; + transaction_id: number; } - - - -// interface ITypeOperateur { -// id_type_paiement: number; -// label: string; -// total_montant: number; -// } - -// interface ITransaction { -// type_paiement: number; -// type_paiement_label: string; -// marchand: string; -// service: string; -// montant: number; -// date: string; -// commentaire: string; -// etat: boolean; -// status: number; -// reference: string; -// transaction_id: number; -// } - -// interface IMerchantData { -// merchant_key: string; -// solde: number; -// total_transaction: number; -// total_journee: number; -// revesement: number; -// type_operateur: ITypeOperateur[]; -// last_five_transactions: ITransaction[]; -// } + export interface IMerchantData { + merchant_key: string; + solde: number; + total_transaction: number; + total_journee: number; + revesement: number; + type_operateur: ITypeOperateur[]; + last_five_transactions: ITransaction[]; +} diff --git a/src/app/_services/trafics/transaction/transaction.service.ts b/src/app/_services/trafics/transaction/transaction.service.ts index 3d2da4d..8c3248b 100644 --- a/src/app/_services/trafics/transaction/transaction.service.ts +++ b/src/app/_services/trafics/transaction/transaction.service.ts @@ -1,7 +1,10 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable, catchError, throwError } from 'rxjs'; -import { ITransaction } from 'src/app/_interfaces/trafics/transaction/transaction'; +import { + ITransaction, + IMerchantData, +} from 'src/app/_interfaces/trafics/transaction/transaction'; @Injectable({ providedIn: 'root', @@ -9,6 +12,7 @@ import { ITransaction } from 'src/app/_interfaces/trafics/transaction/transactio export class TransactionService { //private HtUrl = 'http://192.168.1.223:8001/transactions/'; private HtUrl = 'http://192.168.1.223:8001/api/tableau_bord/1/'; + private TUrl = 'http://192.168.1.223:8001/transactions/'; httpOptions = { headers: new HttpHeaders({ @@ -20,10 +24,14 @@ export class TransactionService { getAll(): Observable { return this.httpClient - .get(this.HtUrl) + .get(this.TUrl) .pipe(catchError(this.errorHandler)); } + getDataTable(): Observable { + return this.httpClient.get(this.HtUrl); + } + create(transaction: ITransaction): Observable { return this.httpClient .post( diff --git a/src/app/admin-test/admin-test.component.html b/src/app/admin-test/admin-test.component.html index bc3f6f0..db7fae1 100644 --- a/src/app/admin-test/admin-test.component.html +++ b/src/app/admin-test/admin-test.component.html @@ -13,13 +13,15 @@
-
SOLDE
+
Solde
-

87845000 FCFA

+

+ {{ respTransaction?.solde | currency: 'FCFA' }} +

@@ -45,9 +47,10 @@
-

87845000 FCFA

+

+ {{ respTransaction?.total_transaction | currency: 'FCFA' }} +

-
@@ -70,9 +73,10 @@
-

87845000 FCFA

+

+ {{ respTransaction?.revesement | currency: 'FCFA' }} +

-
@@ -95,12 +99,9 @@
-

87845000 FCFA

-
-
- +

+ {{ respTransaction?.total_journee | currency: 'FCFA' }} +

@@ -170,7 +171,7 @@ -
+
@@ -203,59 +204,18 @@
-
- -
    -
  • +
  • - UBA (United Bank for Africa) -
    -
    1.247.500 FCFA
    -
    • -
  • -
    - - Orange Money + style="background: rgb(219, 207, 207)"> + {{ operateur.label }}
    -
    78.758.000 FCFA
    -
    • -
  • -
    - - MTN MoMo +
    + {{ operateur.total_montant | currency: 'FCFA' }}
    -
    4.851.000 FCFA
    -
    • -
  • -
    - - Moov Money -
    -
    9.500.000 FCFA
@@ -273,6 +233,7 @@
Vos 5 dernières Transactions
+ ID @@ -282,14 +243,6 @@ - - - type paiement @@ -359,9 +312,6 @@ - - -
diff --git a/src/app/admin-test/admin-test.component.ts b/src/app/admin-test/admin-test.component.ts index 2e945af..0a7dc32 100644 --- a/src/app/admin-test/admin-test.component.ts +++ b/src/app/admin-test/admin-test.component.ts @@ -7,9 +7,12 @@ import { FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatPaginatorModule } from '@angular/material/paginator'; -import { MatTableModule } from '@angular/material/table'; -import { IOperateur } from '../_interfaces/trafics/operateur/operateur'; -import { ITransaction } from '../_interfaces/trafics/transaction/transaction'; +import { MatTableDataSource, MatTableModule } from '@angular/material/table'; +import { + IMerchantData, + ITransaction, + ITypeOperateur, +} from '../_interfaces/trafics/transaction/transaction'; import { TransactionService } from '../_services/trafics/transaction/transaction.service'; @Component({ @@ -32,26 +35,32 @@ import { TransactionService } from '../_services/trafics/transaction/transaction styleUrls: ['./admin-test.component.scss'], }) export class AdminTestComponent implements OnInit { - //private url = 'http://192.168.1.223:8001/operateur/'; + private HtUrl = 'http://192.168.1.223:8001/api/tableau_bord/1/'; breadCrumbItems: Array<{}> | undefined; - + respTransaction: IMerchantData | undefined = undefined; transactions: ITransaction[] = []; - operateurs: IOperateur[] = []; + operateurs: ITypeOperateur[] = []; + // marchnad: IMerchantData[] = []; selectedOperateur: string = ''; - constructor( private httpClient: HttpClient, public transactionService: TransactionService //public operateur: IOperateur ) {} - ngOnInit(): void { - this.transactionService.getAll().subscribe((data: ITransaction[]) => { - this.transactions = data; - console.log('transactions===>', this.transactions); + this.transactionService.getDataTable().subscribe(data => { + this.respTransaction = data; + console.log('respTransaction===>', this.respTransaction); + // this.respTransaction = JSON.stringify(this.respTransaction); + //console.log('Response==>',this.respTransaction); + + this.transactions = this.respTransaction?.last_five_transactions; + console.log('transactions==>', this.transactions); + + this.operateurs = this.respTransaction?.type_operateur; - //this.fetchOperateurs(); + console.log('typeOpreateur===>', this.operateurs); }); } @@ -69,13 +78,9 @@ export class AdminTestComponent implements OnInit { 'reference', ]; - // dataSource = new MatTableDataSource(this.transactions); - // @ViewChild(MatPaginator) paginator!: MatPaginator | undefined; - // constructor() {} - // ngOnInit() { - // this.breadCrumbItems = [ - // { label: 'Résumé Des Transactions.' }, - // /* { label: 'Invoice List', active: true },*/ - // ]; - // } + dataSource = new MatTableDataSource(this.transactions); } + + + + diff --git a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html index 6a93884..3d36125 100644 --- a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html +++ b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.html @@ -149,7 +149,7 @@
diff --git a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.ts b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.ts index 310d567..479d0d4 100644 --- a/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.ts +++ b/src/app/trafics/transactions/suivi-transaction/suivi-transaction.component.ts @@ -74,7 +74,7 @@ export class SuiviTransactionComponent { displayedColumns: string[] = [ 'transaction_id', - 'type_paiement', + //'type_paiement', 'type_paiement_label', 'marchand', 'service', diff --git a/src/app/utilisateurs/create-users/create-users.component.html b/src/app/utilisateurs/create-users/create-users.component.html index e7a2084..84dba81 100644 --- a/src/app/utilisateurs/create-users/create-users.component.html +++ b/src/app/utilisateurs/create-users/create-users.component.html @@ -80,11 +80,8 @@
--> -
-
-
@@ -94,9 +91,7 @@
Ajouter Utilisateur
+ method="post" >
--> + + diff --git a/src/app/utilisateurs/create-users/create-users.component.scss b/src/app/utilisateurs/create-users/create-users.component.scss index e69de29..540bc60 100644 --- a/src/app/utilisateurs/create-users/create-users.component.scss +++ b/src/app/utilisateurs/create-users/create-users.component.scss @@ -0,0 +1,3 @@ +.mt-n4 { + margin-top: -8rem; /* ajustez la valeur selon vos besoins */ +} \ No newline at end of file diff --git a/src/app/utilisateurs/utilisateurs.component.html b/src/app/utilisateurs/utilisateurs.component.html index 76358f7..487458c 100644 --- a/src/app/utilisateurs/utilisateurs.component.html +++ b/src/app/utilisateurs/utilisateurs.component.html @@ -4,6 +4,16 @@
+ +
Ajouter un utilisateur diff --git a/src/assets/images/clipboard2-fill.svg b/src/assets/images/clipboard2-fill.svg new file mode 100644 index 0000000..6898571 --- /dev/null +++ b/src/assets/images/clipboard2-fill.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file -- libgit2 0.27.1