StateEnum pour le statut modifié pour passer de number à string

src/app/formations/details-formation/formation.component.html

@@ -4,8 +4,8 @@
   <h2> {{formation.intitule}} </h2>
   <ng-container>
     <h3>Informations générales</h3>
-    <button mat-raised-button *ngIf="formation.statut!=2">Modifier</button>
-    <p>Etat : {{getStatut(formation.statut)}}</p>
+    <button mat-raised-button *ngIf="formation.statut!=statutEnum.Realise">Modifier</button>
+    <p>Etat : {{formation.statut}}</p>
     <p>{{dateTexte}} {{formation.dateDebut | date:'dd/MM/yyyy à hh:mm'}}</p>
     <p>Origine : {{formation.origine}}</p>
     <p>Organisme : {{ formation.organisme}}</p>

src/app/formations/details-formation/formation.component.ts

@@ -9,7 +9,6 @@ import {MatSort} from '@angular/material/sort';
 
 import { FormationsService } from '@shared/api-swagger/api/api';
 import { FormationModel } from "@shared/api-swagger/model/models";
-
 import { DisplayParticipation } from "@shared/displayInfo/displays";
 
 /**
@@ -19,6 +18,7 @@ import { DisplayParticipation } from "@shared/displayInfo/displays";
   templateUrl: './formation.component.html'
 })
 export class FormationComponent implements OnInit {
+  statutEnum = FormationModel.StatutEnum;
   formation:FormationModel;
   dateTexte:string = "Prévue le";
   formationSubscription: Subscription;
@@ -39,11 +39,11 @@ export class FormationComponent implements OnInit {
 
   initFormation(formation:FormationModel) {
     this.formation = formation;
-    if(this.formation.statut == 2) {
+    if(this.formation.statut == FormationModel.StatutEnum.Realise) {
       this.dateTexte = "Effecutée le";
       this.displayedColumns.push("evaluation");
     }
-    if(this.formation.statut == 3) {
+    if(this.formation.statut == FormationModel.StatutEnum.Annule) {
       this.dateTexte = "Initialement prévue le";
     }
     if(formation.participantsFormation != undefined && formation.participantsFormation.length != 0 ) {
@@ -72,6 +72,7 @@ export class FormationComponent implements OnInit {
     this.dataSource = new MatTableDataSource(this.participationsDisplay);
   }
 
+  /*
   getStatut(statut:number) {
     let value ="";
     switch(statut) {
@@ -90,7 +91,7 @@ export class FormationComponent implements OnInit {
     }
     return value;
   }
-
+  */
   ngOnDestroy() {
     if(this.formationSubscription != undefined) {
       this.formationSubscription.unsubscribe();

src/app/formations/formations.component.html

@@ -14,17 +14,17 @@
 
   <ng-container matColumnDef="date">
     <mat-header-cell *matHeaderCellDef>Date prévisionnelle</mat-header-cell>
-    <mat-cell *matCellDef="let row">{{ row.datePrevu }}</mat-cell>
+    <mat-cell *matCellDef="let row">{{ row.datePrevu | date:'dd/MM/yy à hh:mm' }}</mat-cell>
   </ng-container>
 
-  <!--<ng-container matColumnDef="origine">
-    <mat-header-cell></mat-header-cell>
-    <mat-cell *matCellDef="let row"></mat-cell>
-  </ng-container>-->
+  <ng-container matColumnDef="origine">
+    <mat-header-cell *matHeaderCellDef>Origine</mat-header-cell>
+    <mat-cell *matCellDef="let row"> {{ row.origine}}</mat-cell>
+  </ng-container>
 
   <ng-container matColumnDef="statut">
     <mat-header-cell *matHeaderCellDef>Statut</mat-header-cell>
-    <mat-cell *matCellDef="let row">{{ getStatut(row.statut) }}</mat-cell>
+    <mat-cell *matCellDef="let row">{{row.statut}}</mat-cell>
   </ng-container>
 
   <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>

src/app/formations/formations.component.ts

@@ -22,7 +22,7 @@ export class FormationsComponent implements OnInit {
   private formationsDisponiblesSubscription : Subscription;
 
   //displayedColumns: string[] = ["intitule", "participants", "date", "origine", "statut"]
-  displayedColumns: string[] = ["intitule", "participants", "date", "statut"]
+  displayedColumns: string[] = ["intitule", "origine", "participants", "date", "statut"]
 
   /**
     * source pour l'affichage des formations dans le tableau qui est affichée.
@@ -71,6 +71,9 @@ export class FormationsComponent implements OnInit {
       }
       formationDisplay.datePrevu = formation.dateDebut;
       formationDisplay.origine = formation.origine;
+      console.log(formation.origine);
+      console.log(formationDisplay.origine);
+      console.log("");
       formationDisplay.statut = formation.statut;
       this.formationsDisponibles.push(formationDisplay);
     }
@@ -80,7 +83,7 @@ export class FormationsComponent implements OnInit {
     this.dataSource.sort = this.sort;
   }
 
-
+  /*
   getStatut(statut:number) {
 
     let value ="";
@@ -100,7 +103,7 @@ export class FormationsComponent implements OnInit {
     }
     return value;
   }
-
+  */
 
   ngOnDestroy() {
     if(this.formationsDisponiblesSubscription != undefined) {

src/app/formations/new-formation/new-formation.component.ts

@@ -21,7 +21,7 @@ export class NewFormationComponent implements OnInit {
     {
       intitule: [""],
       origine: [""],
-      statut : [""],
+      statut : [FormationModel.StatutEnum.Planifie],
       dateDebut: [""],
       dateFin: [""],
       heure: [""],
@@ -36,6 +36,7 @@ export class NewFormationComponent implements OnInit {
   constructor(private fb: FormBuilder, private service:FormationsService, private router: Router) { }
 
   ngOnInit() {
+    console.log(FormationModel.StatutEnum);
   }
 
   ajouterFormation() {

src/app/shared/api-swagger/model/formationModel.ts

@@ -27,12 +27,12 @@ export interface FormationModel {
     participantsFormation?: Array<ParticipationFormationModel>;
 }
 export namespace FormationModel {
-    export type StatutEnum = 0 | 1 | 2 | 3;
+    export type StatutEnum = 'Planifiée' | 'Replanifiée' | 'Réalisée' | 'Annulée';
     export const StatutEnum = {
-        NUMBER_0: 0 as StatutEnum,
-        NUMBER_1: 1 as StatutEnum,
-        NUMBER_2: 2 as StatutEnum,
-        NUMBER_3: 3 as StatutEnum
+        Planifie: 'Planifiée' as StatutEnum,
+        Replanifie: 'Replanifiée' as StatutEnum,
+        Realise: 'Réalisée' as StatutEnum,
+        Annule: 'Annulée' as StatutEnum
     };
     export type TypeEnum = 'Externe' | 'Interne';
     export const TypeEnum = {