diff --git a/Back/skydiveLogs-api.Domain/Statistic.cs b/Back/skydiveLogs-api.Domain/Statistic.cs index 4360bd4..6c46376 100644 --- a/Back/skydiveLogs-api.Domain/Statistic.cs +++ b/Back/skydiveLogs-api.Domain/Statistic.cs @@ -6,6 +6,8 @@ public string Label { get; set; } + public string Label2 { get; set; } + public int Nb { get; set; } #endregion Public Properties diff --git a/Back/skydiveLogs-api.Domain/TunnelFlight.cs b/Back/skydiveLogs-api.Domain/TunnelFlight.cs index 6036326..bdb537d 100644 --- a/Back/skydiveLogs-api.Domain/TunnelFlight.cs +++ b/Back/skydiveLogs-api.Domain/TunnelFlight.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; namespace skydiveLogs_api.Domain { diff --git a/Back/skydiveLogs-api.DomainBusiness/TunnelFlightService.cs b/Back/skydiveLogs-api.DomainBusiness/TunnelFlightService.cs index 7ae5e4d..ff769da 100644 --- a/Back/skydiveLogs-api.DomainBusiness/TunnelFlightService.cs +++ b/Back/skydiveLogs-api.DomainBusiness/TunnelFlightService.cs @@ -56,11 +56,12 @@ namespace skydiveLogs_api.DomainBusiness if (allTunnelFlights.Any()) { - results = allTunnelFlights.GroupBy(j => j.FlightDate.ToString("yy-MM"), + results = allTunnelFlights.GroupBy(j => new { FlightDate = j.FlightDate.ToString("yy-MM"), j.JumpType }, j => j, (groupby, tunnelFlights) => new Statistic { - Label = groupby.ToString(), + Label = groupby.FlightDate, + Label2 = groupby.JumpType.Name, Nb = tunnelFlights.Sum(t => t.NbMinutes) }) .ToList(); diff --git a/Back/skydiveLogs-api/Controllers/TunnelFlightController.cs b/Back/skydiveLogs-api/Controllers/TunnelFlightController.cs index 49fda1a..c04a37b 100644 --- a/Back/skydiveLogs-api/Controllers/TunnelFlightController.cs +++ b/Back/skydiveLogs-api/Controllers/TunnelFlightController.cs @@ -53,10 +53,10 @@ namespace skydiveLogs_api.Controllers // GET: api/TunnelFlight/month/20230101/20230701 [HttpGet("month/{beginDate}/{endDate}")] [EnableCors] - public IEnumerable GetGroupByMonth(string beginDate, string endDate) + public IEnumerable GetGroupByMonth(string beginDate, string endDate) { var result = _tunnelFlightService.GetTunnelFlightGroupByMonth(beginDate, endDate); - return _mapper.Map>(result); + return _mapper.Map>(result); } // POST: api/Tunnel diff --git a/Back/skydiveLogs-api/DataContract/StatisticForChartResp.cs b/Back/skydiveLogs-api/DataContract/StatisticForChartResp.cs new file mode 100644 index 0000000..d674fa1 --- /dev/null +++ b/Back/skydiveLogs-api/DataContract/StatisticForChartResp.cs @@ -0,0 +1,11 @@ +namespace skydiveLogs_api.DataContract +{ + public class StatisticForChartResp + { + public string Label { get; set; } + + public string Label2 { get; set; } + + public int Nb { get; set; } + } +} diff --git a/Back/skydiveLogs-api/Mapper/ModelProfile.cs b/Back/skydiveLogs-api/Mapper/ModelProfile.cs index fdfb83c..8cea0f3 100644 --- a/Back/skydiveLogs-api/Mapper/ModelProfile.cs +++ b/Back/skydiveLogs-api/Mapper/ModelProfile.cs @@ -19,23 +19,26 @@ namespace skydiveLogs_api.Mapper CreateMap(); CreateMap(); - CreateMap(); CreateMap().ForMember(dest => dest.AircraftId, opt => opt.MapFrom(s => s.Aircraft.Id)) .ForMember(dest => dest.DropZoneId, opt => opt.MapFrom(s => s.DropZone.Id)) .ForMember(dest => dest.GearId, opt => opt.MapFrom(s => s.Gear.Id)) .ForMember(dest => dest.JumpTypeId, opt => opt.MapFrom(s => s.JumpType.Id)); + CreateMap(); + + CreateMap(); CreateMap(); CreateMap(); CreateMap(); CreateMap(); CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); CreateMap(); - CreateMap(); - CreateMap(); - - CreateMap(); } #endregion Public Constructors