Skip to content

Commit

Permalink
Dashboard design, + detail
Browse files Browse the repository at this point in the history
  • Loading branch information
@walidbosso
walidbosso committed Feb 8, 2024
1 parent 90a3495 commit dbfec39
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 59 deletions.
7 changes: 4 additions & 3 deletions angular-frontend/src/app/Admin/entreprise/create-entreprise/create-entreprise.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
<div class="card">
<div class="card-header card-header-danger">
<h4 class="card-title">Ajouter une entreprise</h4>
<div class="card-header">
<div class="card-category">
<!-- if we know the link we type normally, if like delete a list we use [] -->
<a
class="btn btn-outline-info float-right"

routerLink="/admin/entreprise/get"
class="btn btn-outline-primary float-right"
>All Entreprises</a
>
</div>
Expand Down Expand Up @@ -78,7 +79,7 @@ <h4 class="card-title">Ajouter une entreprise</h4>
[disabled]="isSubmitting"
(click)="addEntreprise()"
type="button"
class="form-control btn btn-outline-primary mt-3"
class="form-control btn btn-outline-info mt-3"
>
Ajouter
</button>
Expand Down
7 changes: 4 additions & 3 deletions angular-frontend/src/app/Admin/entreprise/edit-entreprise/edit-entreprise.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
<div class="card">
<div class="card-header card-header-danger">
<h4 class="card-title">Modifier une entreprise</h4>
<div class="card-header">
<div class="card-category">
<!-- if we know the link we type normally, if like delete a list we use [] -->
<a
class="btn btn-outline-info float-right"

routerLink="/admin/entreprise/get"
class="btn btn-outline-warning float-right"
>Toutes les Entreprises</a
>
</div>
Expand Down Expand Up @@ -76,7 +77,7 @@ <h4 class="card-title">Modifier une entreprise</h4>
[disabled]="isSubmitting"
(click)="editentreprise()"
type="button"
class="btn btn-outline-primary mt-3"
class="btn btn-outline-info mt-3"
>
Modifier
</button>
Expand Down
8 changes: 4 additions & 4 deletions angular-frontend/src/app/Admin/formation/create-formation/create-formation.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<div class="card">
<div class="card-header card-header-danger">
<h4 class="card-title">Ajouter une formation</h4>
<div class="card-header">
<div class="card-category">
<!-- if we know the link we type normally, if like delete a list we use [] -->
<a
class="btn btn-outline-info float-right"
class="btn btn-outline-warning float-right"
routerLink="/admin/dashboard"
>Toutes les formations</a
>
Expand Down Expand Up @@ -54,7 +54,7 @@ <h4 class="card-title">Ajouter une formation</h4>
accept="image/*"
/>
<label class="custom-file-label" for="imageFile"><small class="form-text text-muted">
Select a valid image file ( png).
Select a valid and less than 500KB size image file (png, jpeg, gif etc..)
</small></label>
</div>

Expand Down Expand Up @@ -195,7 +195,7 @@ <h4 class="card-title">Ajouter une formation</h4>
<button
[disabled]="isSubmitting"
type="submit"
class="form-control btn btn-outline-primary mt-3"
class="form-control btn btn-outline-info mt-3"
>
Ajouter la Formation
</button>
Expand Down
77 changes: 31 additions & 46 deletions angular-frontend/src/app/Admin/formation/dashboard/dashboard.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,35 @@
>Ajouter Formation</a
>
</p>
<div class="col-md-4 mb-14" *ngFor="let formation of formations">
<div class="col-md-4 mb-14" *ngFor="let formation of formations">
<div class="card card-chart">
<div [ngClass]="{ 'card-header-success': formation.formateur !== null, 'card-header-danger': formation.formateur === null,'card-header-warning': formation.entreprise === null}">
<div
[ngClass]="{
'card-header-success': formation.formateur !== null,
'card-header-danger': formation.formateur === null,
'card-header-warning': formation.entreprise === null
}"
>
<div class="img">

<img class="pt-4"
<img
class="pt-4"
*ngIf="formation.imageName !== null; else defaultImage"
[src]="'http://localhost:8080/formation/' + formation.id + '/image'"
[src]="
'http://localhost:8080/formation/' + formation.id + '/image'
"
width="200"
height="150"
/>
<ng-template #defaultImage>
<img class="pt-4" src="/assets/img/angular.png" width="200" height="150" />
<img
class="pt-4"
src="/assets/img/angular.png"
width="200"
height="150"
/>
</ng-template>


</div></div>
</div>
</div>
<div class="card-body">
<a
[routerLink]="['/admin/formation', formation.id, 'details']"
Expand Down Expand Up @@ -58,44 +70,17 @@ <h4 class="card-title">{{ formation.nom }}</h4>
{{ formation.description }} | Cout: {{ formation.cout }} Dh
</div>
</div>

</div>

<!-- <div class="col-md-4">
<div class="card card-chart">
<div class="card-header card-header-success">
<div class="img">
<img src="/assets/img/angular.png" />
</div>
</div>
<div class="card-body">
<h4 class="card-title">Numpy & Pandas</h4>
<p class="card-category">Data Analaysis</p>
</div>
<div class="card-footer">
<div class="stats"><i class="material-icons">24h</i> 200Dh</div>
</div>
</div>
</div> -->
<!-- <div class="col-md-4">
<div class="card card-chart">
<div class="card-header card-header-danger">
<div class="img">
<img src="/assets/img/angular.png" />
</div>
</div>
<div class="card-body">
<h4 class="card-title">Matplotlip & Seaborn</h4>
<p class="card-category">Data Visualisation</p>
</div>
<div class="card-footer">
<div class="stats"><i class="material-icons">13h</i> 100Dh</div>
</div>
</div>
</div> -->
</div>
</div>
</div>
<small class="btn btn-outline-success"
>Green: Formateur and entreprise are affected</small
>
<small class="btn btn-outline-warning"
>Orange: Formateur affected but entreprise NOT affected</small
>
<small class="btn btn-outline-danger"
>Red: Formateur and entreprise are NOT affected</small
>
</div>
<small class="btn btn-outline-success">Green: Formateur and entreprise are affected</small>
<small class="btn btn-outline-warning">Orange: Formateur affected but entreprise NOT affected</small>
<small class="btn btn-outline-danger">Red: Formateur and entreprise are NOT affected</small>
6 changes: 3 additions & 3 deletions angular-frontend/src/app/Admin/formation/edit-formation/edit-formation.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<div class="card">
<div class="card-header card-header-danger">
<h4 class="card-title">Modifier une formation</h4>
<div class="card-header">
<div class="card-category">
<!-- if we know the link we type normally, if like delete a list we use [] -->
<a
class="btn btn-outline-info float-right"
class="btn btn-outline-warning float-right"
routerLink="/admin/dashboard"
>Toutes les formations</a
>
Expand Down Expand Up @@ -154,7 +154,7 @@ <h4 class="card-title">Modifier une formation</h4>
[disabled]="isSubmitting"
(click)="editFormation()"
type="button"
class="form-control btn btn-outline-primary mt-3"
class="form-control btn btn-outline-info mt-3"
>
Modifier la formation
</button>
Expand Down

0 comments on commit dbfec39

Please sign in to comment.