diff --git a/src/app/ep/details-ep/details-ep.component.html b/src/app/ep/details-ep/details-ep.component.html
index ab9bd54..a9ecfef 100644
--- a/src/app/ep/details-ep/details-ep.component.html
+++ b/src/app/ep/details-ep/details-ep.component.html
@@ -52,7 +52,9 @@
-
+
+
+
diff --git a/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.html b/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.html
index f051d35..7755c66 100644
--- a/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.html
+++ b/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.html
@@ -1 +1,2 @@
-Consultation demandes formation
+Aucune demande de formation
+
\ No newline at end of file
diff --git a/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.ts b/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.ts
index 8755c96..ad8523c 100644
--- a/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.ts
+++ b/src/app/ep/details-ep/ep-demandes-formation/ep-demandes-formation.component.ts
@@ -1,13 +1,17 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
+import { DemandeFormationDTO } from '@shared/api-swagger';
/**
* Composant pour ajouter et voir les demandes de formation
*/
@Component({
- selector: 'app-ep-demandes-formation',
+ selector: 'ep-demandes-formation',
templateUrl: './ep-demandes-formation.component.html'
})
export class EpDemandesFormationComponent {
+ @Input() demandesFormation : Array;
+ estAffichageEP : boolean = true;
+ displayedColumns : Array = ["libelle", "description", "etat", "demanderh"];
constructor() {}
diff --git a/src/app/ep/ep.module.ts b/src/app/ep/ep.module.ts
index 7a07b52..7299941 100644
--- a/src/app/ep/ep.module.ts
+++ b/src/app/ep/ep.module.ts
@@ -20,6 +20,7 @@ import { EpCommentairesAssistantComponent } from "./details-ep/ep-commentaires-a
import { EpEngagementsCompenent } from "./details-ep/ep-engagements/ep-engagements.component";
import { EpPropositionsDatesComponent } from "./details-ep/ep-propositions-dates/ep-propositions-dates.component";
import { EpChoixDateComponent } from "./details-ep/ep-choix-date/ep-choix-date.component";
+import { EpDemandesFormationComponent } from "./details-ep/ep-demandes-formation/ep-demandes-formation.component";
/**
* Module de l'ep
@@ -28,7 +29,8 @@ import { EpChoixDateComponent } from "./details-ep/ep-choix-date/ep-choix-date.c
declarations: [
EpComponent, EpSignesComponent, DetailsEPComponent, EpObjectifsComponent,
EpParticipantsComponent, EpDemandeDelegationComponent, EpCommentairesAssistantComponent,
- EpEngagementsCompenent, EpPropositionsDatesComponent, EpChoixDateComponent
+ EpEngagementsCompenent, EpPropositionsDatesComponent, EpChoixDateComponent,
+ EpDemandesFormationComponent
],
exports: [EpComponent, DetailsEPComponent
],
diff --git a/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.html b/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.html
index 690a6a6..104d24b 100644
--- a/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.html
+++ b/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.html
@@ -105,6 +105,17 @@
+
+ Libellé
+ {{row.libelle}}
+
+
+
+ Description
+ {{row.description}}
+
+
+
RĂ©ponse
{{afficherEtat(row.etatDemande)}}
diff --git a/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.ts b/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.ts
index 11d9a94..b928741 100644
--- a/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.ts
+++ b/src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.ts
@@ -126,7 +126,9 @@ export class DemandesFormationTableComponent implements OnInit {
ngOnInit() {
if(this.estAffichageEP) {
this.taille = this.demandesFormation.length;
+ this.parPage = this.taille;
this.dataSource = new MatTableDataSource(this.demandesFormation);
+ this.chargement = false;
}
else
this.setBUsId();