select pour genre + vérification email + rename préprod-preprod + date de naissance = input type date

pull/9/head
Clement FERRERE 3 years ago
parent 68dd4ce507
commit d5b8743272
  1. 26
      src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.html
  2. 17
      src/app/components/collaborateur/collaborateur-detail/collaborateur-detail.component.ts
  3. 2
      src/app/services/agence.service.ts
  4. 2
      src/app/services/businessunit.service.ts
  5. 2
      src/app/services/collaborateur.service.ts
  6. 6
      src/ressources/routes/routes.ts
  7. 0
      src/ressources/routes/routesPreprod.ts

@ -14,12 +14,17 @@
<div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
<label for="collaborateur-birthDate" class="form-label">Date de naissance</label>
<input class="form-control" id="collaborateur-birthDate" [(ngModel)]="collaborateur.birthDate" placeholder="Date de naissance">
<input type="date" class="form-control" id="collaborateur-birthDate" (change)="onBirthDateChange($event)" [(ngModel)]="bDate" placeholder="Date de naissance">
</div>
<div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
<label for="collaborateur-gender" class="form-label">Genre</label>
<input class="form-control" id="collaborateur-gender" [(ngModel)]="collaborateur.gender" placeholder="Genre">
<label class="form-label">Genre</label>
<select class="form-select" name="genre" id="collaborateur-gender" [(ngModel)]="collaborateur.gender">
<option value="" disabled selected>Genre</option>
<option value="MASCULIN">Masculin</option>
<option value="FEMININ">Féminin</option>
<option value="AUTRE">Autre</option>
</select>
</div>
</div>
@ -32,7 +37,7 @@
<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>
<input type="number" class="form-control" id="collaborateur-childrenNumber" [(ngModel)]="collaborateur.childrenNumber" placeholder="Nombre d'enfants">
<input type="number" min="0" onkeyup="if(this.value<0){this.value= this.value * -1}" class="form-control" id="collaborateur-childrenNumber" [(ngModel)]="collaborateur.childrenNumber" placeholder="Nombre d'enfants">
</div>
<div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
@ -50,17 +55,17 @@
<div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
<label for="collaborateur-personalMail" class="form-label">Mail personnel</label>
<input class="form-control" id="collaborateur-personalMail" [(ngModel)]="collaborateur.personalMail" placeholder="Mail personnel">
<input type="email" class="form-control" id="collaborateur-personalMail" [(ngModel)]="collaborateur.personalMail" placeholder="prenom.nom@example.com">
</div>
<div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
<label for="collaborateur-apsideMail" class="form-label">Mail Apside</label>
<input class="form-control" id="collaborateur-apsideMail" [(ngModel)]="collaborateur.apsideMail" placeholder="Mail Apside">
<input type="email" class="form-control" id="collaborateur-apsideMail" [(ngModel)]="collaborateur.apsideMail" placeholder="prenom.nom@apside-groupe.com">
</div>
<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>
<input type="date" class="form-control" id="collaborateur-resignationDate" (change)="onDateChange($event)" [ngModel]="rDate" placeholder="Date de départ">
<input type="date" class="form-control" id="collaborateur-resignationDate" (change)="onResignationDateChange($event)" [ngModel]="rDate" placeholder="Date de départ">
</div>
</div>
@ -69,7 +74,7 @@
<div class="form-group col-12 col-md-6">
<label class="form-label">Référent</label>
<select class="form-select" name="referrer" id="referrer-select" [(ngModel)]="collaborateur.referrerId">
<option value="" disabled selected>Choisissez un référent pour le nouveau collaborateur</option>
<option value="" disabled selected>Choisissez un référent pour le collaborateur</option>
<option *ngFor="let collaborateur of collaborateurs" [ngValue]="collaborateur.id">{{collaborateur.name}} {{collaborateur.firstName}}</option>
</select>
</div>
@ -77,7 +82,7 @@
<div class="form-group col-12 col-md-6">
<label class="form-label">Business Unit</label>
<select class="form-select" name="businessunit" id="businessunit-select" [(ngModel)]="collaborateur.businessUnitId">
<option value="" disabled selected>Choisissez la Business Unit pour le nouveau collaborateur</option>
<option value="" disabled selected>Choisissez la Business Unit pour le collaborateur</option>
<option *ngFor="let businessunit of businessunits" [ngValue]="businessunit.id">{{businessunit.name}} </option>
</select>
</div>
@ -88,7 +93,4 @@
<span>
*Tous les champs sont obligatoires
</span>
<div>
<!-- div pour que docker rebuild l'image-->
</div>
</div>

@ -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)
}
}

@ -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'

@ -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'

@ -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'})

@ -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';

Loading…
Cancel
Save