From ea72dbc48b2f3a6d584dd8269de7d4a085ae626a Mon Sep 17 00:00:00 2001 From: Clement FERRERE Date: Mon, 28 Mar 2022 17:24:48 +0200 Subject: [PATCH 1/7] changement des collaborateurs avec des classes BootStrap. Responsive. A valider. --- .../collaborateur-detail.component.html | 130 +++++++++++------- .../collaborateur-edit.component.html | 3 +- .../collaborateur.component.html | 26 ++-- 3 files changed, 102 insertions(+), 57 deletions(-) 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 4085820..69a01c6 100644 --- a/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html +++ b/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html @@ -1,54 +1,92 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameFirst NameBirth DateGenderStatusChildren NumberAddressTelephonePersonal MailApside MailResignation Date
- - - - -
- - *Tous les champs sont obligatoires - +
+ +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+ +
+ + +
+
+ +
+ +
+ + +
+ +
+ + +
+
+ + +
+ + *Tous les champs sont obligatoires +
diff --git a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html index 626e1f6..827ca61 100644 --- a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html +++ b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html @@ -2,7 +2,8 @@

{{collaborateur.name | uppercase}} {{collaborateur.firstName | uppercase}}

-
id : {{collaborateur.id}}
+ +
{{collaborateur.id}}
diff --git a/src/app/components/collaborateur/collaborateur.component.html b/src/app/components/collaborateur/collaborateur.component.html index 21ef82a..1295ecc 100644 --- a/src/app/components/collaborateur/collaborateur.component.html +++ b/src/app/components/collaborateur/collaborateur.component.html @@ -2,19 +2,25 @@

Collaborateurs

