From 1067b450f53e5c7470042209f5036693200a1450 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sun, 30 Apr 2017 01:39:47 +0200 Subject: [PATCH] =?UTF-8?q?permet=20la=20liaison=20avec=20le=20profile=20g?= =?UTF-8?q?=C3=A9n=C3=A9ral?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Yavsc/Models/Haircut/BrusherProfile.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Yavsc/Models/Haircut/BrusherProfile.cs b/Yavsc/Models/Haircut/BrusherProfile.cs index c9c3ab5a..6bb413c4 100644 --- a/Yavsc/Models/Haircut/BrusherProfile.cs +++ b/Yavsc/Models/Haircut/BrusherProfile.cs @@ -1,4 +1,7 @@ using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Newtonsoft.Json; +using Yavsc.Models.Workflow; using YavscLib; namespace Yavsc.Models.Haircut @@ -11,6 +14,10 @@ namespace Yavsc.Models.Haircut get; set; } + [JsonIgnore,ForeignKey("UserId")] + public virtual PerformerProfile BaseProfile { get; set; } + + [Display(Name="Rayon d'action"),DisplayFormat(DataFormatString="{0} km")] public int ActionDistance { get; set; } @@ -19,7 +26,7 @@ namespace Yavsc.Models.Haircut /// /// [Display(Name="Début de la journée")] - public int StartOfTheDay { get; set;} + public int StartOfTheDay { get; set;} /// /// End Of The Day, In munutes /// @@ -33,7 +40,7 @@ namespace Yavsc.Models.Haircut [Display(Name="Coupe femme cheveux mi-longs"),DisplayFormat(DataFormatString="{0:C}")] public decimal WomenHalfCutPrice { get; set; } - + [Display(Name="Coupe femme cheveux courts"),DisplayFormat(DataFormatString="{0:C}")] public decimal WomenShortCutPrice { get; set; } @@ -137,4 +144,4 @@ namespace Yavsc.Models.Haircut public decimal FlatFeeDiscount { get; set; } } -} \ No newline at end of file +}