From 9bb246e4c0e472b583f1f0b1947e591c92321fdc Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 23 Mar 2017 02:17:30 +0100 Subject: [PATCH] =?UTF-8?q?refabriqu=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Yavsc/Models/Haircut/HairCutGenders.cs | 6 +++--- Yavsc/Models/Haircut/HairPrestation.cs | 7 ++++--- Yavsc/Yavsc.csproj | 3 +++ YavscLib/HairCut/HairLength.cs | 11 +++++++++++ YavscLib/HairCut/IPrestation.cs | 10 ++++++++++ YavscLib/YavscLib.csproj | 1 + 6 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 YavscLib/HairCut/HairLength.cs diff --git a/Yavsc/Models/Haircut/HairCutGenders.cs b/Yavsc/Models/Haircut/HairCutGenders.cs index ef5120dc..ad0b016b 100644 --- a/Yavsc/Models/Haircut/HairCutGenders.cs +++ b/Yavsc/Models/Haircut/HairCutGenders.cs @@ -11,7 +11,7 @@ namespace Yavsc.Models.Haircut Man, [Display(Name="Enfant")] - Kid - + Kid + } -} \ No newline at end of file +} diff --git a/Yavsc/Models/Haircut/HairPrestation.cs b/Yavsc/Models/Haircut/HairPrestation.cs index 6e30a19d..22b82fb1 100644 --- a/Yavsc/Models/Haircut/HairPrestation.cs +++ b/Yavsc/Models/Haircut/HairPrestation.cs @@ -1,7 +1,7 @@ - using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Newtonsoft.Json; namespace Yavsc.Models.Haircut { @@ -16,7 +16,7 @@ namespace Yavsc.Models.Haircut public long Id { get; set; } [Display(Name="Longueur de cheveux")] - public Haircut.HairLength Length { get; set; } + public HairLength Length { get; set; } [Display(Name="Pour qui")] public HairCutGenders Gender { get; set; } @@ -34,12 +34,13 @@ namespace Yavsc.Models.Haircut [Display(Name="Shampoing")] public bool Shampoo { get; set; } - [Display(Name="Couleurs")] + [Display(Name="Couleurs"),JsonIgnore] public virtual List Taints { get; set; } [Display(Name="Soins")] public bool Cares { get; set; } + } } diff --git a/Yavsc/Yavsc.csproj b/Yavsc/Yavsc.csproj index 5b572563..f170569c 100644 --- a/Yavsc/Yavsc.csproj +++ b/Yavsc/Yavsc.csproj @@ -29,5 +29,8 @@ + + + \ No newline at end of file diff --git a/YavscLib/HairCut/HairLength.cs b/YavscLib/HairCut/HairLength.cs new file mode 100644 index 00000000..24f35177 --- /dev/null +++ b/YavscLib/HairCut/HairLength.cs @@ -0,0 +1,11 @@ +namespace YavscLib.HairCut +{ + public enum HairLength : int + { + HalfLong, + + Short = 1, + + Long + } +} diff --git a/YavscLib/HairCut/IPrestation.cs b/YavscLib/HairCut/IPrestation.cs index b01ed9f9..253b4c85 100644 --- a/YavscLib/HairCut/IPrestation.cs +++ b/YavscLib/HairCut/IPrestation.cs @@ -4,6 +4,16 @@ namespace YavscLib.HairCut { long Id { get; set; } int Length { get; set; } + int Gender { get; set; } + bool Cut { get; set; } + int Dressing { get; set; } + int Tech { get; set; } + + bool Shampoo { get; set; } + + long[] Taints { get; set; } + + bool Cares { get; set; } } } diff --git a/YavscLib/YavscLib.csproj b/YavscLib/YavscLib.csproj index 29043a44..1b243a32 100644 --- a/YavscLib/YavscLib.csproj +++ b/YavscLib/YavscLib.csproj @@ -112,6 +112,7 @@ +