Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1 : Building the application
-FROM node:16-alpine3.15 as build-step
+FROM node:16-alpine3.14 as build-step
 
 RUN mkdir -p /app
 
@@ -12,7 +12,7 @@ RUN npm install
 RUN npm run build --prod
 
 # Stage 2 : Deploying the application on Nginx
-FROM nginx:1.23.1-alpine
+FROM nginx:1.17.1-alpine
 
 RUN rm -rf /usr/share/nginx/html/* && rm -rf /etc/nginx/nginx.conf
 COPY ./nginx.conf /etc/nginx/nginx.conf

src/app/components/agence/agence-add/agence-add.component.ts

@@ -14,8 +14,11 @@ import {ToastrService} from "ngx-toastr";
 })
 export class AgenceAddComponent implements OnInit {
 
+  agences: Agence[] = [];
   agence = {} as Agence;
   businessUnits: Businessunit[] = [];
+  businessUnit = {} as Businessunit;
+
   registerForm!: FormGroup;
   submitted = false;
 
@@ -33,6 +36,7 @@ export class AgenceAddComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    this.getAgences();
     this.getBusinessUnits();
     this.registerForm = this.formBuilder.group({
       name: ['', Validators.required],
@@ -40,11 +44,27 @@ export class AgenceAddComponent implements OnInit {
     });
   }
 
+  getAgences(): void {
+    this.agenceService.getAgences()
+      .subscribe(agences => this.agences = agences);
+  }
+
   getBusinessUnits() {
     this.businessUnitService.getBusinessunits()
       .subscribe(businessunits => this.businessUnits = businessunits);
   }
 
+  add(agence: Agence): void {
+    this.agenceService.addAgence(agence)
+      .subscribe(agence => {
+          this.agences.push(agence);
+          this.showSuccess();
+        },
+        () => {
+          this.showError()
+        });
+  }
+
   onSubmit() {
     this.submitted = true;
 
@@ -53,13 +73,7 @@ export class AgenceAddComponent implements OnInit {
     }
     this.agence.name = this.registerForm.value.name
     this.agence.businessUnitId = this.registerForm.value.businessUnitId
-    this.agenceService.addAgence(this.agence)
+    this.add(this.agence)
-      .subscribe(() => {
-          this.showSuccess();
-        },
-        () => {
-          this.showError()
-        });
   }
 
   onReset() {

src/app/components/agence/agence-edit/agence-edit.component.html

@@ -33,7 +33,7 @@
     <div>
       <button type="submit">Sauvegarder les changements</button>
       <button type="reset">Effacer</button>
-      <button (click)="goBack()" type="button">Retour</button>
+      <button type="button" (click)="goBack()">Retour</button>
     </div>
   </form>
 

src/app/components/agence/agence-edit/agence-edit.component.ts

@@ -17,6 +17,7 @@ import {ToastrService} from "ngx-toastr";
 })
 export class AgenceEditComponent implements OnInit {
   businessUnits: Businessunit[] = [];
+  businessUnit = {} as Businessunit;
   agence = {} as Agence;
 
   agenceObservable!: Observable<Agence>;

src/app/components/agence/agence.component.ts

@@ -12,7 +12,9 @@ import {BusinessunitService} from "../../services/businessunit.service";
 })
 export class AgenceComponent implements OnInit {
   agences: Agence[] = [];
+  agence = {} as Agence;
   businessUnits: Businessunit[] = [];
+  businessUnit = {} as Businessunit;
 
 
   constructor(

src/app/components/businessunit/businessunit.component.ts

@@ -13,6 +13,7 @@ import {FormGroup} from "@angular/forms";
 export class BusinessunitComponent implements OnInit {
 
   businessunits: Businessunit[] = [];
+  businessunit = {} as Businessunit;
 
   registerForm!: FormGroup;
   submitted = false;

src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts

@@ -18,8 +18,11 @@ export class CollaborateurAddComponent implements OnInit {
   collaborateurs: Collaborateur[] = [];
   collaborateur = {} as Collaborateur;
   businessUnits: Businessunit[] = [];
+  businessUnit = {} as Businessunit;
 
   errorValue: number = 0;
+  rDate: String = "";
+  bDate: String = "";
 
   registerForm!: FormGroup;
   submitted = false;
@@ -53,6 +56,12 @@ export class CollaborateurAddComponent implements OnInit {
       resignationDate: [],
       businessUnitId: ['', Validators.required],
     });
+    if (this.collaborateur.resignationDate) {
+      this.rDate = new Date(this.collaborateur.resignationDate).toISOString().split('T')[0];
+    }
+    if (this.collaborateur.birthDate) {
+      this.bDate = new Date(this.collaborateur.birthDate).toISOString().split('T')[0];
+    }
   }
 
   getCollaborateurs(): void {

src/app/components/periode-essai/periode-essai-add/periode-essai-add.component.html

@@ -7,6 +7,8 @@
     <select [ngClass]="{ 'is-invalid': submitted && f.collaborateurId.errors }" class="form-select"
             formControlName="collaborateurId"
             id="collaborateur-select">
+      <!--<option [defaultSelected]="collaborateur"
+              [ngValue]="collaborateur.id">{{collaborateur.name}} {{collaborateur.firstName}}</option>-->
       <option *ngFor="let collaborateur of collaborateurs"
               [ngValue]="collaborateur.id">{{collaborateur.name}} {{collaborateur.firstName}}</option>
     </select>