Refonte agence et BU (inversion)

src/app/app.component.html

@@ -61,13 +61,13 @@
     <a class="toolbar-button" routerLink="/home">Home</a>
   </nav>
   <nav>
-    <a class="toolbar-button" routerLink="/collaborateurs">Collaborateurs</a>
+    <a class="toolbar-button" routerLink="/businessunits">Business Units</a>
   </nav>
   <nav>
     <a class="toolbar-button" routerLink="/agences">Agences</a>
   </nav>
   <nav>
-    <a class="toolbar-button" routerLink="/businessunits">Business Units</a>
+    <a class="toolbar-button" routerLink="/collaborateurs">Collaborateurs</a>
   </nav>
 </div>
 

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

@@ -14,6 +14,17 @@
       </div>
     </div>
 
+    <div class="form-group col-12 col-md-6">
+      <label class="form-label">Business Unit</label>
+      <select class="form-select" formControlName="businessUnitId" id="businessUnit-select" [ngClass]="{ 'is-invalid': submitted && f.businessUnitId.errors }">
+        <option value="" disabled selected>Choisissez la business unit de cette agence</option>
+        <option *ngFor="let businessUnit of businessUnits" [ngValue]="businessUnit.id">{{businessUnit.name}}</option>
+      </select>
+      <div *ngIf="submitted && f.businessUnitId.errors" class="invalid-feedback">
+        <div *ngIf="f.businessUnitId.errors.required">Vous devez choisir la business unit à laquelle appartient l'agence </div>
+      </div>
+    </div>
+
 
     <div>
       <button (click)="goBack()">Retour</button>

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

