referrer id enlevé + creation referencement.ts

pull/17/head
Clement FERRERE 2 years ago
parent 976c4f0956
commit ac709ed7fc
  1. 2
      src/app/app.module.ts
  2. 13
      src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.html
  3. 1
      src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts
  4. 11
      src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html
  5. 2
      src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
  6. 1
      src/app/interfaces/collaborateur.ts
  7. 7
      src/app/interfaces/referencement.ts
  8. 1
      src/app/referencement/referencement.component.html
  9. 0
      src/app/referencement/referencement.component.scss
  10. 15
      src/app/referencement/referencement.component.ts

@ -18,6 +18,7 @@ import {PeriodeEssaiEditComponent} from './components/periode-essai/periode-essa
import {CollaborateurAddComponent} from './components/collaborateur/collaborateur-add/collaborateur-add.component'; import {CollaborateurAddComponent} from './components/collaborateur/collaborateur-add/collaborateur-add.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ToastrModule } from 'ngx-toastr'; import { ToastrModule } from 'ngx-toastr';
import { ReferencementComponent } from './referencement/referencement.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -32,6 +33,7 @@ import { ToastrModule } from 'ngx-toastr';
PeriodeEssaiComponent, PeriodeEssaiComponent,
PeriodeEssaiEditComponent, PeriodeEssaiEditComponent,
CollaborateurAddComponent, CollaborateurAddComponent,
ReferencementComponent,
], ],
imports: [ imports: [

@ -140,19 +140,6 @@
<div class="row mb-2"> <div class="row mb-2">
<div class="form-group col-12 col-md-6">
<label class="form-label">Référent</label>
<select class="form-select" formControlName="referrerId"
[ngClass]="{ 'is-invalid': submitted && form.referrerId.errors }">
<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 *ngIf="submitted && form.referrerId.errors" class="invalid-feedback">
<div *ngIf="form.referrerId.errors.required">Vous devez préciser le référent du collaborateur</div>
</div>
</div>
<div class="form-group col-12 col-md-6"> <div class="form-group col-12 col-md-6">
<label class="form-label">Business Unit</label> <label class="form-label">Business Unit</label>
<select class="form-select" formControlName="businessUnitId" <select class="form-select" formControlName="businessUnitId"

@ -48,7 +48,6 @@ export class CollaborateurAddComponent implements OnInit {
personalMail: ['', Validators.compose([Validators.required, Validators.pattern(".*@[a-z]*\.[a-z]*")])], personalMail: ['', Validators.compose([Validators.required, Validators.pattern(".*@[a-z]*\.[a-z]*")])],
apsideMail: ['', Validators.compose([Validators.required, Validators.pattern(".*@apside-groupe\.com|.*@apside\.fr")])], apsideMail: ['', Validators.compose([Validators.required, Validators.pattern(".*@apside-groupe\.com|.*@apside\.fr")])],
resignationDate: [], resignationDate: [],
referrerId: ['', Validators.required],
businessUnitId: ['', Validators.required], businessUnitId: ['', Validators.required],
}); });
if (this.collaborateur.resignationDate) { if (this.collaborateur.resignationDate) {

@ -129,17 +129,6 @@
<div class="row mb-2"> <div class="row mb-2">
<div class="form-group col-12 col-md-6">
<label class="form-label">Référent</label>
<select class="form-select" formControlName="referrerId" [ngClass]="{ 'is-invalid': submitted && f.referrerId.errors }">
<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 *ngIf="submitted && f.referrerId.errors" class="invalid-feedback">
<div *ngIf="f.referrerId.errors.required">Vous devez préciser le référent du collaborateur</div>
</div>
</div>
<div class="form-group col-12 col-md-6"> <div class="form-group col-12 col-md-6">
<label class="form-label">Business Unit</label> <label class="form-label">Business Unit</label>
<select class="form-select" formControlName="businessUnitId" [ngClass]="{ 'is-invalid': submitted && f.businessUnitId.errors }"> <select class="form-select" formControlName="businessUnitId" [ngClass]="{ 'is-invalid': submitted && f.businessUnitId.errors }">

@ -58,7 +58,6 @@ export class CollaborateurEditComponent implements OnInit {
personalMail: ['',Validators.compose([Validators.required,Validators.pattern(".+@[a-z]*\.[a-z]*")])], personalMail: ['',Validators.compose([Validators.required,Validators.pattern(".+@[a-z]*\.[a-z]*")])],
apsideMail: ['', Validators.compose([Validators.required,Validators.pattern(".+@apside-groupe\.com|.*@apside\.fr")])], apsideMail: ['', Validators.compose([Validators.required,Validators.pattern(".+@apside-groupe\.com|.*@apside\.fr")])],
resignationDate: [''], resignationDate: [''],
referrerId: ['', Validators.required],
businessUnitId: ['', Validators.required], businessUnitId: ['', Validators.required],
}); });
this.collaborateurObservable = this.collaborateurService.getCollaborateur(this.id).pipe(tap(collaborateur => this.registerForm.patchValue(collaborateur))) this.collaborateurObservable = this.collaborateurService.getCollaborateur(this.id).pipe(tap(collaborateur => this.registerForm.patchValue(collaborateur)))
@ -105,7 +104,6 @@ export class CollaborateurEditComponent implements OnInit {
this.collaborateur.gender = this.registerForm.value.gender this.collaborateur.gender = this.registerForm.value.gender
this.collaborateur.resignationDate = this.registerForm.value.resignationDate this.collaborateur.resignationDate = this.registerForm.value.resignationDate
this.collaborateur.businessUnitId = this.registerForm.value.businessUnitId this.collaborateur.businessUnitId = this.registerForm.value.businessUnitId
this.collaborateur.referrerId = this.registerForm.value.referrerId
this.collaborateur.apsideMail = this.registerForm.value.apsideMail this.collaborateur.apsideMail = this.registerForm.value.apsideMail
this.collaborateur.personalMail = this.registerForm.value.personalMail this.collaborateur.personalMail = this.registerForm.value.personalMail
this.collaborateur.telephone = this.registerForm.value.telephone this.collaborateur.telephone = this.registerForm.value.telephone

@ -10,7 +10,6 @@ export interface Collaborateur {
personalMail:string; personalMail:string;
apsideMail:string; apsideMail:string;
resignationDate:Date; resignationDate:Date;
referrerId:number;
businessUnitId:number; businessUnitId:number;
id: number; id: number;
} }

@ -0,0 +1,7 @@
export interface Referencement {
id: number;
startingDate : Date;
endingDate? : Date;
referredId : number;
referrerId : number;
}

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-referencement',
templateUrl: './referencement.component.html',
styleUrls: ['./referencement.component.scss']
})
export class ReferencementComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}
Loading…
Cancel
Save