From dcc4ee20a2fe2c3f3464792f8a094420d32fc5ee Mon Sep 17 00:00:00 2001 From: sandre Date: Wed, 6 May 2026 21:36:15 +0200 Subject: [PATCH] Move the equipment into the Jump. --- Back/skydiveLogs-api.Domain/Gear.cs | 9 ++++++-- Back/skydiveLogs-api.Domain/Jump.cs | 22 ++++++++++++++----- .../GearService.cs | 1 - .../JumpService.cs | 1 + Back/skydiveLogs-api/DataContract/GearReq.cs | 2 -- Back/skydiveLogs-api/DataContract/GearResp.cs | 2 -- Back/skydiveLogs-api/DataContract/JumpReq.cs | 2 ++ Back/skydiveLogs-api/DataContract/JumpResp.cs | 11 ++++++++++ 8 files changed, 38 insertions(+), 12 deletions(-) diff --git a/Back/skydiveLogs-api.Domain/Gear.cs b/Back/skydiveLogs-api.Domain/Gear.cs index 2cddf55..781cf47 100644 --- a/Back/skydiveLogs-api.Domain/Gear.cs +++ b/Back/skydiveLogs-api.Domain/Gear.cs @@ -4,16 +4,21 @@ { #region Public Properties - public string Aad { get; set; } public int Id { get; set; } + public string Aad { get; set; } + public string MainCanopy { get; set; } + public string Manufacturer { get; set; } + public int MaxSize { get; set; } + public int MinSize { get; set; } + public string Name { get; set; } + public string ReserveCanopy { get; set; } - public string Equipment { get; set; } public User User { get; set; } diff --git a/Back/skydiveLogs-api.Domain/Jump.cs b/Back/skydiveLogs-api.Domain/Jump.cs index 9a37639..0263b21 100644 --- a/Back/skydiveLogs-api.Domain/Jump.cs +++ b/Back/skydiveLogs-api.Domain/Jump.cs @@ -6,20 +6,32 @@ namespace skydiveLogs_api.Domain { #region Public Properties - public Aircraft Aircraft { get; set; } - public int DeployAltitude { get; set; } - public DropZone DropZone { get; set; } - public int ExitAltitude { get; set; } - public Gear Gear { get; set; } public int Id { get; set; } + public Aircraft Aircraft { get; set; } + + public int DeployAltitude { get; set; } + + public DropZone DropZone { get; set; } + + public int ExitAltitude { get; set; } + + public Gear Gear { get; set; } + public bool IsSpecial { get; set; } + public DateTime JumpDate { get; set; } + public JumpType JumpType { get; set; } + public string Notes { get; set; } + public User User { get; set; } + public bool WithCutaway { get; set; } + public string Equipment { get; set; } + #endregion Public Properties } } \ No newline at end of file diff --git a/Back/skydiveLogs-api.DomainBusiness/GearService.cs b/Back/skydiveLogs-api.DomainBusiness/GearService.cs index bded456..0cb7286 100644 --- a/Back/skydiveLogs-api.DomainBusiness/GearService.cs +++ b/Back/skydiveLogs-api.DomainBusiness/GearService.cs @@ -52,7 +52,6 @@ namespace skydiveLogs_api.DomainBusiness MaxSize = 280, MinSize = 190, ReserveCanopy = "?", - Equipment = "RAS", User = newUser }; diff --git a/Back/skydiveLogs-api.DomainBusiness/JumpService.cs b/Back/skydiveLogs-api.DomainBusiness/JumpService.cs index b445fa1..19166a1 100644 --- a/Back/skydiveLogs-api.DomainBusiness/JumpService.cs +++ b/Back/skydiveLogs-api.DomainBusiness/JumpService.cs @@ -115,6 +115,7 @@ namespace skydiveLogs_api.DomainBusiness myJump.IsSpecial = updatedJump.IsSpecial; myJump.WithCutaway = updatedJump.WithCutaway; myJump.Notes = updatedJump.Notes; + myJump.Equipment = updatedJump.Equipment; _jumpRepository.Update(myJump); } diff --git a/Back/skydiveLogs-api/DataContract/GearReq.cs b/Back/skydiveLogs-api/DataContract/GearReq.cs index 988ef74..7002497 100644 --- a/Back/skydiveLogs-api/DataContract/GearReq.cs +++ b/Back/skydiveLogs-api/DataContract/GearReq.cs @@ -17,7 +17,5 @@ public string MainCanopy { get; set; } public string ReserveCanopy { get; set; } - - public string Equipment { get; set; } } } diff --git a/Back/skydiveLogs-api/DataContract/GearResp.cs b/Back/skydiveLogs-api/DataContract/GearResp.cs index 893103b..d48fe7e 100644 --- a/Back/skydiveLogs-api/DataContract/GearResp.cs +++ b/Back/skydiveLogs-api/DataContract/GearResp.cs @@ -17,7 +17,5 @@ public string MainCanopy { get; set; } public string ReserveCanopy { get; set; } - - public string Equipment { get; set; } } } diff --git a/Back/skydiveLogs-api/DataContract/JumpReq.cs b/Back/skydiveLogs-api/DataContract/JumpReq.cs index be68a0f..da48645 100644 --- a/Back/skydiveLogs-api/DataContract/JumpReq.cs +++ b/Back/skydiveLogs-api/DataContract/JumpReq.cs @@ -25,5 +25,7 @@ namespace skydiveLogs_api.DataContract public DateTime JumpDate { get; set; } public bool IsSpecial { get; set; } + + public string Equipment { get; set; } } } \ No newline at end of file diff --git a/Back/skydiveLogs-api/DataContract/JumpResp.cs b/Back/skydiveLogs-api/DataContract/JumpResp.cs index a68f3e1..9046b56 100644 --- a/Back/skydiveLogs-api/DataContract/JumpResp.cs +++ b/Back/skydiveLogs-api/DataContract/JumpResp.cs @@ -7,18 +7,29 @@ namespace skydiveLogs_api.DataContract #region Public Properties public int AircraftId { get; set; } + public int DeployAltitude { get; set; } + public int DropZoneId { get; set; } + public int ExitAltitude { get; set; } + public int GearId { get; set; } + public int Id { get; set; } public bool IsSpecial { get; set; } + public DateTime JumpDate { get; set; } + public int JumpTypeId { get; set; } + public string Notes { get; set; } + public bool WithCutaway { get; set; } + public string Equipment { get; set; } + #endregion Public Properties } } \ No newline at end of file