refactoring

Yavsc/Models/Haircut/HairCutQuery.cs

@@ -1,7 +1,9 @@
 
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Yavsc.Models.Billing;
+using Yavsc.Models.Relationship;
 
 namespace Yavsc.Models.Haircut
 {
@@ -9,6 +11,14 @@ namespace Yavsc.Models.Haircut
     {
         [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
-        HairPrestation [] Prestations { get; set; }
+        HairPrestation  Prestation { get; set; }
+
+        public Location Location { get; set; }
+
+        public DateTime EventDate
+        {
+            get;
+            set;
+        }
     }
 }

Yavsc/Models/Haircut/HairCutQueryEvent.cs

@@ -2,7 +2,7 @@ using Yavsc.Interfaces.Workflow;
 
 namespace Yavsc.Models.Haircut
 {
-    public class HairCutQueryEvent : BookQueryProviderInfo, IEvent
+    public class HairCutQueryEvent : RdvQueryProviderInfo, IEvent
     {
         public HairCutQueryEvent()
         {

Yavsc/Models/Haircut/HairDressings.cs

@@ -1,7 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+
 namespace Yavsc.Models.Haircut
 {
     public enum HairDressings {
+
+        Coiffage,
+        
         Brushing,
+        
+        [Display(Name="Mise en plis")]
         Folding
     }
 }

Yavsc/Models/Haircut/HairMultiCutQuery.cs

@@ -0,0 +1,23 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Yavsc.Models.Billing;
+using Yavsc.Models.Relationship;
+
+namespace Yavsc.Models.Haircut
+{
+    public class HairMultiCutQuery : NominativeServiceCommand
+    {
+        [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id { get; set; }
+        HairPrestation [] Prestations { get; set; }
+
+        public Location Location { get; set; }
+
+        public DateTime EventDate
+        {
+            get;
+            set;
+        }
+    }
+}

Yavsc/Models/Haircut/HairPrestation.cs

@@ -1,18 +1,39 @@
 
-using Yavsc.Models.Market;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Yavsc.Models.Haircut
 {
-    public class HairPrestation : Service
+    public class HairPrestation 
     { 
+        [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id { get; set; }
+
+        [Display(Name="Longueur de cheveux")]
         public HairLength Length { get; set; } 
+
+        [Display(Name="Pour qui")]
         public HairCutGenders Gender { get; set; } 
+
+        [Display(Name="Coupe")]
         public bool Cut { get; set; } 
 
+        [Display(Name="Coiffage")]
+
         public HairDressings Dressing { get; set; } 
+
+         [Display(Name="Technique")]
         public HairTechnos Tech { get; set; } 
+
+        [Display(Name="Shampoing")]
         public bool Shampoo { get; set; } 
-        public HairTaint[] Taints { get; set; } 
+
+        [Display(Name="Couleurs")]
+        
+        public virtual List<HairTaint> Taints { get; set; } 
+
+        [Display(Name="Soins")]
         public  bool Cares { get; set; } 
         
     }

Yavsc/Models/Haircut/HairTechnos.cs

@@ -1,13 +1,18 @@
+using System.ComponentModel.DataAnnotations;
+
 namespace Yavsc.Models.Haircut
 {
     
     public enum HairTechnos
     {
         Color,
+
+        [Display(Name="Permantante")]
         Permanent,
+        [Display(Name="Défrisage")]
         Defris,
+        [Display(Name="Mêches")]
         Mech,
-        Balayage,
-        TyAndDie
+        Balayage
     }
-}
+}