Mise en route préprod + avancement reco

pull/9/head
Clement FERRERE 3 years ago
parent 1058fb0a7e
commit 68dd4ce507
  1. 1
      src/app/app.component.ts
  2. 8
      src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html
  3. 18
      src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.ts
  4. 1
      src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
  5. 1
      src/app/components/collaborateur/collaborateur.component.ts
  6. 2
      src/app/services/agence.service.ts
  7. 2
      src/app/services/businessunit.service.ts
  8. 2
      src/app/services/collaborateur.service.ts
  9. 6
      src/ressources/routes/routes.ts
  10. 3
      src/ressources/routes/routesPréprod.ts

@ -23,7 +23,6 @@ export class AppComponent implements OnInit {
).subscribe(() => { ).subscribe(() => {
const rt = this.getChild(this.activatedRoute); const rt = this.getChild(this.activatedRoute);
rt.data.subscribe(data => { rt.data.subscribe(data => {
console.log(data);
this.titleService.setTitle(data.title)}); this.titleService.setTitle(data.title)});
}); });
} }

@ -32,7 +32,7 @@
<div class="form-group col-12 col-sm-6 col-md-4 col-lg-3"> <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
<label for="collaborateur-childrenNumber" class="form-label">Nombre d'enfants</label> <label for="collaborateur-childrenNumber" class="form-label">Nombre d'enfants</label>
<input class="form-control" id="collaborateur-childrenNumber" [(ngModel)]="collaborateur.childrenNumber" placeholder="Nombre d'enfants"> <input type="number" class="form-control" id="collaborateur-childrenNumber" [(ngModel)]="collaborateur.childrenNumber" placeholder="Nombre d'enfants">
</div> </div>
<div class="form-group col-12 col-sm-6 col-md-4 col-lg-3"> <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
@ -60,7 +60,7 @@
<div class="form-group col-12 col-sm-6 col-md-4 col-lg-3"> <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
<label for="collaborateur-resignationDate" class="form-label">Date de départ</label> <label for="collaborateur-resignationDate" class="form-label">Date de départ</label>
<input class="form-control" id="collaborateur-resignationDate" [(ngModel)]="collaborateur.resignationDate" placeholder="Date de départ"> <input type="date" class="form-control" id="collaborateur-resignationDate" (change)="onDateChange($event)" [ngModel]="rDate" placeholder="Date de départ">
</div> </div>
</div> </div>
@ -88,5 +88,7 @@
<span> <span>
*Tous les champs sont obligatoires *Tous les champs sont obligatoires
</span> </span>
<div>
<!-- div pour que docker rebuild l'image-->
</div>
</div> </div>

@ -4,6 +4,7 @@ import {HttpClient} from "@angular/common/http";
import {CollaborateurService} from "../../../services/collaborateur.service"; import {CollaborateurService} from "../../../services/collaborateur.service";
import {BusinessunitService} from "../../../services/businessunit.service"; import {BusinessunitService} from "../../../services/businessunit.service";
import {Businessunit} from "../../../interfaces/businessunit"; import {Businessunit} from "../../../interfaces/businessunit";
import { DatePipe } from '@angular/common';
@Component({ @Component({
selector: 'app-collaborateur-detail', selector: 'app-collaborateur-detail',
@ -14,19 +15,26 @@ export class CollaborateurDetailComponent implements OnInit {
businessunits : Businessunit[] = []; businessunits : Businessunit[] = [];
collaborateurs : Collaborateur[] = []; collaborateurs : Collaborateur[] = [];
rDate : String = "";
@Input() @Input()
collaborateur = {} as Collaborateur ; collaborateur = {} as Collaborateur;
constructor( constructor(
private http : HttpClient, private http : HttpClient,
private collaborateurService: CollaborateurService, private collaborateurService: CollaborateurService,
private businessunitService: BusinessunitService private businessunitService: BusinessunitService
) { } ) {}
ngOnInit(): void { ngOnInit(): void {
this.getCollaborateurs(); this.getCollaborateurs();
this.getBusinessunits(); 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 { getCollaborateurs():void {
@ -39,4 +47,10 @@ export class CollaborateurDetailComponent implements OnInit {
.subscribe(businessunits => this.businessunits = businessunits); .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)
}
} }

@ -34,6 +34,7 @@ export class CollaborateurEditComponent implements OnInit {
save():void{ save():void{
if (this.collaborateur){ if (this.collaborateur){
console.log("SAVE",this.collaborateur.resignationDate)
this.collaborateurService.updateCollaborateur(this.collaborateur) this.collaborateurService.updateCollaborateur(this.collaborateur)
.subscribe(()=>this.goBack()); .subscribe(()=>this.goBack());
} }

@ -27,7 +27,6 @@ export class CollaborateurComponent implements OnInit {
} }
add(collaborateur: Collaborateur): void { add(collaborateur: Collaborateur): void {
console.log(collaborateur);
this.collaborateurService.addCollaborateur(collaborateur) this.collaborateurService.addCollaborateur(collaborateur)
.subscribe(collaborateur => { .subscribe(collaborateur => {
this.collaborateurs.push(collaborateur); this.collaborateurs.push(collaborateur);

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

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

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

@ -1,3 +1,3 @@
export const collaborateursUrl = 'https://localhost:8081/api/collaborateurs'; // export const collaborateursUrl = 'https://localhost:5001/api/collaborateurs';
export const agencesUrl = 'https://localhost:8081/api/agences'; // export const agencesUrl = 'https://localhost:5001/api/agences';
export const businessunitsUrl = 'https://localhost:8081/api/businessunits'; // export const businessunitsUrl = 'https://localhost:5001/api/businessunits';

@ -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';
Loading…
Cancel
Save