refactoring

Yavsc/ApiControllers/BookQueryApiController.cs

@@ -12,7 +12,7 @@ namespace Yavsc.Controllers
     using System;
     using Yavsc.Models.Messaging;
     using Yavsc.Models;
-    using Yavsc.Models.Booking;
+    using Yavsc.Models.Workflow;
 
     [Produces("application/json")]
     [Route("api/bookquery"), Authorize(Roles = "Performer,Administrator")]

Yavsc/Controllers/CommandController.cs

@@ -9,15 +9,15 @@ using Microsoft.Data.Entity;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.OptionsModel;
-using Yavsc.Helpers;
-using Yavsc.Models;
-using Yavsc.Models.Booking;
-using Yavsc.Models.Google.Messaging;
-using Yavsc.Services;
 
 namespace Yavsc.Controllers
 {
+    using Helpers;
+    using Models;
+    using Models.Google.Messaging;
     using Models.Relationship;
+    using Models.Workflow;
+    using Services;
     
     [ServiceFilter(typeof(LanguageActionFilter))]
     public class CommandController : Controller
@@ -185,7 +185,7 @@ namespace Yavsc.Controllers
                     await _emailSender.SendEmailAsync(
                         _siteSettings, _smtpSettings,
                         command.PerformerProfile.Performer.Email,
-                        yaev.Topic+" "+yaev.Client.UserName,
+                        yaev.Topic+" "+yaev.Sender,
                         $"{yaev.Message}\r\n-- \r\n{yaev.Previsional}\r\n{yaev.EventDate}\r\n"
                     );
                 }

Yavsc/Controllers/EstimateController.cs

@@ -9,14 +9,14 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
 using Microsoft.Data.Entity;
 using Microsoft.Extensions.OptionsModel;
