sandre/SkydiveLogs
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update for the tunnel graph to have the stats my month and type of flights

Browse Source
This commit is contained in:
Sébastien ANDRE
2023-08-22 13:04:29 +02:00
parent e21ab458b1
commit 7abfa2b2b7
6 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Back/skydiveLogs-api.Domain/Statistic.cs
View File

@@ -6,6 +6,8 @@
public string Label { get; set; } public string Label { get; set; }
public string Label2 { get; set; }
public int Nb { get; set; } public int Nb { get; set; }
#endregion Public Properties #endregion Public Properties

1
Back/skydiveLogs-api.Domain/TunnelFlight.cs
View File

@@ -1,5 +1,4 @@
using System; using System;
using System.Collections.Generic;
namespace skydiveLogs_api.Domain namespace skydiveLogs_api.Domain
{ {

5
Back/skydiveLogs-api.DomainBusiness/TunnelFlightService.cs
View File

@@ -56,11 +56,12 @@ namespace skydiveLogs_api.DomainBusiness
if (allTunnelFlights.Any()) 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, j => j,
(groupby, tunnelFlights) => new Statistic (groupby, tunnelFlights) => new Statistic
{ {
Label = groupby.ToString(), Label = groupby.FlightDate,
Label2 = groupby.JumpType.Name,
Nb = tunnelFlights.Sum(t => t.NbMinutes) Nb = tunnelFlights.Sum(t => t.NbMinutes)
}) })
.ToList(); .ToList();

4
Back/skydiveLogs-api/Controllers/TunnelFlightController.cs
View File

@@ -53,10 +53,10 @@ namespace skydiveLogs_api.Controllers
// GET: api/TunnelFlight/month/20230101/20230701 // GET: api/TunnelFlight/month/20230101/20230701
[HttpGet("month/{beginDate}/{endDate}")] [HttpGet("month/{beginDate}/{endDate}")]
[EnableCors] [EnableCors]
public IEnumerable<StatisticResp> GetGroupByMonth(string beginDate, string endDate) public IEnumerable<StatisticForChartResp> GetGroupByMonth(string beginDate, string endDate)
{ {
var result = _tunnelFlightService.GetTunnelFlightGroupByMonth(beginDate, endDate); var result = _tunnelFlightService.GetTunnelFlightGroupByMonth(beginDate, endDate);
return _mapper.Map<IEnumerable<StatisticResp>>(result); return _mapper.Map<IEnumerable<StatisticForChartResp>>(result);
} }
// POST: api/Tunnel // POST: api/Tunnel

11
Back/skydiveLogs-api/DataContract/StatisticForChartResp.cs Normal file
View File

@@ -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; }
}
}

13
Back/skydiveLogs-api/Mapper/ModelProfile.cs
View File

@@ -19,23 +19,26 @@ namespace skydiveLogs_api.Mapper
CreateMap<DataContract.ImageReq, UserImage>(); CreateMap<DataContract.ImageReq, UserImage>();
CreateMap<DataContract.TunnelFlightReq, TunnelFlight>(); CreateMap<DataContract.TunnelFlightReq, TunnelFlight>();
CreateMap<Gear, DataContract.GearResp>();
CreateMap<Jump, DataContract.JumpResp>().ForMember(dest => dest.AircraftId, opt => opt.MapFrom(s => s.Aircraft.Id)) CreateMap<Jump, DataContract.JumpResp>().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.DropZoneId, opt => opt.MapFrom(s => s.DropZone.Id))
.ForMember(dest => dest.GearId, opt => opt.MapFrom(s => s.Gear.Id)) .ForMember(dest => dest.GearId, opt => opt.MapFrom(s => s.Gear.Id))
.ForMember(dest => dest.JumpTypeId, opt => opt.MapFrom(s => s.JumpType.Id)); .ForMember(dest => dest.JumpTypeId, opt => opt.MapFrom(s => s.JumpType.Id));
CreateMap<TunnelFlight, DataContract.TunnelFlightResp>();
CreateMap<Gear, DataContract.GearResp>();
CreateMap<JumpType, DataContract.JumpTypeResp>(); CreateMap<JumpType, DataContract.JumpTypeResp>();
CreateMap<Aircraft, DataContract.AircraftResp>(); CreateMap<Aircraft, DataContract.AircraftResp>();
CreateMap<Aircraft, DataContract.AircraftSimpleResp>(); CreateMap<Aircraft, DataContract.AircraftSimpleResp>();
CreateMap<DropZone, DataContract.DropZoneResp>(); CreateMap<DropZone, DataContract.DropZoneResp>();
CreateMap<DropZone, DataContract.DropZoneSimpleResp>(); CreateMap<DropZone, DataContract.DropZoneSimpleResp>();
CreateMap<Tunnel, DataContract.TunnelResp>();
CreateMap<Statistic, DataContract.StatisticResp>(); CreateMap<Statistic, DataContract.StatisticResp>();
CreateMap<Statistic, DataContract.StatisticForChartResp>();
CreateMap<SimpleSummary, DataContract.SimpleSummaryResp>();
CreateMap<User, DataContract.UserResp>(); CreateMap<User, DataContract.UserResp>();
CreateMap<UserImage, DataContract.ImageResp>(); CreateMap<UserImage, DataContract.ImageResp>();
CreateMap<Tunnel, DataContract.TunnelResp>();
CreateMap<TunnelFlight, DataContract.TunnelFlightResp>();
CreateMap<SimpleSummary, DataContract.SimpleSummaryResp>();
} }
#endregion Public Constructors #endregion Public Constructors