diff --git a/Sources/Dto/Classe/EcurieDTO.cs b/Sources/Dto/Classe/EcurieDTO.cs index 87552cb..19be397 100644 --- a/Sources/Dto/Classe/EcurieDTO.cs +++ b/Sources/Dto/Classe/EcurieDTO.cs @@ -12,5 +12,7 @@ namespace Dto.Classe public List Members { get; set; } public List WaitingsMembers { get; set; } public PiloteDTO Owner { get; set; } + + public string Image { get; set; } } } diff --git a/Sources/Dto/Classe/PiloteDTO.cs b/Sources/Dto/Classe/PiloteDTO.cs index cf55873..b9b6ac8 100644 --- a/Sources/Dto/Classe/PiloteDTO.cs +++ b/Sources/Dto/Classe/PiloteDTO.cs @@ -10,5 +10,7 @@ namespace Dto.Classe { public string Pseudo { get; set; } public string Email { get; set; } + + public string Image { get; set; } } } diff --git a/Sources/Dto/Factories/EcurieFactorie.cs b/Sources/Dto/Factories/EcurieFactorie.cs index 0d8f2fe..c0c0fe5 100644 --- a/Sources/Dto/Factories/EcurieFactorie.cs +++ b/Sources/Dto/Factories/EcurieFactorie.cs @@ -18,13 +18,14 @@ namespace Dto.Factories ecurieDTO.Owner = ecurie.Owner.ModeleToDTO(); ecurieDTO.Members = ecurie.Members.Select( e => e.ModeleToDTO()).ToList(); ecurieDTO.WaitingsMembers = ecurie.WaitingMembers.Select(e => e.ModeleToDTO()).ToList(); + ecurieDTO.Image = ecurie.Image; return ecurieDTO; } public static Ecurie DTOToModele(this EcurieDTO dto) { - return new Ecurie(nameArg: dto.Name); + return new Ecurie(dto.Image,nameArg: dto.Name); } } } diff --git a/Sources/Entity_Framework/Entity/Ecuries.cs b/Sources/Entity_Framework/Entity/Ecuries.cs index e772fcd..01478f1 100644 --- a/Sources/Entity_Framework/Entity/Ecuries.cs +++ b/Sources/Entity_Framework/Entity/Ecuries.cs @@ -13,6 +13,8 @@ namespace Entity_Framework.Entity public string Name { get; set; } + public string Image { get;set; } + // -------------------- Relation -------------------- // //Relation_Ecurie_Pilote diff --git a/Sources/Entity_Framework/Entity/Pilotes.cs b/Sources/Entity_Framework/Entity/Pilotes.cs index ba41065..05694bc 100644 --- a/Sources/Entity_Framework/Entity/Pilotes.cs +++ b/Sources/Entity_Framework/Entity/Pilotes.cs @@ -1,5 +1,6 @@ using Entity_Framework.Entity.Relations; using System; +using System.Buffers.Text; using System.Collections.Generic; using System.Linq; using System.Text; @@ -17,6 +18,8 @@ namespace Entity_Framework.Entity public string Password { get; set; } + public string Image { get;set; } + // -------------------- Relation -------------------- // @@ -32,7 +35,7 @@ namespace Entity_Framework.Entity public List Sessions { get; set; } //Images - public Images Image { get; set; } + //public Images Image { get; set; } } } diff --git a/Sources/Entity_Framework/Factories/EcurieFactorie.cs b/Sources/Entity_Framework/Factories/EcurieFactorie.cs index c71a045..5071263 100644 --- a/Sources/Entity_Framework/Factories/EcurieFactorie.cs +++ b/Sources/Entity_Framework/Factories/EcurieFactorie.cs @@ -14,13 +14,14 @@ namespace Entity_Framework.Factories public static Ecurie EntityToModele(this Ecuries dto) { - return new Ecurie(nameArg:dto.Name); + return new Ecurie(nameArg:dto.Name,_image:dto.Image); } public static Ecuries ModeleToEntity(this Ecurie ecurie) { Ecuries entity = new Ecuries(); entity.Name = ecurie.name; + entity.Image = ecurie.Image; return entity; } } diff --git a/Sources/Entity_Framework/Factories/PiloteFactories.cs b/Sources/Entity_Framework/Factories/PiloteFactories.cs index 898f625..26004da 100644 --- a/Sources/Entity_Framework/Factories/PiloteFactories.cs +++ b/Sources/Entity_Framework/Factories/PiloteFactories.cs @@ -18,13 +18,14 @@ namespace Entity_Framework.Factories pilote.Pseudo = piloteModele.Pseudo; pilote.Email = piloteModele.Email; pilote.Password = piloteModele.Password; + pilote.Image = piloteModele.Image; return pilote; } public static Pilote EntityToModele(this Pilotes piloteEntity) { - return new Pilote(_Pseudo:piloteEntity.Pseudo,_Email:piloteEntity.Email,_Password:piloteEntity.Password); + return new Pilote(_Image:piloteEntity.Image, _Pseudo:piloteEntity.Pseudo,_Email:piloteEntity.Email,_Password:piloteEntity.Password); } } } diff --git a/Sources/Extraction_Donnees/Extraction_BDD/ExtractionEcuries.cs b/Sources/Extraction_Donnees/Extraction_BDD/ExtractionEcuries.cs index b70b4e0..a670303 100644 --- a/Sources/Extraction_Donnees/Extraction_BDD/ExtractionEcuries.cs +++ b/Sources/Extraction_Donnees/Extraction_BDD/ExtractionEcuries.cs @@ -18,7 +18,7 @@ namespace Extraction_Donnees.Extraction result = db.Ecuries.ToList(); foreach (Ecuries ecu in result) { - Ecurie ecurie = new Ecurie(); + Ecurie ecurie = new Ecurie("Inconnu !"); ecurie.name = ecu.Name; ecurie.Owner = (from pilote in db.Pilotes from relation in db.RelationEcuriePilote diff --git a/Sources/Modele/Classe/Ecurie.cs b/Sources/Modele/Classe/Ecurie.cs index 869e32a..b19c689 100644 --- a/Sources/Modele/Classe/Ecurie.cs +++ b/Sources/Modele/Classe/Ecurie.cs @@ -13,10 +13,13 @@ namespace Modele.Classe public List Members { get; set; } public List WaitingMembers { get; set; } + public string Image { get; set; } - public Ecurie(string nameArg = "Inconnu !") + + public Ecurie(string _image,string nameArg = "Inconnu !") { name = nameArg; + Image = _image; } } diff --git a/Sources/Modele/Classe/Pilote.cs b/Sources/Modele/Classe/Pilote.cs index c11b021..ebf3e79 100644 --- a/Sources/Modele/Classe/Pilote.cs +++ b/Sources/Modele/Classe/Pilote.cs @@ -12,11 +12,14 @@ namespace Modele.Classe public string Email { get; set; } public string Password { get; set; } - public Pilote(string _Pseudo, string _Email, string _Password) + public string Image { get; set; } + + public Pilote(string _Pseudo, string _Email, string _Password,string _Image) { Pseudo = _Pseudo; Email = _Email; Password = _Password; + Image = _Image; } public Pilote() { }