-using Yavsc.Helpers;
-using Yavsc.Models;
-using Yavsc.Models.Billing;
-using Yavsc.Models.Booking;
-using Yavsc.ViewModels;
 
 namespace Yavsc.Controllers
 {
+    using Helpers;
+    using Models;
+    using Models.Billing;
+    using Models.Workflow;
+    using ViewModels;
     [Authorize]
     public class EstimateController : Controller
     {

Yavsc/Controllers/FrontOfficeController.cs

@@ -11,7 +11,7 @@ namespace Yavsc.Controllers
 {
     using Helpers;
     using Models;
-    using Models.Booking;
+    using Models.Workflow;
     using ViewModels.FrontOffice;
     public class FrontOfficeController : Controller
     {

Yavsc/Helpers/EventHelpers.cs

@@ -1,9 +1,9 @@
 using Microsoft.Extensions.Localization;
-using Yavsc.Models.Booking;
-using Yavsc.Models.Messaging;
 
 namespace Yavsc.Helpers
 {
+    using Models.Workflow;
+    using Models.Messaging;
     public static class EventHelpers
     {
         public static BookQueryEvent CreateEvent(this BookQuery query,

Yavsc/Models/ApplicationDbContext.cs

@@ -10,8 +10,8 @@ using System.Threading;
 
 namespace Yavsc.Models
 {
-  using Relationship;
-  using Forms;
+    using Relationship;
+    using Forms;
     using YavscLib;
     using Auth;
     using Billing;
@@ -24,6 +24,7 @@ namespace Yavsc.Models
     using Messaging;
     using Access;
     using Booking.Profiles;
+    using Yavsc.Models.Workflow.Profiles;
 
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {

Yavsc/Models/Billing/Estimate.cs

@@ -8,8 +8,7 @@ using System.Linq;
 namespace Yavsc.Models.Billing
 {
     using Interfaces;
-    using Models.Booking;
-    using Yavsc.Models.Workflow;
+    using Models.Workflow;
 
     public partial class Estimate : IEstimate
     {

Yavsc/Models/Calendar/ICalendarManager.cs

@@ -20,11 +20,11 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-using Yavsc.Models.Booking;
-using Yavsc.Models.Messaging;
 
 namespace Yavsc.Models.Calendar
 {
+	using Models.Workflow;
+	using Models.Messaging;
 	/// <summary>
 	/// I calendar manager.
 	/// </summary>

Yavsc/Models/Workflow/BookQuery.cs

@@ -3,12 +3,11 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
 
-namespace Yavsc.Models.Booking
+namespace Yavsc.Models.Workflow
 {
   using YavscLib;
   using Yavsc.Models.Billing;
   using Yavsc.Models.Relationship;
-  using Yavsc.Models.Workflow;
     /// <summary>
     /// Query, for a date, with a given perfomer, at this given place.
     /// </summary>

Yavsc/Models/Workflow/Profiles/FormationSettings.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Yavsc.Models.Booking.Profiles
+namespace Yavsc.Models.Workflow.Profiles
 {
     using Models.Workflow;
     using YavscLib;

Yavsc/Models/Workflow/RendezVous.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Yavsc.Models.Market;
 
-namespace Yavsc.Models.Booking
+namespace Yavsc.Models.Workflow
 {
     using Models.Relationship;
     /// <summary>

Yavsc/Models/haircut/HairCutGenders.cs

@@ -0,0 +1,9 @@
+namespace Yavsc.Models.haircut
+{
+    public enum HairCutGenders : int
+    {
+        Kid = 1,
+        Man,
+        Women
+    }
+}

Yavsc/Models/haircut/HairCutQueryEvent.cs

@@ -0,0 +1,31 @@
+namespace Yavsc.Models.Messaging
+{
+    public class HairCutQueryEvent : BookQueryProviderInfo, IEvent
+    {
+        public HairCutQueryEvent()
+        {
+            Topic = "HairCutQuery";
+        }
+
+        public string Message
+        {
+            get;
+
+            set;
+        }
+
+        public string Sender
+        {
+            get;
+
+            set;
+        }
+
+        public string Topic
+        {
+            get;
+
+            set;
+        }
+    }
+}

Yavsc/Models/haircut/HairDressings.cs

@@ -0,0 +1,7 @@
+namespace Yavsc.Models.haircut
+{
+    public enum HairDressings {
+        Brushing,
+        Folding
+    }
+}

Yavsc/Models/haircut/HairLength.cs

@@ -0,0 +1,9 @@
+namespace Yavsc.Models.haircut
+{
+    public enum HairLength : int
+    {
+        Short = 1,
+        HalfLong,
+        Long
+    }
+}

Yavsc/Models/haircut/HairPrestation.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Yavsc.Models.haircut
+{
+    public class HairPrestation
+    { 
+        [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id { get; set;} 
+
+        public HairLength Length { get; set; } 
+        public HairCutGenders Gender { get; set; } 
+        public bool Cut { get; set; } 
+
+        public HairDressings Dressing { get; set; } 
+        public HairTechnos Tech { get; set; } 
+        public bool Shampoo { get; set; } 
+        public HairTaint[] Taints { get; set; } 
+        public  bool Cares { get; set; } 
+        
+    }
+}

Yavsc/Models/haircut/HairTaint.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Drawing;
+
+namespace Yavsc.Models.haircut
+{
+    public class HairTaint
+    {
+        [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id { get; set;}
+
+        public long Name { get; set; }
+
+        public Color Color {get; set;}
+    }
+}

Yavsc/Models/haircut/HairTechnos.cs

@@ -0,0 +1,13 @@
+namespace Yavsc.Models.haircut
+{
+    
+    public enum HairTechnos
+    {
+        Color,
+        Permanent,
+        Defris,
+        Mech,
+        Balayage,
+        TyAndDie
+    }
+}

Yavsc/ViewModels/Auth/Handlers/CommandEditHandler.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNet.Authorization;
 
 namespace Yavsc.ViewModels.Auth.Handlers
 {
-    using Models.Booking;
+    using Models.Workflow;
     public class CommandEditHandler : AuthorizationHandler<EditRequirement, BookQuery>
     {
         protected override void Handle(AuthorizationContext context, EditRequirement requirement, BookQuery resource)

Yavsc/ViewModels/Auth/Handlers/CommandViewHandler.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNet.Authorization;
 
 namespace Yavsc.ViewModels.Auth.Handlers
 {
-    using Models.Booking;
+    using Models.Workflow;
     public class CommandViewHandler : AuthorizationHandler<ViewRequirement, BookQuery>
     {
         protected override void Handle(AuthorizationContext context, ViewRequirement requirement, BookQuery resource)