ygrette
/
Digitalisation_EPA_Serveur
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Transformation des List<Collaborateur> en IEnumerable dans le service Collaborateur

Browse Source
develop
Yanaël GRETTE 4 years ago
parent 18316d9f8a
commit 5443b49388
3 changed files with 11 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Controllers/CollaborateursApi.cs
  2. 4
      IServices/ICollaborateurService.cs
  3. 16
      Services/CollaborateurService.cs

2
Controllers/CollaborateursApi.cs
Unescape View File

@ -157,7 +157,7 @@ namespace IO.Swagger.Controllers
{ {
//TODO: Uncomment the next line to return response 403 or use other options such as return this.NotFound(), return this.BadRequest(..), ... //TODO: Uncomment the next line to return response 403 or use other options such as return this.NotFound(), return this.BadRequest(..), ...
// return StatusCode(403, default(ErreurDTO)); // return StatusCode(403, default(ErreurDTO));
List<CollaborateurDTO> collaborateurs = collaborateurService.GetCollaborateursByReferent(idReferent, asc, numPage, parPAge, texte, tri); IEnumerable<CollaborateurDTO> collaborateurs = collaborateurService.GetCollaborateursByReferent(idReferent, asc, numPage, parPAge, texte, tri);
if(collaborateurs == null) if(collaborateurs == null)
{ {
ErreurDTO erreurDTO = new ErreurDTO() ErreurDTO erreurDTO = new ErreurDTO()

4
IServices/ICollaborateurService.cs
Unescape View File

@ -15,7 +15,7 @@ namespace EPAServeur.IServices
CollaborateurDTO GetCollaborateurByMail(string mail); CollaborateurDTO GetCollaborateurByMail(string mail);
ProfilDTO GetProfilById(Guid? idCollaborateur); ProfilDTO GetProfilById(Guid? idCollaborateur);
ProfilDTO GetProfilByMail(string mail); ProfilDTO GetProfilByMail(string mail);
List<CollaborateurDTO> GetCollaborateurs(bool? asc, int? numPage, int? parPage, List<string> fonctions, int? idAgence, int? idBU, String texte, string tri); IEnumerable<CollaborateurDTO> GetCollaborateurs(bool? asc, int? numPage, int? parPage, List<string> fonctions, int? idAgence, int? idBU, string texte, string tri);
List<CollaborateurDTO> GetCollaborateursByReferent(Guid? idReferent, bool? asc, int? numPage, int? parPage, String texte, string tri); IEnumerable<CollaborateurDTO> GetCollaborateursByReferent(Guid? idReferent, bool? asc, int? numPage, int? parPage, string texte, string tri);
} }
} }

16
Services/CollaborateurService.cs
Unescape View File

@ -39,14 +39,14 @@ namespace EPAServeur.Services
} }
public List<CollaborateurDTO> GetCollaborateurs(bool? asc, int? numPage, int? parPage, List<string> fonctions, int? idAgence, int? idBU, String texte, string tri) public IEnumerable<CollaborateurDTO> GetCollaborateurs(bool? asc, int? numPage, int? parPage, List<string> fonctions, int? idAgence, int? idBU, string texte, string tri)
{ {
if (texte == null) if (texte == null)
texte = ""; texte = "";
else else
texte = texte.ToLower(); texte = texte.ToLower();
List<Collaborateur> collaborateurs; IEnumerable<Collaborateur> collaborateurs;
List<CollaborateurDTO> collaborateursDTO; IEnumerable<CollaborateurDTO> collaborateursDTO;
if(idBU != null) if(idBU != null)
collaborateurs = collaborateurApi.ChercherCollabBU(idBU); collaborateurs = collaborateurApi.ChercherCollabBU(idBU);
else if( idAgence != null) else if( idAgence != null)
@ -59,12 +59,12 @@ namespace EPAServeur.Services
int take = parPage.Value; int take = parPage.Value;
collaborateursDTO = (from c in collaborateurs collaborateursDTO = (from c in collaborateurs
where (c.Nom + " " + c.Prenom).ToLower().Contains(texte) || (c.Prenom + " " + c.Nom).ToLower().Contains(texte) where (c.Nom + " " + c.Prenom).ToLower().Contains(texte) || (c.Prenom + " " + c.Nom).ToLower().Contains(texte)
select GetCollaborateurDTO(c)).Skip(skip).Take(take).ToList(); select GetCollaborateurDTO(c)).Skip(skip).Take(take);
return collaborateursDTO; return collaborateursDTO;
} }
public List<CollaborateurDTO> GetCollaborateursByReferent(Guid? idReferent, bool? asc, int? numPage, int? parPage, String texte, string tri) public IEnumerable<CollaborateurDTO> GetCollaborateursByReferent(Guid? idReferent, bool? asc, int? numPage, int? parPage, string texte, string tri)
{ {
if (texte == null) if (texte == null)
texte = ""; texte = "";
@ -73,12 +73,12 @@ namespace EPAServeur.Services
Collaborateur referent = collaborateurApi.ChercherCollabId(idReferent); Collaborateur referent = collaborateurApi.ChercherCollabId(idReferent);
if (referent == null) if (referent == null)
return null; return null;
List<Collaborateur> collaborateurs = collaborateurApi.ChercherCollabRef(idReferent); IEnumerable<Collaborateur> collaborateurs = collaborateurApi.ChercherCollabRef(idReferent);
int skip = (numPage.Value - 1) * parPage.Value; int skip = (numPage.Value - 1) * parPage.Value;
int take = parPage.Value; int take = parPage.Value;
List<CollaborateurDTO> collaborateursDTO = (from c in collaborateurs IEnumerable<CollaborateurDTO> collaborateursDTO = (from c in collaborateurs
where (c.Nom + " " + c.Prenom).ToLower().Contains(texte) || (c.Prenom + " " + c.Nom).ToLower().Contains(texte) where (c.Nom + " " + c.Prenom).ToLower().Contains(texte) || (c.Prenom + " " + c.Nom).ToLower().Contains(texte)
select GetCollaborateurDTO(c)).Skip(skip).Take(take).ToList(); select GetCollaborateurDTO(c)).Skip(skip).Take(take);
return collaborateursDTO; return collaborateursDTO;
} }

Write Preview
Loading…
Cancel
Save