diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 5e2984b..f8711b0 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -23,7 +23,6 @@ export class AppComponent implements OnInit {
).subscribe(() => {
const rt = this.getChild(this.activatedRoute);
rt.data.subscribe(data => {
- console.log(data);
this.titleService.setTitle(data.title)});
});
}
diff --git a/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html b/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html
index ff792e0..ab3815c 100644
--- a/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html
+++ b/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html
@@ -32,7 +32,7 @@
-
+
@@ -88,5 +88,7 @@
*Tous les champs sont obligatoires
-
+
+
+
diff --git a/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.ts b/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.ts
index 8376764..c9a256f 100644
--- a/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.ts
+++ b/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.ts
@@ -4,6 +4,7 @@ import {HttpClient} from "@angular/common/http";
import {CollaborateurService} from "../../../services/collaborateur.service";
import {BusinessunitService} from "../../../services/businessunit.service";
import {Businessunit} from "../../../interfaces/businessunit";
+import { DatePipe } from '@angular/common';
@Component({
selector: 'app-collaborateur-detail',
@@ -14,19 +15,26 @@ export class CollaborateurDetailComponent implements OnInit {
businessunits : Businessunit[] = [];
collaborateurs : Collaborateur[] = [];
+ rDate : String = "";
@Input()
- collaborateur = {} as Collaborateur ;
+ collaborateur = {} as Collaborateur;
constructor(
private http : HttpClient,
private collaborateurService: CollaborateurService,
private businessunitService: BusinessunitService
- ) { }
+ ) {}
+
ngOnInit(): void {
this.getCollaborateurs();
this.getBusinessunits();
+ if (this.collaborateur.resignationDate) {
+ this.rDate = new Date(this.collaborateur.resignationDate).toISOString().split('T')[0];
+ console.log(this.rDate)
+ console.log(this.collaborateur.resignationDate)
+ }
}
getCollaborateurs():void {
@@ -39,4 +47,10 @@ export class CollaborateurDetailComponent implements OnInit {
.subscribe(businessunits => this.businessunits = businessunits);
}
+ onDateChange($event: any):void {
+ console.log($event.target)
+ this.collaborateur.resignationDate = new Date($event.target.value);
+ console.log(this.rDate)
+ console.log(this.collaborateur.resignationDate)
+ }
}
diff --git a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
index 7da33e1..d35a5d2 100644
--- a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
+++ b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
@@ -34,6 +34,7 @@ export class CollaborateurEditComponent implements OnInit {
save():void{
if (this.collaborateur){
+ console.log("SAVE",this.collaborateur.resignationDate)
this.collaborateurService.updateCollaborateur(this.collaborateur)
.subscribe(()=>this.goBack());
}
diff --git a/src/app/components/collaborateur/collaborateur.component.ts b/src/app/components/collaborateur/collaborateur.component.ts
index 7d5342d..1210271 100644
--- a/src/app/components/collaborateur/collaborateur.component.ts
+++ b/src/app/components/collaborateur/collaborateur.component.ts
@@ -27,7 +27,6 @@ export class CollaborateurComponent implements OnInit {
}
add(collaborateur: Collaborateur): void {
- console.log(collaborateur);
this.collaborateurService.addCollaborateur(collaborateur)
.subscribe(collaborateur => {
this.collaborateurs.push(collaborateur);
diff --git a/src/app/services/agence.service.ts b/src/app/services/agence.service.ts
index e1c80ac..0eb61b7 100644
--- a/src/app/services/agence.service.ts
+++ b/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/routes";
+import {agencesUrl} from "../../ressources/routes/routesPréprod";
@Injectable({
providedIn: 'root'
diff --git a/src/app/services/businessunit.service.ts b/src/app/services/businessunit.service.ts
index bd17c09..49b1364 100644
--- a/src/app/services/businessunit.service.ts
+++ b/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/routes";
+import {businessunitsUrl} from "../../ressources/routes/routesPréprod";
@Injectable({
providedIn: 'root'
diff --git a/src/app/services/collaborateur.service.ts b/src/app/services/collaborateur.service.ts
index f410852..3177aec 100644
--- a/src/app/services/collaborateur.service.ts
+++ b/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/routes";
+import {collaborateursUrl} from "../../ressources/routes/routesPréprod";
@Injectable({providedIn: 'root'})
diff --git a/src/ressources/routes/routes.ts b/src/ressources/routes/routes.ts
index dbe2e02..cc03eda 100644
--- a/src/ressources/routes/routes.ts
+++ b/src/ressources/routes/routes.ts
@@ -1,3 +1,3 @@
-export const collaborateursUrl = 'https://localhost:8081/api/collaborateurs';
-export const agencesUrl = 'https://localhost:8081/api/agences';
-export const businessunitsUrl = 'https://localhost:8081/api/businessunits';
+// export const collaborateursUrl = 'https://localhost:5001/api/collaborateurs';
+// export const agencesUrl = 'https://localhost:5001/api/agences';
+// export const businessunitsUrl = 'https://localhost:5001/api/businessunits';
diff --git a/src/ressources/routes/routesPréprod.ts b/src/ressources/routes/routesPréprod.ts
new file mode 100644
index 0000000..50dc52e
--- /dev/null
+++ b/src/ressources/routes/routesPréprod.ts
@@ -0,0 +1,3 @@
+export const collaborateursUrl = 'https://collaborateur-epa.apsdigit.lan/api/collaborateurs';
+export const agencesUrl = 'https://collaborateur-epa.apsdigit.lan/api/agences';
+export const businessunitsUrl = 'https://collaborateur-epa.apsdigit.lan/api/businessunits';