@@ -4,6 +4,8 @@ import {ActivatedRoute} from "@angular/router";
 import {AgenceService} from "../../../services/agence.service";
 import {Location} from "@angular/common";
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {Businessunit} from "../../../interfaces/businessunit";
+import {BusinessunitService} from "../../../services/businessunit.service";
 
 @Component({
   selector: 'app-agence-edit',
@@ -11,7 +13,9 @@ import {FormBuilder, FormGroup, Validators} from '@angular/forms';
   styleUrls: ['./agence-edit.component.scss']
 })
 export class AgenceEditComponent implements OnInit {
-  agence = {} as Agence ;
+  agence = {} as Agence;
+  businessUnits : Businessunit[] = [];
+  businessUnit = {} as Businessunit ;
 
   registerForm!: FormGroup;
   submitted = false;
@@ -19,14 +23,17 @@ export class AgenceEditComponent implements OnInit {
   constructor(
     private route: ActivatedRoute,
     private agenceService: AgenceService,
+    private businessUnitService: BusinessunitService,
     private location: Location,
     private formBuilder: FormBuilder
   ) { }
 
   ngOnInit(): void {
+    this.getBusinessUnits()
     this.getAgence()
     this.registerForm = this.formBuilder.group({
-      name: ['', Validators.required]
+      name: ['', Validators.required],
+      businessUnitId:['',Validators.required]
     });
   }
 
@@ -64,5 +71,9 @@ export class AgenceEditComponent implements OnInit {
     this.submitted = false;
     this.registerForm.reset();
   }
+  getBusinessUnits():void {
+    this.businessUnitService.getBusinessunits()
+      .subscribe(businessunits => this.businessUnits = businessunits);
+  }
 
 }

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

@@ -12,6 +12,17 @@
       </div>
     </div>
 
+    <div class="form-group col-12 col-md-6">
+      <label class="form-label">Business Unit</label>
+      <select class="form-select" formControlName="businessUnitId" id="businessUnit-select" [ngClass]="{ 'is-invalid': submitted && f.businessUnitId.errors }">
+        <option value="" disabled selected>Choisissez la business unit de cette agence</option>
+        <option *ngFor="let businessUnit of businessUnits" [ngValue]="businessUnit.id">{{businessUnit.name}}</option>
+      </select>
+      <div *ngIf="submitted && f.businessUnitId.errors" class="invalid-feedback">
+        <div *ngIf="f.businessUnitId.errors.required">Vous devez choisir la business unit à laquelle appartient l'agence </div>
+      </div>
+    </div>
+
 
     <div>
       <button type="submit">Créer l'agence</button>

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

@@ -3,6 +3,8 @@ import {Agence} from "../../interfaces/agence";
 import {HttpClient} from "@angular/common/http";
 import {AgenceService} from "../../services/agence.service";
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {Businessunit} from "../../interfaces/businessunit";
+import {BusinessunitService} from "../../services/businessunit.service";
 
 @Component({
   selector: 'app-agence',
@@ -11,7 +13,9 @@ import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 })
 export class AgenceComponent implements OnInit {
   agences : Agence[] = [];
-  agence = {} as Agence ;
+  agence = {} as Agence;
+  businessUnits : Businessunit[] = [];
+  businessUnit = {} as Businessunit ;
 
   registerForm!: FormGroup;
   submitted = false;
@@ -19,13 +23,16 @@ export class AgenceComponent implements OnInit {
   constructor(
     private http : HttpClient,
     private agenceService: AgenceService,
+    private businessUnitService: BusinessunitService,
     private formBuilder: FormBuilder
   ) { }
 
   ngOnInit(): void {
     this.getAgences();
+    this.getBusinessUnits();
     this.registerForm = this.formBuilder.group({
-      name: ['', Validators.required]
+      name: ['', Validators.required],
+      businessUnitId: ['',Validators.required]
     });
   }
 
@@ -34,6 +41,11 @@ export class AgenceComponent implements OnInit {
       .subscribe(agences => this.agences = agences);
   }
 
+  getBusinessUnits() {
+    this.businessUnitService.getBusinessunits()
+      .subscribe(businessunits => this.businessUnits = businessunits);
+  }
+
   add(agence: Agence): void {
     this.agenceService.addAgence(agence)
       .subscribe(agence => {
@@ -47,7 +59,8 @@ export class AgenceComponent implements OnInit {
     if (this.registerForm.invalid) {
       return;
     }
-    this.agence = this.registerForm.value
+    this.agence.name = this.registerForm.value.name
+    this.agence.businessUnitId = this.registerForm.value.businessUnitId
     this.add(this.agence)
   }
 
@@ -58,4 +71,5 @@ export class AgenceComponent implements OnInit {
     this.registerForm.reset();
   }
 
+
 }

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

@@ -14,17 +14,6 @@
       </div>
     </div>
 
-    <div class="form-group col-12 col-md-6">
-      <label class="form-label">Agence</label>
-      <select class="form-select" formControlName="agenceId" id="agence-select" [ngClass]="{ 'is-invalid': submitted && f.agenceId.errors }">
-        <option value="" disabled selected>Choisissez l'agence de cette business unit</option>
-        <option *ngFor="let agence of agences" [ngValue]="agence.id">{{agence.name}}</option>
-      </select>
-      <div *ngIf="submitted && f.agenceId.errors" class="invalid-feedback">
-        <div *ngIf="f.agenceId.errors.required">Vous devez choisir l'agence à laquelle appartient la business unit</div>
-      </div>
-    </div>
-
     <div>
       <button (click)="goBack()">Retour</button>
       <button type="submit">Sauvegarder les changements</button>

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

@@ -34,8 +34,7 @@ export class BusinessunitEditComponent implements OnInit {
     this.getBusinessunit();
     this.getAgences();
     this.registerForm = this.formBuilder.group({
-      name: ['', Validators.required],
-      agenceId: ['',Validators.required]
+      name: ['', Validators.required]
     });
   }
 
@@ -75,7 +74,6 @@ export class BusinessunitEditComponent implements OnInit {
       return;
     }
     this.businessunit.name = this.registerForm.value.name
-    this.businessunit.agenceId = this.registerForm.value.agenceId
     this.save()
   }
 

src/app/components/businessunit/businessunit.component.html

@@ -12,17 +12,6 @@
       </div>
     </div>
 
-    <div class="form-group col-12 col-md-6">
-      <label class="form-label">Agence</label>
-      <select class="form-select" formControlName="agenceId" id="agence-select" [ngClass]="{ 'is-invalid': submitted && f.agenceId.errors }">
-        <option value="" disabled selected>Choisissez l'agence de cette business unit</option>
-        <option *ngFor="let agence of agences" [ngValue]="agence.id">{{agence.name}}</option>
-      </select>
-      <div *ngIf="submitted && f.agenceId.errors" class="invalid-feedback">
-        <div *ngIf="f.agenceId.errors.required">Vous devez choisir l'agence à laquelle appartient la business unit</div>
-      </div>
-    </div>
-
     <div>
       <button type="submit">Créer la business unit</button>
       <button type="reset" (click)="onReset()">Effacer</button>

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

@@ -2,8 +2,6 @@ import { Component, OnInit } from '@angular/core';
 import {Businessunit} from "../../interfaces/businessunit";
 import {HttpClient} from "@angular/common/http";
 import {BusinessunitService} from "../../services/businessunit.service";
-import {Agence} from "../../interfaces/agence";
-import {AgenceService} from "../../services/agence.service";
 import {FormBuilder, FormGroup, Validators} from "@angular/forms";
 
 @Component({
@@ -15,8 +13,6 @@ export class BusinessunitComponent implements OnInit {
 
   businessunits : Businessunit[] = [];
   businessunit = {} as Businessunit ;
-  agences : Agence[] = [];
-  agence = {} as Agence ;
 
   registerForm!: FormGroup;
   submitted = false;
@@ -24,16 +20,13 @@ export class BusinessunitComponent implements OnInit {
   constructor(
     private http : HttpClient,
     private businessunitService: BusinessunitService,
-    private agenceService: AgenceService,
     private formBuilder: FormBuilder
   ) { }
 
   ngOnInit(): void {
     this.getBusinessunits();
-    this.getAgences();
     this.registerForm = this.formBuilder.group({
       name: ['', Validators.required],
-      agenceId: ['',Validators.required]
     });
   }
 
@@ -42,11 +35,6 @@ export class BusinessunitComponent implements OnInit {
       .subscribe(businessunits => this.businessunits = businessunits);
   }
 
-  getAgences():void {
-    this.agenceService.getAgences()
-      .subscribe(agences => this.agences = agences);
-  }
-
   add(businessunit: Businessunit): void {
     this.businessunitService.addBusinessunit(businessunit)
       .subscribe(businessunit => {

src/app/interfaces/agence.ts

@@ -1,4 +1,5 @@
 export interface Agence {
   name: string;
   id: number;
+  businessUnitId : number;
 }

src/app/interfaces/businessunit.ts

@@ -1,5 +1,4 @@
 export interface Businessunit {
   name: string;
   id: number;
-  agenceId : number;
 }

src/app/services/agence.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import {HttpClient, HttpHeaders} from "@angular/common/http";
 import {Observable} from "rxjs";
 import {Agence} from "../interfaces/agence";
-import {agencesUrl} from "../../ressources/routes/routesPreprod";
+import {agencesUrl} from "../../ressources/routes/routes";
 
 @Injectable({
   providedIn: 'root'

src/app/services/businessunit.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import {HttpClient, HttpHeaders} from "@angular/common/http";
 import {Observable} from "rxjs";
 import {Businessunit} from "../interfaces/businessunit";
-import {businessunitsUrl} from "../../ressources/routes/routesPreprod";
+import {businessunitsUrl} from "../../ressources/routes/routes";
 
 @Injectable({
   providedIn: 'root'

src/app/services/collaborateur.service.ts

@@ -2,7 +2,7 @@ import {Collaborateur} from "../interfaces/collaborateur";
 import {Injectable} from '@angular/core';
 import {Observable} from "rxjs";
 import {HttpClient, HttpHeaders} from "@angular/common/http";
-import {collaborateursUrl} from "../../ressources/routes/routesPreprod";
+import {collaborateursUrl} from "../../ressources/routes/routes";
 
 
 @Injectable({providedIn: 'root'})