From 198d8c14549d02912a299ebd5dcf2557314c33a5 Mon Sep 17 00:00:00 2001 From: Jolys Enzo Date: Thu, 23 Mar 2023 14:40:46 +0100 Subject: [PATCH] dto session --- Sources/Dto/Classe/PointDTO.cs | 11 ++++++++++- Sources/Dto/Classe/SessionDTO.cs | 2 ++ Sources/Dto/Classe/TourDTO.cs | 4 +++- Sources/Dto/Factories/PointFactorie.cs | 14 +++++++++++++- Sources/Dto/Factories/SessionFactorie.cs | 1 + Sources/Dto/Factories/TourFactorie.cs | 3 ++- 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/Sources/Dto/Classe/PointDTO.cs b/Sources/Dto/Classe/PointDTO.cs index b7afb51..352d299 100644 --- a/Sources/Dto/Classe/PointDTO.cs +++ b/Sources/Dto/Classe/PointDTO.cs @@ -8,7 +8,16 @@ namespace Dto.Classe { public class PointDTO { + public double Latitude { get; set; } + public double Longitude { get; set; } + public float Timer { get; set; } public float Distance { get; set; } - public long IdGeolocalisation { get; set; } + public float NGear { get; set; } + public float PBrakeF { get; set; } + public float ASteer { get; set; } + public float RPedal { get; set; } + public float GLong { get; set; } + public float GLat { get; set; } + public float VCar { get; set; } } } diff --git a/Sources/Dto/Classe/SessionDTO.cs b/Sources/Dto/Classe/SessionDTO.cs index a2e5272..599b4bb 100644 --- a/Sources/Dto/Classe/SessionDTO.cs +++ b/Sources/Dto/Classe/SessionDTO.cs @@ -16,5 +16,7 @@ namespace Dto.Classe public string NameCircuit { get; set; } public string NamePilote { set; get; } + + public List Tours { get; set; } } } diff --git a/Sources/Dto/Classe/TourDTO.cs b/Sources/Dto/Classe/TourDTO.cs index 0f4f61c..777bed7 100644 --- a/Sources/Dto/Classe/TourDTO.cs +++ b/Sources/Dto/Classe/TourDTO.cs @@ -8,7 +8,9 @@ namespace Dto.Classe { public class TourDTO { - public float Temps { get; set; } + public string Temps { get; set; } public long IdSession { get; set; } + + public List Points { get; set; } } } diff --git a/Sources/Dto/Factories/PointFactorie.cs b/Sources/Dto/Factories/PointFactorie.cs index 0faffda..bd5faf8 100644 --- a/Sources/Dto/Factories/PointFactorie.cs +++ b/Sources/Dto/Factories/PointFactorie.cs @@ -13,8 +13,20 @@ namespace Dto.Factories public static PointDTO ModeleToDTO(this Point modele) { PointDTO dto = new PointDTO(); + dto.Distance = modele.Distance; - //dto.IdGeolocalisation = modele.IdGeolocalisation; + dto.Latitude = modele.Latitude; + dto.Longitude = modele.Longitude; + dto.Timer = modele.Timer; + dto.NGear = modele.NGear; + dto.PBrakeF = modele.PBrakeF; + dto.ASteer = modele.ASteer; + dto.RPedal = modele.RPedal; + dto.GLong = modele.GLong; + dto.GLat = modele.GLat; + dto.VCar = modele.VCar; + + return dto; } } diff --git a/Sources/Dto/Factories/SessionFactorie.cs b/Sources/Dto/Factories/SessionFactorie.cs index 5d7b332..505e3c8 100644 --- a/Sources/Dto/Factories/SessionFactorie.cs +++ b/Sources/Dto/Factories/SessionFactorie.cs @@ -20,6 +20,7 @@ namespace Dto.Factories sessionDTO.NameCircuit = session.nameCircuit; sessionDTO.Date = session.date; sessionDTO.Id = session.Id; + sessionDTO.Tours = session.Tours.Select(e => e.ModeleToDTO()).ToList() ; return sessionDTO; } diff --git a/Sources/Dto/Factories/TourFactorie.cs b/Sources/Dto/Factories/TourFactorie.cs index d95db5e..613e195 100644 --- a/Sources/Dto/Factories/TourFactorie.cs +++ b/Sources/Dto/Factories/TourFactorie.cs @@ -15,7 +15,8 @@ namespace Dto.Factories TourDTO tourDTO = new TourDTO(); tourDTO.IdSession = modele.IdSession; - //tourDTO.Temps = modele.Temps; + tourDTO.Temps = modele.Temps; + tourDTO.Points = modele.Points.Select(e => e.ModeleToDTO()).ToList(); return tourDTO; }