- - - - - - +
NameFirst NameApside Mail
+ + + + + + + + + - - - - + + + + + +
IDNameFirst NameApside Mail
{{collaborateur.name}} {{collaborateur.firstName}} {{collaborateur.apsideMail}} Modifier {{collaborateur.id}} {{collaborateur.name}} {{collaborateur.firstName}} {{collaborateur.apsideMail}} Modifier
-- 2.36.3 From 2badb26a691f411c54beb3c6f48aa2a2b963fb0e Mon Sep 17 00:00:00 2001 From: Clement FERRERE Date: Wed, 30 Mar 2022 09:45:31 +0200 Subject: [PATCH 2/7] =?UTF-8?q?Textes=20des=20collaborateurs=20en=20Fran?= =?UTF-8?q?=C3=A7ais?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.component.html | 1 - .../collaborateur-detail.component.html | 42 +++++++++---------- .../collaborateur-edit.component.html | 2 +- .../collaborateur.component.html | 6 +-- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 5c6ec73..507b697 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -22,7 +22,6 @@ } .toolbar { - position: absolute; top: 0; left: 0; right: 0; 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 69a01c6..0444306 100644 --- a/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html +++ b/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html @@ -3,41 +3,41 @@
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
@@ -49,25 +49,25 @@
- - + +
- - + +
- - + +
- + - - +
+ + + + + + + + + + + + + +
IDNom
{{businessunit.id}} {{businessunit.name}} Modifier
+
+

Ajouter une Business Unit :

+ +
+ +
+ + +
+ +
+ +
+ +
+ + +
-
diff --git a/src/app/components/collaborateur/collaborateur.component.html b/src/app/components/collaborateur/collaborateur.component.html index 716ebda..624a987 100644 --- a/src/app/components/collaborateur/collaborateur.component.html +++ b/src/app/components/collaborateur/collaborateur.component.html @@ -1,7 +1,7 @@

Collaborateurs

-
+
-- 2.36.3 From bd75ddd3c05711df01a35791ea157e2042457a9d Mon Sep 17 00:00:00 2001 From: Clement FERRERE Date: Wed, 30 Mar 2022 15:03:50 +0200 Subject: [PATCH 4/7] =?UTF-8?q?Fix=20collaborateurs,=20reprise=20des=20Age?= =?UTF-8?q?nces=20suite=20=C3=A0=20la=20reco.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/agence/agence.component.html | 44 ++++++++++--------- .../collaborateur-detail.component.html | 8 ++-- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/app/components/agence/agence.component.html b/src/app/components/agence/agence.component.html index 97ca12b..bf84f77 100644 --- a/src/app/components/agence/agence.component.html +++ b/src/app/components/agence/agence.component.html @@ -1,31 +1,35 @@

Agences

-
- - - - - - - -
Name
{{agence.name}} Modifier
- -

Ajouter une agence :

- -
- +
+
+ - - - - + + + + + + + + + +
Name
- - IDNom
{{agence.id}} {{agence.name}} Modifier
+

Ajouter une agence :

+ +
+ +
+ + + +
+
+ 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 7ecf097..ff792e0 100644 --- a/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html +++ b/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html @@ -27,7 +27,7 @@
- +
@@ -41,8 +41,8 @@
- - + +
@@ -64,7 +64,7 @@
-
+
-- 2.36.3 From 1058fb0a7e17abc84acae5541f818960b450c93b Mon Sep 17 00:00:00 2001 From: Clement FERRERE Date: Wed, 30 Mar 2022 15:29:11 +0200 Subject: [PATCH 5/7] Factorisation detail BU et Agence + refacto Agence --- src/app/app.module.ts | 5 ++- .../agence-detail.component.html | 8 +++++ .../agence-detail.component.scss | 0 .../agence-detail/agence-detail.component.ts | 31 +++++++++++++++++ .../agence-edit/agence-edit.component.html | 15 +-------- .../components/agence/agence.component.html | 9 +---- .../businessunit-detail.component.html | 33 ++++++++++--------- .../businessunit/businessunit.component.html | 21 +----------- 8 files changed, 64 insertions(+), 58 deletions(-) create mode 100644 src/app/components/agence/agence-detail/agence-detail.component.html create mode 100644 src/app/components/agence/agence-detail/agence-detail.component.scss create mode 100644 src/app/components/agence/agence-detail/agence-detail.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index bd579cf..3204ce7 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -15,6 +15,7 @@ import { CollaborateurDetailComponent } from './components/collaborateur/collabo import { BusinessunitComponent } from './components/businessunit/businessunit.component'; import { BusinessunitEditComponent } from './components/businessunit/businessunit-edit/businessunit-edit.component'; import { BusinessunitDetailComponent } from './components/businessunit/businessunit-detail/businessunit-detail.component'; +import { AgenceDetailComponent } from './components/agence/agence-detail/agence-detail.component'; @NgModule({ declarations: [ @@ -24,10 +25,12 @@ import { BusinessunitDetailComponent } from './components/businessunit/businessu HomeComponent, AgenceComponent, AgenceEditComponent, + AgenceDetailComponent, CollaborateurDetailComponent, BusinessunitComponent, BusinessunitEditComponent, - BusinessunitDetailComponent + BusinessunitDetailComponent, + ], imports: [ BrowserModule, diff --git a/src/app/components/agence/agence-detail/agence-detail.component.html b/src/app/components/agence/agence-detail/agence-detail.component.html new file mode 100644 index 0000000..01ffc21 --- /dev/null +++ b/src/app/components/agence/agence-detail/agence-detail.component.html @@ -0,0 +1,8 @@ +
+ +
+ + + +
+
diff --git a/src/app/components/agence/agence-detail/agence-detail.component.scss b/src/app/components/agence/agence-detail/agence-detail.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/components/agence/agence-detail/agence-detail.component.ts b/src/app/components/agence/agence-detail/agence-detail.component.ts new file mode 100644 index 0000000..a06a442 --- /dev/null +++ b/src/app/components/agence/agence-detail/agence-detail.component.ts @@ -0,0 +1,31 @@ +import {Component, Input, OnInit} from '@angular/core'; +import {Agence} from "../../../interfaces/agence"; +import {HttpClient} from "@angular/common/http"; +import {AgenceService} from "../../../services/agence.service"; +@Component({ + selector: 'app-agence-detail', + templateUrl: './agence-detail.component.html', + styleUrls: ['./agence-detail.component.scss'] +}) +export class AgenceDetailComponent implements OnInit { + + agences : Agence[] = []; + @Input() + agence = {} as Agence ; + + constructor( + private http : HttpClient, + private agenceService: AgenceService, + ) { } + + ngOnInit(): void { + this.getAgences(); + this.getAgences(); + } + + getAgences():void { + this.agenceService.getAgences() + .subscribe(agences => this.agences = agences); + } + +} diff --git a/src/app/components/agence/agence-edit/agence-edit.component.html b/src/app/components/agence/agence-edit/agence-edit.component.html index 0ecfe31..77428c1 100644 --- a/src/app/components/agence/agence-edit/agence-edit.component.html +++ b/src/app/components/agence/agence-edit/agence-edit.component.html @@ -3,21 +3,8 @@

{{agence.name | uppercase}}

id : {{agence.id}}
-
-
- - - - - - - -
Name
- -
-
-
+ diff --git a/src/app/components/agence/agence.component.html b/src/app/components/agence/agence.component.html index bf84f77..e219d51 100644 --- a/src/app/components/agence/agence.component.html +++ b/src/app/components/agence/agence.component.html @@ -21,14 +21,7 @@

Ajouter une agence :

-
- -
- - - -
-
+
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'; -- 2.36.3 From d5b87432723e32729fe400dd4b9abaf2fa0baf19 Mon Sep 17 00:00:00 2001 From: Clement FERRERE Date: Mon, 11 Apr 2022 09:56:08 +0200 Subject: [PATCH 7/7] =?UTF-8?q?select=20pour=20genre=20+=20v=C3=A9rificati?= =?UTF-8?q?on=20email=20+=20rename=20pr=C3=A9prod-preprod=20+=20date=20de?= =?UTF-8?q?=20naissance=20=3D=20input=20type=20date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collaborateur-detail.component.html | 26 ++++++++++--------- .../collaborateur-detail.component.ts | 17 +++++++++--- src/app/services/agence.service.ts | 2 +- src/app/services/businessunit.service.ts | 2 +- src/app/services/collaborateur.service.ts | 2 +- src/ressources/routes/routes.ts | 6 ++--- .../{routesPréprod.ts => routesPreprod.ts} | 0 7 files changed, 33 insertions(+), 22 deletions(-) rename src/ressources/routes/{routesPréprod.ts => routesPreprod.ts} (100%) 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 ab3815c..6b25ed2 100644 --- a/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html +++ b/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html @@ -14,12 +14,17 @@
- +
- - + +
@@ -32,7 +37,7 @@
- +
@@ -50,17 +55,17 @@
- +
- +
- +
@@ -69,7 +74,7 @@
@@ -77,7 +82,7 @@
@@ -88,7 +93,4 @@ *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 c9a256f..192d667 100644 --- a/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.ts +++ b/src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.ts @@ -4,8 +4,6 @@ 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', templateUrl: './collaborateur-detail.component.html', @@ -16,6 +14,7 @@ export class CollaborateurDetailComponent implements OnInit { businessunits : Businessunit[] = []; collaborateurs : Collaborateur[] = []; rDate : String = ""; + bDate : String = ""; @Input() collaborateur = {} as Collaborateur; @@ -33,7 +32,10 @@ export class CollaborateurDetailComponent implements OnInit { if (this.collaborateur.resignationDate) { this.rDate = new Date(this.collaborateur.resignationDate).toISOString().split('T')[0]; console.log(this.rDate) - console.log(this.collaborateur.resignationDate) + } + if (this.collaborateur.birthDate) { + this.bDate = new Date(this.collaborateur.birthDate).toISOString().split('T')[0]; + console.log(this.bDate) } } @@ -47,10 +49,17 @@ export class CollaborateurDetailComponent implements OnInit { .subscribe(businessunits => this.businessunits = businessunits); } - onDateChange($event: any):void { + onResignationDateChange($event: any):void { console.log($event.target) this.collaborateur.resignationDate = new Date($event.target.value); console.log(this.rDate) console.log(this.collaborateur.resignationDate) } + + onBirthDateChange($event: any):void { + console.log($event.target) + this.collaborateur.birthDate = new Date($event.target.value); + console.log(this.bDate) + console.log(this.collaborateur.birthDate) + } } diff --git a/src/app/services/agence.service.ts b/src/app/services/agence.service.ts index 0eb61b7..e26f40a 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/routesPréprod"; +import {agencesUrl} from "../../ressources/routes/routesPreprod"; @Injectable({ providedIn: 'root' diff --git a/src/app/services/businessunit.service.ts b/src/app/services/businessunit.service.ts index 49b1364..2c96ef2 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/routesPréprod"; +import {businessunitsUrl} from "../../ressources/routes/routesPreprod"; @Injectable({ providedIn: 'root' diff --git a/src/app/services/collaborateur.service.ts b/src/app/services/collaborateur.service.ts index 3177aec..2b58b98 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/routesPréprod"; +import {collaborateursUrl} from "../../ressources/routes/routesPreprod"; @Injectable({providedIn: 'root'}) diff --git a/src/ressources/routes/routes.ts b/src/ressources/routes/routes.ts index cc03eda..a4645f5 100644 --- a/src/ressources/routes/routes.ts +++ b/src/ressources/routes/routes.ts @@ -1,3 +1,3 @@ -// export const collaborateursUrl = 'https://localhost:5001/api/collaborateurs'; -// export const agencesUrl = 'https://localhost:5001/api/agences'; -// export const businessunitsUrl = 'https://localhost:5001/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/routesPreprod.ts similarity index 100% rename from src/ressources/routes/routesPréprod.ts rename to src/ressources/routes/routesPreprod.ts -- 2.36.3