Commit 024de6ae by zadi francice

mise ajour du 12/06/2024

parent 818181b3
...@@ -42,9 +42,6 @@ ...@@ -42,9 +42,6 @@
_ngcontent-ng-c3352625633="" _ngcontent-ng-c3352625633=""
class="flex align-items-center justify-content-center bg-blue-100 border-round" class="flex align-items-center justify-content-center bg-blue-100 border-round"
style="width: 2.5rem; height: 2.5rem"> style="width: 2.5rem; height: 2.5rem">
<!-- <i
class="fal fa-gem position-absolute pos-right pos-bottom opacity-15 mb-n1 mr-n4"
style="font-size: 6rem"></i> -->
</div> </div>
</div> </div>
</div> </div>
......
...@@ -135,7 +135,7 @@ mat-card-title{ ...@@ -135,7 +135,7 @@ mat-card-title{
background-color: #f7e6ff; background-color: #f7e6ff;
} }
.border-round { .border-round {
border-radius: 10px; border-radius: 0;
} }
.p-3 { .p-3 {
padding: 1rem; padding: 1rem;
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="grid simple"> <div class="grid simple">
<div class="card">
<div class="card-title"> <div class="card-title">
<div class="card-body m-3"> <div class="card-body m-3">
<h4 class="mb-3">Liste des services</h4> <h4 class="mb-3">Liste des services</h4>
...@@ -35,10 +34,7 @@ ...@@ -35,10 +34,7 @@
#input /> #input />
</mat-form-field> </mat-form-field>
<mat-table <mat-table [dataSource]="dataSource" class="mat-elevation-z8">
[dataSource]="dataSource"
class="mat-elevation-z8">
<!-- Nom Column -->
<ng-container matColumnDef="service_id"> <ng-container matColumnDef="service_id">
<mat-header-cell *matHeaderCellDef class="text" <mat-header-cell *matHeaderCellDef class="text"
>ID</mat-header-cell >ID</mat-header-cell
...@@ -57,7 +53,6 @@ ...@@ -57,7 +53,6 @@
}}</mat-cell> }}</mat-cell>
</ng-container> </ng-container>
<!-- Description Column -->
<ng-container matColumnDef="description"> <ng-container matColumnDef="description">
<mat-header-cell *matHeaderCellDef class="text" <mat-header-cell *matHeaderCellDef class="text"
>Description</mat-header-cell >Description</mat-header-cell
...@@ -67,7 +62,6 @@ ...@@ -67,7 +62,6 @@
}}</mat-cell> }}</mat-cell>
</ng-container> </ng-container>
<!-- Marchand Column -->
<ng-container matColumnDef="marchand"> <ng-container matColumnDef="marchand">
<mat-header-cell *matHeaderCellDef class="text" <mat-header-cell *matHeaderCellDef class="text"
>Marchand</mat-header-cell >Marchand</mat-header-cell
...@@ -77,7 +71,6 @@ ...@@ -77,7 +71,6 @@
}}</mat-cell> }}</mat-cell>
</ng-container> </ng-container>
<!-- Actions Column -->
<ng-container matColumnDef="actions"> <ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef class="text" <mat-header-cell *matHeaderCellDef class="text"
>Actions</mat-header-cell >Actions</mat-header-cell
...@@ -111,10 +104,7 @@ ...@@ -111,10 +104,7 @@
<mat-header-row <mat-header-row
*matHeaderRowDef="displayedColumns"></mat-header-row> *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row <mat-row
*matRowDef=" *matRowDef="let row; columns: displayedColumns"></mat-row>
let row;
columns: displayedColumns
"></mat-row>
</mat-table> </mat-table>
<mat-paginator <mat-paginator
...@@ -131,5 +121,4 @@ ...@@ -131,5 +121,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
...@@ -8,3 +8,12 @@ ...@@ -8,3 +8,12 @@
.Ftext { .Ftext {
font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ font-size: 16px; /* Ajustez la taille de la police selon vos besoins */
} }
.card {
border-radius:0 !important;
--bs-card-bg: #ffffff61;
}
\ No newline at end of file
.card {
border-radius:0 !important;
--bs-card-bg: #ffffff61;
}
\ No newline at end of file
<!-- eslint-disable @angular-eslint/template/label-has-associated-control --> <!-- eslint-disable @angular-eslint/template/label-has-associated-control -->
<div class="page-title" style="margin-bottom: 10px"> <div class="page-title" style="margin-bottom: 10px">
<h4>Reversements</h4> <h4>Reversements</h4>
</div> <div class="content sm-gutter">
<!-- <div class="row" style="margin-top: 40px"> <div class="row justify-content-center">
<div class="col-md-3">
<label for="debut">De</label>
<input
type="date"
value="2024-04-16"
required=""
name="debut"
class="form-control form-control-sm" />
</div>
<div class="col-md-3">
<label for="fin">À</label>
<input
type="date"
value="2024-04-16"
required=""
name="fin"
class="form-control form-control-sm" />
</div>
<div class="col-md-2">
<label style="visibility: hidden">Recherche</label>
<div class="card-title">
<button class="btn btn-primary btn-sm">
Recherche <i class="fa fa-search"></i>
</button>
</div>
</div>
</div> -->
<div class="content sm-gutter">
<div class="row">
<div class="col-md-12 col-vlg-12 m-b-10"> <div class="col-md-12 col-vlg-12 m-b-10">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
...@@ -39,28 +10,7 @@ ...@@ -39,28 +10,7 @@
<div class="card"> <div class="card">
<div class="card-title"> <div class="card-title">
<div class="card-body m-3"> <div class="card-body m-3">
<div class="row" style="margin: auto"> <div class="row d-flex justify-content-center">
<!-- <div class="col-md-2">
<label for="operateurs">Opérateurs</label>
<select
class="form-control filtre"
[(ngModel)]="selectedOperateur"
id="operateurs"
placeholder="operateur"
style="width: 100%">
<option
*ngFor="let operateur of operateurs"
[value]="operateur.code">
{{ operateur.code }}
</option>
</select>
</div> -->
<!-- <div class="col-md-2">
<label for="services">Services</label>
<select class="form-control filtre" style="width: 100%">
<option value="">Tout</option>
</select>
</div> -->
<div class="col-md-3"> <div class="col-md-3">
<label for="debut">De</label> <label for="debut">De</label>
<input <input
...@@ -79,9 +29,7 @@ ...@@ -79,9 +29,7 @@
name="fin" name="fin"
class="form-control form-control-sm" /> class="form-control form-control-sm" />
</div> </div>
<div class="col-md-2"> <div class="col-md-2 d-flex align-items-end">
<label style="visibility: hidden">Recherche</label>
<div class="card-title">
<button <button
style="border-radius: 15px" style="border-radius: 15px"
class="btn btn-primary btn-sm" class="btn btn-primary btn-sm"
...@@ -99,8 +47,8 @@ ...@@ -99,8 +47,8 @@
</div> </div>
</div> </div>
</div> </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
style=" style="
border: 1px; border: 1px;
...@@ -115,15 +63,6 @@ ...@@ -115,15 +63,6 @@
#input /> #input />
</mat-form-field> </mat-form-field>
<mat-table #table [dataSource]="dataSource"> <mat-table #table [dataSource]="dataSource">
<!-- <ng-container matColumnDef="numReversement">
<mat-header-cell *matHeaderCellDef class="bold-text">
N°REVERSEMENT
</mat-header-cell>
<mat-cell *matCellDef="let element">
{{ element.numReversement }}
</mat-cell>
</ng-container> -->
<!-- Position Column --> <!-- Position Column -->
<ng-container matColumnDef="dateReversement"> <ng-container matColumnDef="dateReversement">
<mat-header-cell *matHeaderCellDef class="bold-text"> <mat-header-cell *matHeaderCellDef class="bold-text">
...@@ -138,7 +77,9 @@ ...@@ -138,7 +77,9 @@
<mat-header-cell *matHeaderCellDef class="bold-text"> <mat-header-cell *matHeaderCellDef class="bold-text">
Date demande Date demande
</mat-header-cell> </mat-header-cell>
<mat-cell *matCellDef="let element"> {{ element.dateDemande }} </mat-cell> <mat-cell *matCellDef="let element">
{{ element.dateDemande }}
</mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="montant"> <ng-container matColumnDef="montant">
...@@ -180,4 +121,5 @@ ...@@ -180,4 +121,5 @@
[pageSizeOptions]="[5, 10, 20]" [pageSizeOptions]="[5, 10, 20]"
[showFirstLastButtons]="true"> [showFirstLastButtons]="true">
</mat-paginator> </mat-paginator>
</div>
</div> </div>
...@@ -25,3 +25,12 @@ ...@@ -25,3 +25,12 @@
.p-4{ .p-4{
color: white; color: white;
} }
.card {
border-radius:0 !important;
--bs-card-bg: #ffffff61;
}
\ No newline at end of file
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<h4>Paiements</h4> <h4>Paiements</h4>
</div> </div>
<div class="content sm-gutter"> <!-- <div class="content sm-gutter">
<div class="row"> <div class="row">
<div class="col-md-12 col-vlg-12 m-b-10"> <div class="col-md-12 col-vlg-12 m-b-10">
<div class="row-fluid"> <div class="row-fluid">
...@@ -87,6 +87,76 @@ ...@@ -87,6 +87,76 @@
</div> </div>
</div> </div>
</div> </div>
</div> -->
<div class="content sm-gutter">
<div class="row">
<div class="col-md-12 col-vlg-12 m-b-10">
<div class="row-fluid">
<div class="span12">
<div class="grid simple">
<div class="card">
<div class="card-title">
<div class="card-body m-3">
<div class="row" style="margin: auto">
<div class="col-md-2">
<label for="operateurs">Opérateurs</label>
<!-- Add [(ngModel)]="selectedOperateur" to bind the selected value -->
<select
class="form-control filtre"
id="operateurs"
style="width: 100%"
[(ngModel)]="selectedOperateur">
<option
*ngFor="let operateur of operateurs"
[value]="operateur.code">
{{ operateur.code }}
</option>
</select>
</div>
<div class="col-md-2">
<label for="services">Services</label>
<select class="form-control filtre" style="width: 100%">
<option value="">Tout</option>
</select>
</div>
<div class="col-md-3">
<label for="debut">De</label>
<input
type="date"
value="2024-04-16"
required=""
name="debut"
class="form-control form-control-sm" />
</div>
<div class="col-md-3">
<label for="fin">À</label>
<input
type="date"
value="2024-04-16"
required=""
name="fin"
class="form-control form-control-sm" />
</div>
<div class="col-md-2">
<!-- Removed the hidden label -->
<!-- Wrapped the button in a div with class card-title -->
<div class="card-title">
<button
class="btn btn-primary btn-sm"
style="border-radius: 15px; box-sizing: border-box">
Recherche <i class="fa fa-search m-1"></i>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
<div class="example-container mat-elevation-z8" style="margin-top: 40px"> <div class="example-container mat-elevation-z8" style="margin-top: 40px">
......
...@@ -34,3 +34,11 @@ ...@@ -34,3 +34,11 @@
background-color:rgb(211, 54, 42); background-color:rgb(211, 54, 42);
border-radius:15px border-radius:15px
} }
.card {
border-radius:0 !important;
--bs-card-bg: #ffffff61;
}
\ No newline at end of file
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
id="services" id="services"
[(ngModel)]="selectedService" [(ngModel)]="selectedService"
name="selectedService"> name="selectedService">
<option value="">choisir un service</option> <option value="">choisir un ser</option>
<option <option
*ngFor="let service of services" *ngFor="let service of services"
[ngValue]="service"> [ngValue]="service">
......
...@@ -35,7 +35,12 @@ table { ...@@ -35,7 +35,12 @@ table {
color: white; color: white;
} }
.card {
border-radius:0 !important;
--bs-card-bg: #ffffff61;
}
.success-status { .success-status {
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
......
<!-- eslint-disable prettier/prettier -->
<!-- eslint-disable @angular-eslint/template/label-has-associated-control -->
<div class="content sm-gutter"> <div class="content sm-gutter">
<div class="mb-4">
<h4>Liste des utilisateurs</h4>
</div>
<div class="col-md-2"></div>
<div class="row"> <div class="row">
<div class="col-md-12 col-vlg-12 m-b-10"> <div class="col-md-12 col-vlg-12 m-b-10">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="grid simple"> <div class="grid simple">
<div class="card"> <div class="card-title"></div>
<div class="card-title"> <div class="content sm-gutter">
<div class="card-body m-3"> <div class="mb-4">
<div class="row" style="margin: auto"> <h4>Liste des utilisateurs</h4>
<div class="col-md-2">
<label for="operateurs">Opérateurs</label>
<select
class="form-control filtre"
[(ngModel)]="selectedOperateur"
id="operateurs"
placeholder="operateur"
style="width: 100%">
<option
*ngFor="let operateur of operateurs"
[value]="operateur.code">
{{ operateur.code }}
</option>
</select>
</div>
<div class="col-md-2">
<label for="services">Services</label>
<select class="form-control filtre" style="width: 100%">
<option value="">Tout</option>
</select>
</div>
<div class="col-md-3">
<label for="debut">De</label>
<input
type="date"
[(ngModel)]="startDate"
required
name="debut"
class="form-control form-control-sm" />
</div>
<div class="col-md-3">
<label for="fin">À</label>
<input
type="date"
[(ngModel)]="endDate"
required
name="fin"
class="form-control form-control-sm" />
</div>
<div class="col-md-2">
<label style="visibility: hidden">Recherche</label>
<div class="card-title">
<button
style="border-radius: 15px"
class="btn btn-primary btn-sm"
(click)="onSearch()">
Recherche <i class="fa fa-search m-1"></i>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
<div class="col-md-2"></div>
</div> </div>
</div>
<div class="page-title d-flex justify-content-between"> <div class="page-title d-flex justify-content-between">
<div class="col-m-5 text-right"> <div class="col-m-5 text-right">
<button class="btn btn-secondary m-5" style="border-radius: 15px"> <button
class="btn btn-secondary m-5"
style="border-radius: 15px">
Exporter <i class="fa fa-download m-1"></i> Exporter <i class="fa fa-download m-1"></i>
</button> </button>
</div> </div>
...@@ -87,17 +26,10 @@ ...@@ -87,17 +26,10 @@
class="btn btn-sl btn-success m-5"> class="btn btn-sl btn-success m-5">
Ajouter Ajouter
</a> </a>
</div> </div>
<div class="example-container mat-elevation-z8" style="margin-top: 40px"> <div
<!-- <mat-form-field> class="example-container mat-elevation-z8"
<mat-label>Filter</mat-label> style="margin-top: 40px">
<input
class="textFilter"
matInput
(keyup)="applyFilter($event)"
placeholder="Ex. ium"
#input />
</mat-form-field> -->
<mat-form-field> <mat-form-field>
<mat-label>Filter</mat-label> <mat-label>Filter</mat-label>
<input <input
...@@ -109,49 +41,76 @@ ...@@ -109,49 +41,76 @@
<mat-table [dataSource]="dataSource" matSort> <mat-table [dataSource]="dataSource" matSort>
<ng-container matColumnDef="id"> <ng-container matColumnDef="id">
<mat-header-cell *matHeaderCellDef mat-sort-header class="bold-text" <mat-header-cell
*matHeaderCellDef
mat-sort-header
class="bold-text"
>ID</mat-header-cell >ID</mat-header-cell
> >
<mat-cell *matCellDef="let user">{{ user.id }}</mat-cell> <mat-cell *matCellDef="let user">{{ user.id }}</mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="first_name"> <ng-container matColumnDef="first_name">
<mat-header-cell *matHeaderCellDef mat-sort-header class="bold-text" <mat-header-cell
*matHeaderCellDef
mat-sort-header
class="bold-text"
>Nom</mat-header-cell >Nom</mat-header-cell
> >
<mat-cell *matCellDef="let user">{{ user.first_name }}</mat-cell> <mat-cell *matCellDef="let user">{{
user.first_name
}}</mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="last_name"> <ng-container matColumnDef="last_name">
<mat-header-cell *matHeaderCellDef mat-sort-header class="bold-text" <mat-header-cell
*matHeaderCellDef
mat-sort-header
class="bold-text"
>Prénoms</mat-header-cell >Prénoms</mat-header-cell
> >
<mat-cell *matCellDef="let user">{{ user.last_name }}</mat-cell> <mat-cell *matCellDef="let user">{{
user.last_name
}}</mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="username"> <ng-container matColumnDef="username">
<mat-header-cell *matHeaderCellDef mat-sort-header class="bold-text" <mat-header-cell
*matHeaderCellDef
mat-sort-header
class="bold-text"
>Nom utilisateur</mat-header-cell >Nom utilisateur</mat-header-cell
> >
<mat-cell *matCellDef="let user">{{ user.username }}</mat-cell> <mat-cell *matCellDef="let user">{{
user.username
}}</mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="email"> <ng-container matColumnDef="email">
<mat-header-cell *matHeaderCellDef mat-sort-header class="bold-text" <mat-header-cell
*matHeaderCellDef
mat-sort-header
class="bold-text"
>Email</mat-header-cell >Email</mat-header-cell
> >
<mat-cell *matCellDef="let user">{{ user.email }}</mat-cell> <mat-cell *matCellDef="let user">{{ user.email }}</mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="role"> <ng-container matColumnDef="role">
<mat-header-cell *matHeaderCellDef mat-sort-header class="bold-text" <mat-header-cell
*matHeaderCellDef
mat-sort-header
class="bold-text"
>Rôle</mat-header-cell >Rôle</mat-header-cell
> >
<mat-cell *matCellDef="let user">{{ user.role }}</mat-cell> <mat-cell *matCellDef="let user">{{ user.role }}</mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="profile_photo"> <ng-container matColumnDef="profile_photo">
<mat-header-cell *matHeaderCellDef mat-sort-header class="bold-text" <mat-header-cell
*matHeaderCellDef
mat-sort-header
class="bold-text"
>Photo profil</mat-header-cell >Photo profil</mat-header-cell
> >
<mat-cell *matCellDef="let user"> <mat-cell *matCellDef="let user">
...@@ -164,7 +123,10 @@ ...@@ -164,7 +123,10 @@
</ng-container> </ng-container>
<ng-container matColumnDef="actions"> <ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef mat-sort-header class="bold-text" <mat-header-cell
*matHeaderCellDef
mat-sort-header
class="bold-text"
>Actions</mat-header-cell >Actions</mat-header-cell
> >
<mat-cell *matCellDef="let user" style="text-align: right"> <mat-cell *matCellDef="let user" style="text-align: right">
...@@ -177,23 +139,27 @@ ...@@ -177,23 +139,27 @@
href="#" href="#"
class="m-2" class="m-2"
[routerLink]="['/utilisateurs/edit-user', user.id]" [routerLink]="['/utilisateurs/edit-user', user.id]"
><mat-icon style="color: green" title="Modifier">edit</mat-icon></a ><mat-icon style="color: green" title="Modifier"
>edit</mat-icon
></a
> >
<!-- <a
href="#"
class="m-2"
(click)="onDelete(user.id)"
[routerLink]="['/utilisateurs/view-user']">
<mat-icon style="color: red" title="Supprimer">delete_sweep</mat-icon>
</a> -->
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row> <mat-header-row
<mat-row *matRowDef="let row; columns: displayedColumns"></mat-row> *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row
*matRowDef="let row; columns: displayedColumns"></mat-row>
</mat-table> </mat-table>
<mat-paginator <mat-paginator
[pageSize]="5" [pageSize]="5"
[pageSizeOptions]="[5, 10, 20, 40, 60, 70, 80, 90, 100]" [pageSizeOptions]="[5, 10, 20, 40, 60, 70, 80, 90, 100]"
[showFirstLastButtons]="true"></mat-paginator> [showFirstLastButtons]="true"></mat-paginator>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
<!-- </div> -->
.card {
border-radius:0 !important;
--bs-card-bg: #ffffff61;
}
\ No newline at end of file
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