Mise à jour suite à des modifications OpenApi

develop
Yanaël GRETTE 4 years ago
parent 0a0966f398
commit 2e6b60f5c0
  1. 8
      src/app/ep/details-ep/details-ep.component.ts
  2. 2
      src/app/home/home-collaborateur/home-collaborateur.component.ts
  3. 2
      src/app/home/home-commercial/home-commercial.component.ts
  4. 2663
      src/app/shared/api-swagger/api/ep.service.ts
  5. 2
      src/app/shared/api-swagger/model/epDTO.ts
  6. 8
      src/app/shared/mat-tables/ep-table/ep-table.ts

@ -25,11 +25,13 @@ export class DetailsEPComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
/*
this.idEp = this.route.snapshot.paramMap.get("id"); this.idEp = this.route.snapshot.paramMap.get("id");
this.epSubscription = this.epService.getEPById(this.idEp).subscribe( this.epSubscription = this.epService.getEPById(this.idEp).subscribe(
ep => this.ep = ep, ep => {
this.ep = ep;
console.log(this.ep);
},
err => console.log(err) err => console.log(err)
);*/ );
} }
} }

@ -63,7 +63,7 @@ export class HomeCollaborateurComponent implements OnInit {
} }
checkEPReferent() { checkEPReferent() {
this.countEPReferent = this.epService.getEPEnCoursReferentCount(this.collaborateurConnecte.id, true, 1, 15, "", "", true, undefined, undefined).subscribe( this.countEPReferent = this.epService.getEPEnCoursReferentCount(this.collaborateurConnecte.id, "", undefined, undefined).subscribe(
count => this.estReferentEPEnCours = count > 0, count => this.estReferentEPEnCours = count > 0,
err => console.log(err) err => console.log(err)
); );

@ -45,7 +45,7 @@ export class HomeCommercialComponent implements OnInit {
} }
checkEPReferent() { checkEPReferent() {
this.countEPReferent = this.epService.getEPEnCoursReferentCount(this.collaborateurConnecte.id, true, 1, 15, "", "", true, undefined, undefined).subscribe( this.countEPReferent = this.epService.getEPEnCoursReferentCount(this.collaborateurConnecte.id, "",undefined, undefined).subscribe(
count => this.estReferentEPEnCours = count > 0, count => this.estReferentEPEnCours = count > 0,
err => console.log(err) err => console.log(err)
); );

File diff suppressed because it is too large Load Diff

@ -61,7 +61,7 @@ export interface EpDTO {
cv: string; cv: string;
propositionsEntretien?: Array<RDVEntretienDTO>; propositionsEntretien?: Array<RDVEntretienDTO>;
rdvEntretien?: RDVEntretienDTO; rdvEntretien?: RDVEntretienDTO;
choixTypeEntretien?: TypeEntretienDTO; choixTypeEntretien?: Array<TypeEntretienDTO>;
/** /**
* Indique si oui ou non l'EP doit obligatoirement être effectué * Indique si oui ou non l'EP doit obligatoirement être effectué
*/ */

@ -133,7 +133,7 @@ export class EpTableComponent implements OnInit{
this.epSubscription = this.epService.getEPSignesReferent(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin).subscribe( this.epSubscription = this.epService.getEPSignesReferent(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin).subscribe(
eps => { eps => {
this.dataSource = new MatTableDataSource(eps); this.dataSource = new MatTableDataSource(eps);
this.epCountSubscription = this.epService.getEPSignesReferentCount(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin).subscribe( this.epCountSubscription = this.epService.getEPSignesReferentCount(this.idCollaborateur, this.search, this.dateDebut, this.dateFin).subscribe(
count => this.taille = count, count => this.taille = count,
err => console.log(err) err => console.log(err)
); );
@ -143,10 +143,10 @@ export class EpTableComponent implements OnInit{
} }
getEPEnCoursReferent() { getEPEnCoursReferent() {
this.epSubscription = this.epService.getEPEnCoursReferent(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, true, this.dateDebut, this.dateFin ).subscribe( this.epSubscription = this.epService.getEPEnCoursReferent(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin ).subscribe(
eps => { eps => {
this.dataSource = new MatTableDataSource(eps); this.dataSource = new MatTableDataSource(eps);
this.epCountSubscription = this.epService.getEPSignesReferentCount(this.idCollaborateur, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin ).subscribe( this.epCountSubscription = this.epService.getEPSignesReferentCount(this.idCollaborateur, this.search, this.dateDebut, this.dateFin ).subscribe(
count => this.taille = count, count => this.taille = count,
err => console.log(err) err => console.log(err)
); );
@ -185,7 +185,7 @@ export class EpTableComponent implements OnInit{
eps => { eps => {
console.log(eps); console.log(eps);
this.dataSource = new MatTableDataSource(eps); this.dataSource = new MatTableDataSource(eps);
this.epCountSubscription = this.epService.getEPSignesCount(this.busIds, this.asc, this.numPage, this.parPage, this.search, this.tri, this.dateDebut, this.dateFin).subscribe( this.epCountSubscription = this.epService.getEPSignesCount(this.busIds, this.search, this.dateDebut, this.dateFin).subscribe(
count => this.taille = count, count => this.taille = count,
err => console.log(err) err => console.log(err)
); );

Loading…
Cancel
Save