mandatory_resignation_date + fix non cadre #16

Merged
Clement.Ferrere merged 3 commits from mandatory_resignation_date into develop 2 years ago
  1. 2
      src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.html
  2. 2
      src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts
  3. 2
      src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html
  4. 2
      src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts

@ -54,7 +54,7 @@
[ngClass]="{ 'is-invalid': submitted && form.status.errors }"> [ngClass]="{ 'is-invalid': submitted && form.status.errors }">
<option value="" disabled selected>Statut</option> <option value="" disabled selected>Statut</option>
<option value="CADRE">Cadre</option> <option value="CADRE">Cadre</option>
<option value="NON-CADRE">Non-cadre</option> <option value="NONCADRE">Non-cadre</option>
<option value="ALTERNANT">Alternant</option> <option value="ALTERNANT">Alternant</option>
<option value="STAGIAIRE">Stagiaire</option> <option value="STAGIAIRE">Stagiaire</option>
</select> </select>

@ -47,7 +47,7 @@ export class CollaborateurAddComponent implements OnInit {
telephone: ['', Validators.required], telephone: ['', Validators.required],
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: ['', Validators.required], resignationDate: [],
referrerId: ['', Validators.required], referrerId: ['', Validators.required],
businessUnitId: ['', Validators.required], businessUnitId: ['', Validators.required],
}); });

@ -57,7 +57,7 @@
<select class="form-select" formControlName="status" [ngClass]="{ 'is-invalid': submitted && f.status.errors }" [value]="collaborateur.status"> <select class="form-select" formControlName="status" [ngClass]="{ 'is-invalid': submitted && f.status.errors }" [value]="collaborateur.status">
<option value="" disabled selected>Statut</option> <option value="" disabled selected>Statut</option>
<option value="CADRE">Cadre</option> <option value="CADRE">Cadre</option>
<option value="NON-CADRE">Non-cadre</option> <option value="NONCADRE">Non-cadre</option>
<option value="ALTERNANT">Alternant</option> <option value="ALTERNANT">Alternant</option>
<option value="STAGIAIRE">Stagiaire</option> <option value="STAGIAIRE">Stagiaire</option>
</select> </select>

@ -57,7 +57,7 @@ export class CollaborateurEditComponent implements OnInit {
telephone: ['', Validators.required], telephone: ['', Validators.required],
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: ['', Validators.required], resignationDate: [''],
referrerId: ['', Validators.required], referrerId: ['', Validators.required],
businessUnitId: ['', Validators.required], businessUnitId: ['', Validators.required],
}); });

Loading…
Cancel
Save