From 4d3194d13a1bb96b6d78a7f184362e1c1101f79a Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sat, 1 Apr 2017 02:14:10 +0200
Subject: [PATCH] une commande de coupe de cheveux

---
 Yavsc/Constants.cs                            |    3 +-
 Yavsc/Controllers/HairCutCommandController.cs |   90 +-
 .../Controllers/HairPrestationsController.cs  |    2 +-
 Yavsc/Controllers/ManageController.cs         |   84 +-
 Yavsc/Helpers/BankInfoHelpers.cs              |   18 +
 Yavsc/Helpers/EventHelpers.cs                 |   24 +-
 Yavsc/Helpers/HaircutHelpers.cs               |  130 ++
 ...20170329075249_avatarMayBeNull.Designer.cs |    1 -
 .../20170329075249_avatarMayBeNull.cs         |    2 -
 ...7_rdvqueryAndNoLocationNorDate.Designer.cs | 1406 +++++++++++++++++
 ...0331214327_rdvqueryAndNoLocationNorDate.cs |  608 +++++++
 .../ApplicationDbContextModelSnapshot.cs      |    6 +-
 Yavsc/Models/ApplicationDbContext.cs          |   25 +-
 Yavsc/Models/Haircut/HairCutQuery.cs          |   10 +-
 Yavsc/Models/Haircut/HairMultiCutQuery.cs     |   21 +-
 Yavsc/Models/Identity/ApplicationUser.cs      |    4 +-
 .../Models/Messaging/RdvQueryProviderInfo.cs  |    6 +-
 Yavsc/Startup/Startup.cs                      |    3 -
 .../ViewModels/Manage/AddBankInfoViewModel.cs |   24 -
 Yavsc/Views/Administration/Index.cshtml       |   13 +-
 Yavsc/Views/CommandForms/Index.cshtml         |    8 +-
 Yavsc/Views/FrontOffice/HairCut.cshtml        |    2 +-
 .../BrusherProfileScript.cshtml               |   16 +-
 .../HairCutCommand/CommandConfirmation.cshtml |   41 +-
 Yavsc/Views/HairCutCommand/HairCut.cshtml     |    9 +-
 Yavsc/Views/Home/Index.cshtml                 |   22 +-
 Yavsc/Views/Manage/AddBankInfo.cshtml         |   38 +-
 Yavsc/Views/Manage/SetActivity.cshtml         |   14 +-
 Yavsc/Views/Manage/SetAddress.cshtml          |   50 +
 .../DisplayTemplates/TwitterAccount.cshtml    |    3 +
 Yavsc/Views/Shared/_Layout.cshtml             |   23 +-
 .../Shared/_ValidationScriptsPartial.cshtml   |    1 -
 Yavsc/wwwroot/css/main/bootstrap.css          |    4 +-
 Yavsc/wwwroot/css/main/site.css               |   12 +-
 Yavsc/wwwroot/images/greenstar.svg            |  423 +++++
 Yavsc/wwwroot/js/google-geoloc.js             |   88 ++
 Yavsc/wwwroot/js/parallax.js                  |   97 ++
 YavscLib/HairCut/IHairCutQuery.cs             |    2 +-
 38 files changed, 3137 insertions(+), 196 deletions(-)
 create mode 100644 Yavsc/Helpers/BankInfoHelpers.cs
 create mode 100644 Yavsc/Helpers/HaircutHelpers.cs
 create mode 100644 Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs
 create mode 100644 Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.cs
 delete mode 100644 Yavsc/ViewModels/Manage/AddBankInfoViewModel.cs
 create mode 100644 Yavsc/Views/Manage/SetAddress.cshtml
 create mode 100644 Yavsc/Views/Shared/DisplayTemplates/TwitterAccount.cshtml
 create mode 100644 Yavsc/wwwroot/images/greenstar.svg
 create mode 100644 Yavsc/wwwroot/js/google-geoloc.js
 create mode 100644 Yavsc/wwwroot/js/parallax.js

diff --git a/Yavsc/Constants.cs b/Yavsc/Constants.cs
index a1bb935e..6d340dda 100644
--- a/Yavsc/Constants.cs
+++ b/Yavsc/Constants.cs
@@ -8,7 +8,8 @@ namespace Yavsc
             CompanyClaimType = "https://schemas.pschneider.fr/identity/claims/Company",
             UserNameRegExp = @"^[a-zA-Z][a-zA-Z0-9 ]*$",
             AuthorizePath = "~/authorize",
-        	TokenPath = "~/token", LoginPath = "~/signin",
+        	TokenPath = "~/token",
+            LoginPath = "~/signin",
             LogoutPath = "~/signout", UserInfoPath = "~/api/me",
             ApplicationAuthenticationSheme = "ServerCookie",
             ExternalAuthenticationSheme= "ExternalCookie",
diff --git a/Yavsc/Controllers/HairCutCommandController.cs b/Yavsc/Controllers/HairCutCommandController.cs
index 38272b2d..9ca07bdd 100644
--- a/Yavsc/Controllers/HairCutCommandController.cs
+++ b/Yavsc/Controllers/HairCutCommandController.cs
@@ -21,6 +21,7 @@ namespace Yavsc.Controllers
     using Microsoft.AspNet.Http;
     using Yavsc.Extensions;
     using Yavsc.Models.Haircut;
+    using System.Globalization;
 
     public class HairCutCommandController : CommandController
     {
@@ -40,10 +41,10 @@ namespace Yavsc.Controllers
 
         [HttpPost, Authorize]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> CreateHairCutQuery(HairCutQuery command)
+        public async Task<IActionResult> CreateHairCutQuery(HairCutQuery model)
         {
             var uid = User.GetUserId();
-            var prid = command.PerformerId;
+            var prid = model.PerformerId;
             if (string.IsNullOrWhiteSpace(uid)
             || string.IsNullOrWhiteSpace(prid))
                 throw new InvalidOperationException(
@@ -53,39 +54,43 @@ namespace Yavsc.Controllers
                 u => u.Performer
             ).Include(u => u.Performer.Devices)
             .FirstOrDefault(
-                x => x.PerformerId == command.PerformerId
+                x => x.PerformerId == model.PerformerId
             );
-            var user = await _userManager.FindByIdAsync(uid);
-            command.Client = user;
-            command.ClientId = uid;
-            command.PerformerProfile = pro;
+            model.PerformerProfile = pro;
             // FIXME Why!!
             // ModelState.ClearValidationState("PerformerProfile.Avatar");
             // ModelState.ClearValidationState("Client.Avatar");
             // ModelState.ClearValidationState("ClientId");
-            ModelState.MarkFieldSkipped("ClientId");
 
             if (ModelState.IsValid)
                 {
-                var existingLocation = _context.Locations.FirstOrDefault( x=>x.Address == command.Location.Address
-                && x.Longitude == command.Location.Longitude && x.Latitude == command.Location.Latitude );
+                    if (model.Location!=null) {
+                        var existingLocation = await _context.Locations.FirstOrDefaultAsync( x=>x.Address == model.Location.Address
+                        && x.Longitude == model.Location.Longitude && x.Latitude == model.Location.Latitude );
 
-                if (existingLocation!=null) {
-                    command.Location=existingLocation;
-                }
-                else _context.Attach<Location>(command.Location);
+                        if (existingLocation!=null) {
+                            model.Location=existingLocation;
+                        }
+                        else _context.Attach<Location>(model.Location);
+                    }
+                    var existingPrestation = await _context.HairPrestation.FirstOrDefaultAsync( x=> model.PrestationId == x.Id );
 
-                _context.HairCutQueries.Add(command, GraphBehavior.IncludeDependents);
-                _context.SaveChanges(User.GetUserId());
+                    if (existingPrestation!=null) {
+                        model.Prestation = existingPrestation;
+                    }
+                    else _context.Attach<HairPrestation>(model.Prestation);
 
-                var yaev = command.CreateEvent(_localizer);
+                _context.HairCutQueries.Add(model);
+                await _context.SaveChangesAsync(User.GetUserId());
+                var brusherProfile = await _context.BrusherProfile.SingleAsync(p=>p.UserId == pro.PerformerId);
+                var yaev = model.CreateEvent(_localizer);
                 MessageWithPayloadResponse grep = null;
 
                 if (pro.AcceptPublicContact)
                 {
                     if (pro.AcceptNotifications) {
                         if (pro.Performer.Devices.Count > 0) {
-                            var regids = command.PerformerProfile.Performer
+                            var regids = model.PerformerProfile.Performer
                             .Devices.Select(d => d.GCMRegistrationId);
                             grep = await _GCMSender.NotifyHairCutQueryAsync(_googleSettings,regids,yaev);
                         }
@@ -94,12 +99,12 @@ namespace Yavsc.Controllers
                         // if (grep==null || grep.success<=0 || grep.failure>0)
                         ViewBag.GooglePayload=grep;
                         if (grep!=null)
-                        _logger.LogWarning($"Performer: {command.PerformerProfile.Performer.UserName} success: {grep.success} failure: {grep.failure}");
+                        _logger.LogWarning($"Performer: {model.PerformerProfile.Performer.UserName} success: {grep.success} failure: {grep.failure}");
                     }
 
                     await _emailSender.SendEmailAsync(
                         _siteSettings, _smtpSettings,
-                        command.PerformerProfile.Performer.Email,
+                        model.PerformerProfile.Performer.Email,
                         yaev.Topic+" "+yaev.Sender,
                         $"{yaev.Message}\r\n-- \r\n{yaev.Previsional}\r\n{yaev.EventDate}\r\n"
                     );
@@ -107,16 +112,19 @@ namespace Yavsc.Controllers
                 else {
                     // TODO if (AcceptProContact) try & find a bookmaker to send him this query
                 }
-                ViewBag.Activity =  _context.Activities.FirstOrDefault(a=>a.Code == command.ActivityCode);
+                ViewBag.Activity =  _context.Activities.FirstOrDefault(a=>a.Code == model.ActivityCode);
                 ViewBag.GoogleSettings = _googleSettings;
-                return View("CommandConfirmation",command);
+               var addition = model.Prestation.Addition(brusherProfile);
+                  ViewBag.Addition = addition.ToString("C",CultureInfo.CurrentUICulture);
+                return View("CommandConfirmation",model);
             }
-            ViewBag.Activity =  _context.Activities.FirstOrDefault(a=>a.Code == command.ActivityCode);
+            ViewBag.Activity =  _context.Activities.FirstOrDefault(a=>a.Code == model.ActivityCode);
             ViewBag.GoogleSettings = _googleSettings;
-            return View(command);
+            SetViewData(model.ActivityCode,model.PerformerId,model.Prestation);
+            return View("HairCut",model);
         }
 
-        public ActionResult HairCut(string performerId, string activityCode)
+        public async Task<ActionResult> HairCut(string performerId, string activityCode)
         {
             HairPrestation pPrestation=null;
             var prestaJson = HttpContext.Session.GetString("HairCutPresta") ;
@@ -125,6 +133,26 @@ namespace Yavsc.Controllers
             }
             else pPrestation = new HairPrestation {};
 
+            var uid = User.GetUserId();
+            var user = await _userManager.FindByIdAsync(uid);
+
+            SetViewData(activityCode,performerId,pPrestation);
+
+            var perfer = _context.Performers.Include(
+                    p=>p.Performer
+                ).Single(p=>p.PerformerId == performerId);
+            var result = new HairCutQuery {
+                PerformerProfile = perfer,
+                PerformerId = perfer.PerformerId,
+                ClientId = uid,
+                Prestation = pPrestation,
+                Client = user
+            };
+
+            return View(result);
+        }
+        private void SetViewData (string activityCode, string performerId, HairPrestation pPrestation )
+        {
             ViewBag.HairTaints = _context.HairTaint.Include(t=>t.Color);
             ViewBag.HairTechnos = EnumExtensions.GetSelectList(typeof(HairTechnos),_localizer);
             ViewBag.HairLength = EnumExtensions.GetSelectList(typeof(HairLength),_localizer);
@@ -135,16 +163,6 @@ namespace Yavsc.Controllers
             || pPrestation.Tech == HairTechnos.Mech ) ? "":"hidden";
             ViewBag.TechClass = ( pPrestation.Gender == HairCutGenders.Women ) ? "":"hidden";
             ViewData["PerfPrefs"] = _context.BrusherProfile.Single(p=>p.UserId == performerId);
-            var perfer = _context.Performers.Include(
-                    p=>p.Performer
-                ).Single(p=>p.PerformerId == performerId);
-            var result = new HairCutQuery {
-                PerformerProfile = perfer,
-                PerformerId = perfer.PerformerId,
-                ClientId = User.GetUserId(),
-                Prestation = pPrestation
-            };
-            return View(result);
         }
 
         [HttpPost, Authorize]
@@ -219,7 +237,7 @@ namespace Yavsc.Controllers
             }
             ViewBag.Activity =  _context.Activities.FirstOrDefault(a=>a.Code == command.ActivityCode);
             ViewBag.GoogleSettings = _googleSettings;
-            return View(command);
+            return View("HairCut",command);
         }
     }
 }
diff --git a/Yavsc/Controllers/HairPrestationsController.cs b/Yavsc/Controllers/HairPrestationsController.cs
index 116ba040..f77fcd2c 100644
--- a/Yavsc/Controllers/HairPrestationsController.cs
+++ b/Yavsc/Controllers/HairPrestationsController.cs
@@ -12,7 +12,7 @@ namespace Yavsc.Controllers
 
         public HairPrestationsController(ApplicationDbContext context)
         {
-            _context = context;    
+            _context = context;
         }
 
         // GET: HairPrestations
diff --git a/Yavsc/Controllers/ManageController.cs b/Yavsc/Controllers/ManageController.cs
index c8d28475..2a045a96 100644
--- a/Yavsc/Controllers/ManageController.cs
+++ b/Yavsc/Controllers/ManageController.cs
@@ -25,6 +25,7 @@ namespace Yavsc.Controllers
     using Models.Relationship;
     using PayPal.PayPalAPIInterfaceService;
     using PayPal.PayPalAPIInterfaceService.Model;
+    using Yavsc.Models.Bank;
 
     [Authorize]
     public class ManageController : Controller
@@ -88,6 +89,8 @@ namespace Yavsc.Controllers
                 : message == ManageMessageId.SetActivitySuccess ? _SR["Your activity was set."]
                 : message == ManageMessageId.AvatarUpdateSuccess ? _SR["Your avatar was updated."]
                 : message == ManageMessageId.IdentityUpdateSuccess ? _SR["Your identity was updated."]
+                : message == ManageMessageId.SetBankInfoSuccess ? _SR["Vos informations bancaires ont bien été enregistrées."]
+                : message == ManageMessageId.SetAddressSuccess ? _SR["Votre adresse a bien été enregistrée."]
                 : "";
 
             var user = await GetCurrentUserAsync();
@@ -265,7 +268,7 @@ namespace Yavsc.Controllers
             return View();
         }
 
-        [HttpGet, Authorize]
+        [HttpGet]
         public async Task<IActionResult> SetGoogleCalendar(string returnUrl)
         {
             var credential = await _userManager.GetCredentialForGoogleApiAsync(
@@ -290,8 +293,7 @@ namespace Yavsc.Controllers
             return View(new SetGoogleCalendarViewModel { ReturnUrl = returnUrl });
         }
 
-        [HttpPost, ValidateAntiForgeryToken,
-        Authorize]
+        [HttpPost, ValidateAntiForgeryToken]
         public async Task<IActionResult> SetGoogleCalendar(SetGoogleCalendarViewModel model)
         {
             var user = _dbContext.Users.FirstOrDefault(u => u.Id == User.GetUserId());
@@ -302,16 +304,41 @@ namespace Yavsc.Controllers
             else return Redirect(model.ReturnUrl);
         }
 
-        [HttpGet,Authorize]
+        [HttpGet]
         public async Task<IActionResult> AddBankInfo()
         {
-            var user = await _userManager.FindByIdAsync(User.GetUserId());
+            var uid = User.GetUserId();
+            var user = await _dbContext.Users.Include(u=>u.BankInfo).SingleAsync(u=>u.Id==uid);
 
-            return View(new AddBankInfoViewModel(
-                user.BankInfo));
+            return View(user.BankInfo);
         }
 
-        [HttpGet,Authorize]
+        [HttpPost]
+        public async Task<IActionResult> AddBankInfo (BankIdentity model)
+        {
+            if (ModelState.IsValid)
+            {
+                // TODO PostBankInfoRequirement & auth
+                var uid = User.GetUserId();
+                var user = _dbContext.Users.Include(u=>u.BankInfo)
+                    .Single(u=>u.Id == uid);
+
+                if (user.BankInfo != null)
+                 {
+                     model.Id = user.BankInfo.Id;
+                     _dbContext.Entry(user.BankInfo).State = EntityState.Detached;
+                     _dbContext.Update(model);
+                 }
+                 else {
+                     user.BankInfo = model;
+                     _dbContext.Update(user);
+                 }
+                 await _dbContext.SaveChangesAsync();
+            }
+            return RedirectToAction(nameof(Index), new { Message = ManageMessageId.SetBankInfoSuccess });
+        }
+
+        [HttpGet]
         public async Task<IActionResult> SetFullName()
         {
             var user = await _userManager.FindByIdAsync(User.GetUserId());
@@ -483,13 +510,13 @@ namespace Yavsc.Controllers
             return RedirectToAction(nameof(ManageLogins), new { Message = message });
         }
 
-        [HttpGet, Authorize]
+        [HttpGet]
         public IActionResult SetAvatar()
         {
             return View();
         }
 
-        [HttpGet, Authorize]
+        [HttpGet]
         public IActionResult SetActivity()
         {
             var user = GetCurrentUserAsync().Result;
@@ -520,7 +547,6 @@ namespace Yavsc.Controllers
 
 
         [HttpPost]
-        [Authorize]
         public async Task<IActionResult> SetActivity(PerformerProfile model)
         {
             var user = GetCurrentUserAsync().Result;
@@ -588,7 +614,7 @@ namespace Yavsc.Controllers
             return View(model);
         }
 
-        [HttpPost, Authorize]
+        [HttpPost]
         public async Task<IActionResult> UnsetActivity()
         {
             var user = GetCurrentUserAsync().Result;
@@ -784,6 +810,9 @@ namespace Yavsc.Controllers
             UnsetActivitySuccess,
             AvatarUpdateSuccess,
             IdentityUpdateSuccess,
+            SetBankInfoSuccess,
+
+            SetAddressSuccess,
             Error
         }
 
@@ -794,5 +823,36 @@ namespace Yavsc.Controllers
         }
 
         #endregion
+
+        [HttpGet]
+        public async Task <IActionResult> SetAddress()
+        {
+            var uid = User.GetUserId();
+            var user = await _dbContext.Users.Include(u=>u.PostalAddress).SingleAsync(u=>u.Id==uid);
+            ViewBag.GoogleSettings =  _googleSettings;
+            return View(user.PostalAddress);
+        }
+
+        [HttpPost]
+        public async Task <IActionResult> SetAddress(Location model)
+        {
+            if (ModelState.IsValid) {
+                var uid = User.GetUserId();
+
+                var user = _dbContext.Users.Include(u=>u.PostalAddress).Single(u=>u.Id==uid);
+
+                var existingLocation = _dbContext.Locations.FirstOrDefault( x=>x.Address == model.Address
+                && x.Longitude == model.Longitude && x.Latitude == model.Latitude );
+
+                if (existingLocation!=null) {
+                    user.PostalAddressId = existingLocation.Id;
+                } else _dbContext.Attach<Location>(model);
+                user.PostalAddress = model;
+                await _dbContext.SaveChangesAsync();
+                return RedirectToAction(nameof(Index), new { Message = ManageMessageId.SetAddressSuccess });
+            }
+            ViewBag.GoogleSettings = _googleSettings;
+            return View(model);
+        }
     }
 }
diff --git a/Yavsc/Helpers/BankInfoHelpers.cs b/Yavsc/Helpers/BankInfoHelpers.cs
new file mode 100644
index 00000000..74de1bb6
--- /dev/null
+++ b/Yavsc/Helpers/BankInfoHelpers.cs
@@ -0,0 +1,18 @@
+namespace Yavsc.Helpers
+{
+    using Models.Bank;
+    public static class BankInfoHelpers
+    {
+        public static bool IsValid(this BankIdentity info) { 
+            return ByIbanBIC(info) || ByAccountNumber(info) ;
+        }
+        public static bool ByIbanBIC(this BankIdentity info) {
+            return (info.BIC != null && info.IBAN != null) ;
+        }
+        public static bool ByAccountNumber(this BankIdentity info){ 
+
+                return (info.BankCode != null && info.WicketCode != null && info.AccountNumber != null && info.BankedKey >0);
+
+        }
+    }
+}
diff --git a/Yavsc/Helpers/EventHelpers.cs b/Yavsc/Helpers/EventHelpers.cs
index 943c238c..031fcac2 100644
--- a/Yavsc/Helpers/EventHelpers.cs
+++ b/Yavsc/Helpers/EventHelpers.cs
@@ -12,7 +12,7 @@ namespace Yavsc.Helpers
         IStringLocalizer SR)
         {
             var yaev = new RdvQueryEvent
-            {   
+            {
                 Sender = query.ClientId,
                 Message = string.Format(SR["RdvToPerf"],
                 query.Client.UserName,
@@ -21,8 +21,8 @@ namespace Yavsc.Helpers
                 query.ActivityCode)+
                 "\n"+query.Reason,
                 Client =  new ClientProviderInfo { 
-                    UserName = query.Client.UserName , 
-                    UserId = query.ClientId, 
+                    UserName = query.Client.UserName ,
+                    UserId = query.ClientId,
                     Avatar = query.Client.Avatar }  ,
                 Previsional = query.Previsional,
                 EventDate = query.EventDate,
@@ -37,22 +37,22 @@ namespace Yavsc.Helpers
         IStringLocalizer SR)
         {
             var yaev = new HairCutQueryEvent
-            {   
+            {
                 Sender = query.ClientId,
                 Message = string.Format(SR["RdvToPerf"],
                 query.Client.UserName,
-                query.EventDate.ToString("dddd dd/MM/yyyy à HH:mm"),
-                query.Location.Address,
+                query.EventDate?.ToString("dddd dd/MM/yyyy à HH:mm")??"[pas de date spécifiée]",
+                query.Location?.Address??"[pas de lieu spécifié]",
                 query.ActivityCode),
                 Client =  new ClientProviderInfo { 
-                    UserName = query.Client.UserName , 
-                    UserId = query.ClientId, 
+                    UserName = query.Client.UserName ,
+                    UserId = query.ClientId,
                     Avatar = query.Client.Avatar }  ,
                 Previsional = query.Previsional,
                 EventDate = query.EventDate,
                 Location = query.Location,
                 Id = query.Id,
-                Reason = "Coupe particulier",
+                Reason = "Coupe pour un particulier",
                 ActivityCode = query.ActivityCode
             };
             return yaev;
@@ -62,7 +62,7 @@ namespace Yavsc.Helpers
         IStringLocalizer SR)
         {
             var yaev = new HairCutQueryEvent
-            {   
+            {
                 Sender = query.ClientId,
                 Message = string.Format(SR["RdvToPerf"],
                 query.Client.UserName,
@@ -70,8 +70,8 @@ namespace Yavsc.Helpers
                 query.Location.Address,
                 query.ActivityCode),
                 Client =  new ClientProviderInfo { 
-                    UserName = query.Client.UserName , 
-                    UserId = query.ClientId, 
+                    UserName = query.Client.UserName ,
+                    UserId = query.ClientId,
                     Avatar = query.Client.Avatar }  ,
                 Previsional = query.Previsional,
                 EventDate = query.EventDate,
diff --git a/Yavsc/Helpers/HaircutHelpers.cs b/Yavsc/Helpers/HaircutHelpers.cs
new file mode 100644
index 00000000..dea34203
--- /dev/null
+++ b/Yavsc/Helpers/HaircutHelpers.cs
@@ -0,0 +1,130 @@
+using Yavsc.Models.Haircut;
+
+namespace Yavsc.Helpers
+{
+    public static class HaircutHelpers
+    {
+        public static decimal Addition (this HairPrestation p, BrusherProfile profile)
+        {
+            decimal sub=0;
+            // Le shampoing
+            sub += p.Shampoo ? profile.ShampooPrice:0;
+
+            // la coupe
+            sub += p.Cut ? p.Gender == HairCutGenders.Women ?
+                        p.Length == HairLength.Long ? profile.WomenLongCutPrice :
+                        p.Length == HairLength.HalfLong ? profile.WomenHalfCutPrice :
+                        profile.WomenShortCutPrice : p.Gender == HairCutGenders.Man ?
+                        profile.ManCutPrice : profile.KidCutPrice : 0;
+
+            // Les techniques
+            switch (p.Tech) {
+                case HairTechnos.Color:
+                    bool multicolor = p.Taints.Count>1;
+                    switch (p.Length) {
+                        case HairLength.Long:
+                            sub += sub += multicolor? profile.LongMultiColorPrice : profile.LongColorPrice;
+                            break;
+                        case HairLength.HalfLong: sub += multicolor? profile.HalfMultiColorPrice : profile.HalfColorPrice;
+                            break;
+                        default:
+                            sub +=  multicolor? profile.ShortMultiColorPrice : profile.ShortColorPrice;
+                            break;
+                    }
+                    break;
+                case HairTechnos.Balayage:
+                    switch (p.Length) {
+                        case HairLength.Long:
+                            sub += profile.LongBalayagePrice;
+                            break;
+                        case HairLength.HalfLong: sub += profile.HalfBalayagePrice;
+                            break;
+                        default:
+                            sub += profile.ShortBalayagePrice;
+                            break;
+                    }
+                    break;
+                case HairTechnos.Defris:
+                    switch (p.Length) {
+                        case HairLength.Long:
+                            sub += profile.LongDefrisPrice;
+                            break;
+                        case HairLength.HalfLong: sub += profile.HalfDefrisPrice;
+                            break;
+                        default:
+                            sub += profile.ShortDefrisPrice;
+                            break;
+                    }
+                    break;
+                case HairTechnos.Mech:
+                    switch (p.Length) {
+                        case HairLength.Long:
+                            sub += profile.LongMechPrice;
+                            break;
+                        case HairLength.HalfLong: sub += profile.HalfMechPrice;
+                            break;
+                        default:
+                            sub += profile.ShortMechPrice;
+                            break;
+                    }
+                    break;
+                case HairTechnos.Permanent:
+                    switch (p.Length) {
+                        case HairLength.Long:
+                            sub += profile.LongPermanentPrice;
+                            break;
+                        case HairLength.HalfLong: sub += profile.HalfPermanentPrice;
+                            break;
+                        default:
+                            sub += profile.ShortPermanentPrice;
+                            break;
+                    }
+                    break;
+
+            }
+
+            // Les coiffages
+            switch (p.Dressing) {
+                case HairDressings.Brushing:
+                    switch (p.Gender) {
+                        case HairCutGenders.Women:
+                            switch (p.Length) {
+                                case HairLength.Long:
+                                    sub += profile.LongBrushingPrice;
+                                    break;
+                                case HairLength.HalfLong: sub += profile.HalfBrushingPrice;
+                                    break;
+                                default:
+                                    sub += profile.ShortBrushingPrice;
+                                    break;
+                            }
+                            break;
+                        case HairCutGenders.Man:
+                            sub += profile.ManBrushPrice;
+                            break;
+                    }
+                    break;
+                case HairDressings.Coiffage:
+                    // est offert
+                    break;
+                case HairDressings.Folding:
+                     switch (p.Length) {
+                        case HairLength.Long:
+                            sub += profile.LongFoldingPrice;
+                            break;
+                        case HairLength.HalfLong: sub += profile.HalfFoldingPrice;
+                            break;
+                        default:
+                            sub += profile.ShortFoldingPrice;
+                            break;
+                    }
+                    break;
+            }
+
+            // les soins
+            sub += p.Cares ? profile.CarePrice:0;
+            return sub;
+
+        }
+    }
+}
diff --git a/Yavsc/Migrations/20170329075249_avatarMayBeNull.Designer.cs b/Yavsc/Migrations/20170329075249_avatarMayBeNull.Designer.cs
index eb941d3b..84ca3f60 100644
--- a/Yavsc/Migrations/20170329075249_avatarMayBeNull.Designer.cs
+++ b/Yavsc/Migrations/20170329075249_avatarMayBeNull.Designer.cs
@@ -1,7 +1,6 @@
 using System;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Infrastructure;
-using Microsoft.Data.Entity.Metadata;
 using Microsoft.Data.Entity.Migrations;
 using Yavsc.Models;
 
diff --git a/Yavsc/Migrations/20170329075249_avatarMayBeNull.cs b/Yavsc/Migrations/20170329075249_avatarMayBeNull.cs
index 5cf3bb4c..7d00ee4f 100644
--- a/Yavsc/Migrations/20170329075249_avatarMayBeNull.cs
+++ b/Yavsc/Migrations/20170329075249_avatarMayBeNull.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using Microsoft.Data.Entity.Migrations;
 
 namespace Yavsc.Migrations
diff --git a/Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs b/Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs
new file mode 100644
index 00000000..9f6e963e
--- /dev/null
+++ b/Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs
@@ -0,0 +1,1406 @@
+using System;
+using Microsoft.Data.Entity;
+using Microsoft.Data.Entity.Infrastructure;
+using Microsoft.Data.Entity.Migrations;
+using Yavsc.Models;
+
+namespace Yavsc.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20170331214327_rdvqueryAndNoLocationNorDate")]
+    partial class rdvqueryAndNoLocationNorDate
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.0-rc1-16348");
+
+            modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b =>
+                {
+                    b.Property<string>("Id");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Name")
+                        .HasAnnotation("MaxLength", 256);
+
+                    b.Property<string>("NormalizedName")
+                        .HasAnnotation("MaxLength", 256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .HasAnnotation("Relational:Name", "RoleNameIndex");
+
+                    b.HasAnnotation("Relational:TableName", "AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasAnnotation("Relational:TableName", "AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasAnnotation("Relational:TableName", "AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("ProviderKey");
+
+                    b.Property<string>("ProviderDisplayName");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasAnnotation("Relational:TableName", "AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("RoleId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasAnnotation("Relational:TableName", "AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Access.Ban", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("DateCreated");
+
+                    b.Property<DateTime>("DateModified");
+
+                    b.Property<string>("UserCreated");
+
+                    b.Property<string>("UserModified");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Access.BlackListed", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("OwnerId")
+                        .IsRequired();
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Access.CircleAuthorizationToBlogPost", b =>
+                {
+                    b.Property<long>("CircleId");
+
+                    b.Property<long>("BlogPostId");
+
+                    b.HasKey("CircleId", "BlogPostId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.AccountBalance", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<long>("ContactCredits");
+
+                    b.Property<decimal>("Credits");
+
+                    b.HasKey("UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.ApplicationUser", b =>
+                {
+                    b.Property<string>("Id");
+
+                    b.Property<int>("AccessFailedCount");
+
+                    b.Property<string>("Avatar")
+                        .HasAnnotation("MaxLength", 512)
+                        .HasAnnotation("Relational:DefaultValue", "/images/Users/icon_user.png")
+                        .HasAnnotation("Relational:DefaultValueType", "System.String");
+
+                    b.Property<long?>("BankInfoId");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("DedicatedGoogleCalendar");
+
+                    b.Property<long>("DiskQuota")
+                        .HasAnnotation("Relational:DefaultValue", "524288000")
+                        .HasAnnotation("Relational:DefaultValueType", "System.Int64");
+
+                    b.Property<long>("DiskUsage");
+
+                    b.Property<string>("Email")
+                        .HasAnnotation("MaxLength", 256);
+
+                    b.Property<bool>("EmailConfirmed");
+
+                    b.Property<string>("FullName")
+                        .HasAnnotation("MaxLength", 512);
+
+                    b.Property<bool>("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasAnnotation("MaxLength", 256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasAnnotation("MaxLength", 256);
+
+                    b.Property<string>("PasswordHash");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed");
+
+                    b.Property<long?>("PostalAddressId");
+
+                    b.Property<string>("SecurityStamp");
+
+                    b.Property<bool>("TwoFactorEnabled");
+
+                    b.Property<string>("UserName")
+                        .HasAnnotation("MaxLength", 256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasAnnotation("Relational:Name", "EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .HasAnnotation("Relational:Name", "UserNameIndex");
+
+                    b.HasAnnotation("Relational:TableName", "AspNetUsers");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Auth.Client", b =>
+                {
+                    b.Property<string>("Id");
+
+                    b.Property<bool>("Active");
+
+                    b.Property<string>("DisplayName");
+
+                    b.Property<string>("LogoutRedirectUri")
+                        .HasAnnotation("MaxLength", 100);
+
+                    b.Property<string>("RedirectUri");
+
+                    b.Property<int>("RefreshTokenLifeTime");
+
+                    b.Property<string>("Secret");
+
+                    b.Property<int>("Type");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Auth.RefreshToken", b =>
+                {
+                    b.Property<string>("Id");
+
+                    b.Property<string>("ClientId")
+                        .IsRequired()
+                        .HasAnnotation("MaxLength", 50);
+
+                    b.Property<DateTime>("ExpiresUtc");
+
+                    b.Property<DateTime>("IssuedUtc");
+
+                    b.Property<string>("ProtectedTicket")
+                        .IsRequired();
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasAnnotation("MaxLength", 50);
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.BalanceImpact", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("BalanceId")
+                        .IsRequired();
+
+                    b.Property<DateTime>("ExecDate");
+
+                    b.Property<decimal>("Impact");
+
+                    b.Property<string>("Reason")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Bank.BankIdentity", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("AccountNumber")
+                        .HasAnnotation("MaxLength", 15);
+
+                    b.Property<string>("BIC")
+                        .HasAnnotation("MaxLength", 15);
+
+                    b.Property<string>("BankCode")
+                        .HasAnnotation("MaxLength", 5);
+
+                    b.Property<int>("BankedKey");
+
+                    b.Property<string>("IBAN")
+                        .HasAnnotation("MaxLength", 33);
+
+                    b.Property<string>("WicketCode")
+                        .HasAnnotation("MaxLength", 5);
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Count");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasAnnotation("MaxLength", 512);
+
+                    b.Property<long>("EstimateId");
+
+                    b.Property<long?>("EstimateTemplateId");
+
+                    b.Property<decimal>("UnitaryCost");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("AttachedFilesString");
+
+                    b.Property<string>("AttachedGraphicsString");
+
+                    b.Property<string>("ClientId")
+                        .IsRequired();
+
+                    b.Property<DateTime>("ClientValidationDate");
+
+                    b.Property<long?>("CommandId");
+
+                    b.Property<string>("CommandType")
+                        .IsRequired();
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("OwnerId")
+                        .IsRequired();
+
+                    b.Property<DateTime>("ProviderValidationDate");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Billing.EstimateTemplate", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("OwnerId")
+                        .IsRequired();
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Billing.ExceptionSIREN", b =>
+                {
+                    b.Property<string>("SIREN");
+
+                    b.HasKey("SIREN");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Blog", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("AuthorId");
+
+                    b.Property<string>("Content");
+
+                    b.Property<DateTime>("DateCreated");
+
+                    b.Property<DateTime>("DateModified");
+
+                    b.Property<string>("Photo");
+
+                    b.Property<int>("Rate");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("UserCreated");
+
+                    b.Property<string>("UserModified");
+
+                    b.Property<bool>("Visible");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Chat.Connection", b =>
+                {
+                    b.Property<string>("ConnectionId");
+
+                    b.Property<string>("ApplicationUserId")
+                        .IsRequired();
+
+                    b.Property<bool>("Connected");
+
+                    b.Property<string>("UserAgent");
+
+                    b.HasKey("ConnectionId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Drawing.Color", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte>("Blue");
+
+                    b.Property<byte>("Green");
+
+                    b.Property<string>("Name");
+
+                    b.Property<byte>("Red");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Forms.Form", b =>
+                {
+                    b.Property<string>("Id");
+
+                    b.Property<string>("Summary");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Haircut.BrusherProfile", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<int>("ActionDistance");
+
+                    b.Property<decimal>("CarePrice");
+
+                    b.Property<int>("EndOfTheDay");
+
+                    b.Property<decimal>("FlatFeeDiscount");
+
+                    b.Property<decimal>("HalfBalayagePrice");
+
+                    b.Property<decimal>("HalfBrushingPrice");
+
+                    b.Property<decimal>("HalfColorPrice");
+
+                    b.Property<decimal>("HalfDefrisPrice");
+
+                    b.Property<decimal>("HalfFoldingPrice");
+
+                    b.Property<decimal>("HalfMechPrice");
+
+                    b.Property<decimal>("HalfMultiColorPrice");
+
+                    b.Property<decimal>("HalfPermanentPrice");
+
+                    b.Property<decimal>("KidCutPrice");
+
+                    b.Property<decimal>("LongBalayagePrice");
+
+                    b.Property<decimal>("LongBrushingPrice");
+
+                    b.Property<decimal>("LongColorPrice");
+
+                    b.Property<decimal>("LongDefrisPrice");
+
+                    b.Property<decimal>("LongFoldingPrice");
+
+                    b.Property<decimal>("LongMechPrice");
+
+                    b.Property<decimal>("LongMultiColorPrice");
+
+                    b.Property<decimal>("LongPermanentPrice");
+
+                    b.Property<decimal>("ManBrushPrice");
+
+                    b.Property<decimal>("ManCutPrice");
+
+                    b.Property<decimal>("ShampooPrice");
+
+                    b.Property<decimal>("ShortBalayagePrice");
+
+                    b.Property<decimal>("ShortBrushingPrice");
+
+                    b.Property<decimal>("ShortColorPrice");
+
+                    b.Property<decimal>("ShortDefrisPrice");
+
+                    b.Property<decimal>("ShortFoldingPrice");
+
+                    b.Property<decimal>("ShortMechPrice");
+
+                    b.Property<decimal>("ShortMultiColorPrice");
+
+                    b.Property<decimal>("ShortPermanentPrice");
+
+                    b.Property<int>("StartOfTheDay");
+
+                    b.Property<decimal>("WomenHalfCutPrice");
+
+                    b.Property<decimal>("WomenLongCutPrice");
+
+                    b.Property<decimal>("WomenShortCutPrice");
+
+                    b.HasKey("UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Haircut.HairCutQuery", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ActivityCode")
+                        .IsRequired();
+
+                    b.Property<string>("ClientId")
+                        .IsRequired();
+
+                    b.Property<DateTime>("DateCreated");
+
+                    b.Property<DateTime>("DateModified");
+
+                    b.Property<DateTime?>("EventDate");
+
+                    b.Property<long?>("LocationId");
+
+                    b.Property<string>("PerformerId")
+                        .IsRequired();
+
+                    b.Property<long>("PrestationId");
+
+                    b.Property<decimal?>("Previsional");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("UserCreated");
+
+                    b.Property<string>("UserModified");
+
+                    b.Property<DateTime?>("ValidationDate");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Haircut.HairMultiCutQuery", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ActivityCode")
+                        .IsRequired();
+
+                    b.Property<string>("ClientId")
+                        .IsRequired();
+
+                    b.Property<DateTime>("DateCreated");
+
+                    b.Property<DateTime>("DateModified");
+
+                    b.Property<DateTime>("EventDate");
+
+                    b.Property<long?>("LocationId");
+
+                    b.Property<string>("PerformerId")
+                        .IsRequired();
+
+                    b.Property<decimal?>("Previsional");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("UserCreated");
+
+                    b.Property<string>("UserModified");
+
+                    b.Property<DateTime?>("ValidationDate");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Haircut.HairPrestation", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Cares");
+
+                    b.Property<bool>("Cut");
+
+                    b.Property<int>("Dressing");
+
+                    b.Property<int>("Gender");
+
+                    b.Property<long?>("HairMultiCutQueryId");
+
+                    b.Property<int>("Length");
+
+                    b.Property<bool>("Shampoo");
+
+                    b.Property<int>("Tech");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Haircut.HairTaint", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Brand");
+
+                    b.Property<long>("ColorId");
+
+                    b.Property<long?>("HairPrestationId");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b =>
+                {
+                    b.Property<string>("DeviceId");
+
+                    b.Property<DateTime>("DeclarationDate")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP");
+
+                    b.Property<string>("DeviceOwnerId");
+
+                    b.Property<string>("GCMRegistrationId")
+                        .IsRequired();
+
+                    b.Property<string>("Model");
+
+                    b.Property<string>("Platform");
+
+                    b.Property<string>("Version");
+
+                    b.HasKey("DeviceId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Market.Product", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<decimal>("Depth");
+
+                    b.Property<string>("Description");
+
+                    b.Property<decimal>("Height");
+
+                    b.Property<string>("Name");
+
+                    b.Property<decimal?>("Price");
+
+                    b.Property<bool>("Public");
+
+                    b.Property<decimal>("Weight");
+
+                    b.Property<decimal>("Width");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Market.Service", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ContextId");
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("Name");
+
+                    b.Property<bool>("Public");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Messaging.ClientProviderInfo", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("Avatar");
+
+                    b.Property<long?>("BillingAddressId");
+
+                    b.Property<string>("EMail");
+
+                    b.Property<string>("Phone");
+
+                    b.Property<string>("UserName");
+
+                    b.HasKey("UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Messaging.DimissClicked", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<long>("NotificationId");
+
+                    b.HasKey("UserId", "NotificationId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Messaging.Notification", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("body")
+                        .IsRequired();
+
+                    b.Property<string>("click_action")
+                        .IsRequired();
+
+                    b.Property<string>("color");
+
+                    b.Property<string>("icon");
+
+                    b.Property<string>("sound");
+
+                    b.Property<string>("tag");
+
+                    b.Property<string>("title")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Musical.Instrument", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasAnnotation("MaxLength", 255);
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Musical.MusicalPreference", b =>
+                {
+                    b.Property<string>("OwnerProfileId");
+
+                    b.Property<string>("DjSettingsUserId");
+
+                    b.Property<string>("GeneralSettingsUserId");
+
+                    b.Property<int>("Rate");
+
+                    b.Property<long>("TendencyId");
+
+                    b.HasKey("OwnerProfileId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Musical.MusicalTendency", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasAnnotation("MaxLength", 255);
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Musical.Profiles.DjSettings", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("SoundCloudId");
+
+                    b.HasKey("UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Musical.Profiles.GeneralSettings", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.HasKey("UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Musical.Profiles.Instrumentation", b =>
+                {
+                    b.Property<long>("InstrumentId");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("InstrumentId", "UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.OAuth.OAuth2Tokens", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("AccessToken");
+
+                    b.Property<DateTime>("Expiration");
+
+                    b.Property<string>("ExpiresIn");
+
+                    b.Property<string>("RefreshToken");
+
+                    b.Property<string>("TokenType");
+
+                    b.HasKey("UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.Circle", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ApplicationUserId");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("OwnerId");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.CircleMember", b =>
+                {
+                    b.Property<string>("MemberId");
+
+                    b.Property<long>("CircleId");
+
+                    b.HasKey("MemberId", "CircleId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.Contact", b =>
+                {
+                    b.Property<string>("OwnerId");
+
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("ApplicationUserId");
+
+                    b.HasKey("OwnerId", "UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.Location", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasAnnotation("MaxLength", 512);
+
+                    b.Property<double>("Latitude");
+
+                    b.Property<double>("Longitude");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.LocationType", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.PostTag", b =>
+                {
+                    b.Property<long>("PostId");
+
+                    b.Property<long>("TagId");
+
+                    b.HasKey("PostId", "TagId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.Tag", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Name")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Skill", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Name");
+
+                    b.Property<int>("Rate");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.Activity", b =>
+                {
+                    b.Property<string>("Code")
+                        .HasAnnotation("MaxLength", 512);
+
+                    b.Property<DateTime>("DateCreated");
+
+                    b.Property<DateTime>("DateModified");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("Hidden");
+
+                    b.Property<string>("ModeratorGroupName");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasAnnotation("MaxLength", 512);
+
+                    b.Property<string>("ParentCode")
+                        .HasAnnotation("MaxLength", 512);
+
+                    b.Property<string>("Photo");
+
+                    b.Property<int>("Rate");
+
+                    b.Property<string>("SettingsClassName");
+
+                    b.Property<string>("UserCreated");
+
+                    b.Property<string>("UserModified");
+
+                    b.HasKey("Code");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.CommandForm", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ActionName");
+
+                    b.Property<string>("ActivityCode")
+                        .IsRequired();
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.CoWorking", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("FormationSettingsUserId");
+
+                    b.Property<string>("PerformerId");
+
+                    b.Property<string>("WorkingForId");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b =>
+                {
+                    b.Property<string>("PerformerId");
+
+                    b.Property<bool>("AcceptNotifications");
+
+                    b.Property<bool>("AcceptPublicContact");
+
+                    b.Property<bool>("Active");
+
+                    b.Property<int?>("MaxDailyCost");
+
+                    b.Property<int?>("MinDailyCost");
+
+                    b.Property<long>("OrganizationAddressId");
+
+                    b.Property<int>("Rate");
+
+                    b.Property<string>("SIREN")
+                        .IsRequired()
+                        .HasAnnotation("MaxLength", 14);
+
+                    b.Property<bool>("UseGeoLocalizationToReduceDistanceWithClients");
+
+                    b.Property<string>("WebSite");
+
+                    b.HasKey("PerformerId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.Profiles.FormationSettings", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.HasKey("UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.RdvQuery", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ActivityCode")
+                        .IsRequired();
+
+                    b.Property<string>("ClientId")
+                        .IsRequired();
+
+                    b.Property<DateTime>("DateCreated");
+
+                    b.Property<DateTime>("DateModified");
+
+                    b.Property<DateTime>("EventDate");
+
+                    b.Property<long?>("LocationId");
+
+                    b.Property<long?>("LocationTypeId");
+
+                    b.Property<string>("PerformerId")
+                        .IsRequired();
+
+                    b.Property<decimal?>("Previsional");
+
+                    b.Property<string>("Reason");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("UserCreated");
+
+                    b.Property<string>("UserModified");
+
+                    b.Property<DateTime?>("ValidationDate");
+
+                    b.HasKey("Id");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.UserActivity", b =>
+                {
+                    b.Property<string>("DoesCode");
+
+                    b.Property<string>("UserId");
+
+                    b.Property<int>("Weight");
+
+                    b.HasKey("DoesCode", "UserId");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId");
+
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Access.BlackListed", b =>
+                {
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("OwnerId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Access.CircleAuthorizationToBlogPost", b =>
+                {
+                    b.HasOne("Yavsc.Models.Blog")
+                        .WithMany()
+                        .HasForeignKey("BlogPostId");
+
+                    b.HasOne("Yavsc.Models.Relationship.Circle")
+                        .WithMany()
+                        .HasForeignKey("CircleId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.AccountBalance", b =>
+                {
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithOne()
+                        .HasForeignKey("Yavsc.Models.AccountBalance", "UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.ApplicationUser", b =>
+                {
+                    b.HasOne("Yavsc.Models.Bank.BankIdentity")
+                        .WithMany()
+                        .HasForeignKey("BankInfoId");
+
+                    b.HasOne("Yavsc.Models.Relationship.Location")
+                        .WithMany()
+                        .HasForeignKey("PostalAddressId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.BalanceImpact", b =>
+                {
+                    b.HasOne("Yavsc.Models.AccountBalance")
+                        .WithMany()
+                        .HasForeignKey("BalanceId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b =>
+                {
+                    b.HasOne("Yavsc.Models.Billing.Estimate")
+                        .WithMany()
+                        .HasForeignKey("EstimateId");
+
+                    b.HasOne("Yavsc.Models.Billing.EstimateTemplate")
+                        .WithMany()
+                        .HasForeignKey("EstimateTemplateId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b =>
+                {
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+
+                    b.HasOne("Yavsc.Models.Workflow.RdvQuery")
+                        .WithMany()
+                        .HasForeignKey("CommandId");
+
+                    b.HasOne("Yavsc.Models.Workflow.PerformerProfile")
+                        .WithMany()
+                        .HasForeignKey("OwnerId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Blog", b =>
+                {
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("AuthorId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Chat.Connection", b =>
+                {
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Haircut.HairCutQuery", b =>
+                {
+                    b.HasOne("Yavsc.Models.Workflow.Activity")
+                        .WithMany()
+                        .HasForeignKey("ActivityCode");
+
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+
+                    b.HasOne("Yavsc.Models.Relationship.Location")
+                        .WithMany()
+                        .HasForeignKey("LocationId");
+
+                    b.HasOne("Yavsc.Models.Workflow.PerformerProfile")
+                        .WithMany()
+                        .HasForeignKey("PerformerId");
+
+                    b.HasOne("Yavsc.Models.Haircut.HairPrestation")
+                        .WithMany()
+                        .HasForeignKey("PrestationId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Haircut.HairMultiCutQuery", b =>
+                {
+                    b.HasOne("Yavsc.Models.Workflow.Activity")
+                        .WithMany()
+                        .HasForeignKey("ActivityCode");
+
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+
+                    b.HasOne("Yavsc.Models.Relationship.Location")
+                        .WithMany()
+                        .HasForeignKey("LocationId");
+
+                    b.HasOne("Yavsc.Models.Workflow.PerformerProfile")
+                        .WithMany()
+                        .HasForeignKey("PerformerId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Haircut.HairPrestation", b =>
+                {
+                    b.HasOne("Yavsc.Models.Haircut.HairMultiCutQuery")
+                        .WithMany()
+                        .HasForeignKey("HairMultiCutQueryId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Haircut.HairTaint", b =>
+                {
+                    b.HasOne("Yavsc.Models.Drawing.Color")
+                        .WithMany()
+                        .HasForeignKey("ColorId");
+
+                    b.HasOne("Yavsc.Models.Haircut.HairPrestation")
+                        .WithMany()
+                        .HasForeignKey("HairPrestationId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b =>
+                {
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("DeviceOwnerId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Market.Service", b =>
+                {
+                    b.HasOne("Yavsc.Models.Workflow.Activity")
+                        .WithMany()
+                        .HasForeignKey("ContextId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Messaging.ClientProviderInfo", b =>
+                {
+                    b.HasOne("Yavsc.Models.Relationship.Location")
+                        .WithMany()
+                        .HasForeignKey("BillingAddressId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Messaging.DimissClicked", b =>
+                {
+                    b.HasOne("Yavsc.Models.Messaging.Notification")
+                        .WithMany()
+                        .HasForeignKey("NotificationId");
+
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Musical.MusicalPreference", b =>
+                {
+                    b.HasOne("Yavsc.Models.Musical.Profiles.DjSettings")
+                        .WithMany()
+                        .HasForeignKey("DjSettingsUserId");
+
+                    b.HasOne("Yavsc.Models.Musical.Profiles.GeneralSettings")
+                        .WithMany()
+                        .HasForeignKey("GeneralSettingsUserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Musical.Profiles.Instrumentation", b =>
+                {
+                    b.HasOne("Yavsc.Models.Musical.Instrument")
+                        .WithMany()
+                        .HasForeignKey("InstrumentId");
+
+                    b.HasOne("Yavsc.Models.Workflow.PerformerProfile")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.Circle", b =>
+                {
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.CircleMember", b =>
+                {
+                    b.HasOne("Yavsc.Models.Relationship.Circle")
+                        .WithMany()
+                        .HasForeignKey("CircleId");
+
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("MemberId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.Contact", b =>
+                {
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Relationship.PostTag", b =>
+                {
+                    b.HasOne("Yavsc.Models.Blog")
+                        .WithMany()
+                        .HasForeignKey("PostId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.Activity", b =>
+                {
+                    b.HasOne("Yavsc.Models.Workflow.Activity")
+                        .WithMany()
+                        .HasForeignKey("ParentCode");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.CommandForm", b =>
+                {
+                    b.HasOne("Yavsc.Models.Workflow.Activity")
+                        .WithMany()
+                        .HasForeignKey("ActivityCode");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.CoWorking", b =>
+                {
+                    b.HasOne("Yavsc.Models.Workflow.Profiles.FormationSettings")
+                        .WithMany()
+                        .HasForeignKey("FormationSettingsUserId");
+
+                    b.HasOne("Yavsc.Models.Workflow.PerformerProfile")
+                        .WithMany()
+                        .HasForeignKey("PerformerId");
+
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("WorkingForId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b =>
+                {
+                    b.HasOne("Yavsc.Models.Relationship.Location")
+                        .WithMany()
+                        .HasForeignKey("OrganizationAddressId");
+
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("PerformerId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.RdvQuery", b =>
+                {
+                    b.HasOne("Yavsc.Models.Workflow.Activity")
+                        .WithMany()
+                        .HasForeignKey("ActivityCode");
+
+                    b.HasOne("Yavsc.Models.ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+
+                    b.HasOne("Yavsc.Models.Relationship.Location")
+                        .WithMany()
+                        .HasForeignKey("LocationId");
+
+                    b.HasOne("Yavsc.Models.Relationship.LocationType")
+                        .WithMany()
+                        .HasForeignKey("LocationTypeId");
+
+                    b.HasOne("Yavsc.Models.Workflow.PerformerProfile")
+                        .WithMany()
+                        .HasForeignKey("PerformerId");
+                });
+
+            modelBuilder.Entity("Yavsc.Models.Workflow.UserActivity", b =>
+                {
+                    b.HasOne("Yavsc.Models.Workflow.Activity")
+                        .WithMany()
+                        .HasForeignKey("DoesCode");
+
+                    b.HasOne("Yavsc.Models.Workflow.PerformerProfile")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+        }
+    }
+}
diff --git a/Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.cs b/Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.cs
new file mode 100644
index 00000000..db0cb9ea
--- /dev/null
+++ b/Yavsc/Migrations/20170331214327_rdvqueryAndNoLocationNorDate.cs
@@ -0,0 +1,608 @@
+using System;
+using Microsoft.Data.Entity.Migrations;
+
+namespace Yavsc.Migrations
+{
+    public partial class rdvqueryAndNoLocationNorDate : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId", table: "AspNetRoleClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId", table: "AspNetUserClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId", table: "AspNetUserLogins");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_IdentityRole_RoleId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_ApplicationUser_UserId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_BlackListed_ApplicationUser_OwnerId", table: "BlackListed");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Blog_BlogPostId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance");
+            migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact");
+            migrationBuilder.DropForeignKey(name: "FK_CommandLine_Estimate_EstimateId", table: "CommandLine");
+            migrationBuilder.DropForeignKey(name: "FK_Estimate_ApplicationUser_ClientId", table: "Estimate");
+            migrationBuilder.DropForeignKey(name: "FK_Estimate_PerformerProfile_OwnerId", table: "Estimate");
+            migrationBuilder.DropForeignKey(name: "FK_Connection_ApplicationUser_ApplicationUserId", table: "Connection");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_Activity_ActivityCode", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_ApplicationUser_ClientId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_PerformerProfile_PerformerId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_HairPrestation_PrestationId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_Activity_ActivityCode", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_ApplicationUser_ClientId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaint_Color_ColorId", table: "HairTaint");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_Notification_NotificationId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_ApplicationUser_UserId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_Instrumentation_Instrument_InstrumentId", table: "Instrumentation");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_PostTag_Blog_PostId", table: "PostTag");
+            migrationBuilder.DropForeignKey(name: "FK_CommandForm_Activity_ActivityCode", table: "CommandForm");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_Activity_ActivityCode", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_ApplicationUser_ClientId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_PerformerProfile_PerformerId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_Activity_DoesCode", table: "UserActivity");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_PerformerProfile_UserId", table: "UserActivity");
+            migrationBuilder.AlterColumn<long>(
+                name: "LocationId",
+                table: "HairCutQuery",
+                nullable: true);
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "EventDate",
+                table: "HairCutQuery",
+                nullable: true);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId",
+                table: "AspNetRoleClaims",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId",
+                table: "AspNetUserClaims",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId",
+                table: "AspNetUserLogins",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_IdentityRole_RoleId",
+                table: "AspNetUserRoles",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_ApplicationUser_UserId",
+                table: "AspNetUserRoles",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlackListed_ApplicationUser_OwnerId",
+                table: "BlackListed",
+                column: "OwnerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_Blog_BlogPostId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "BlogPostId",
+                principalTable: "Blog",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_AccountBalance_ApplicationUser_UserId",
+                table: "AccountBalance",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BalanceImpact_AccountBalance_BalanceId",
+                table: "BalanceImpact",
+                column: "BalanceId",
+                principalTable: "AccountBalance",
+                principalColumn: "UserId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandLine_Estimate_EstimateId",
+                table: "CommandLine",
+                column: "EstimateId",
+                principalTable: "Estimate",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Estimate_ApplicationUser_ClientId",
+                table: "Estimate",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Estimate_PerformerProfile_OwnerId",
+                table: "Estimate",
+                column: "OwnerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Connection_ApplicationUser_ApplicationUserId",
+                table: "Connection",
+                column: "ApplicationUserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_Activity_ActivityCode",
+                table: "HairCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_ApplicationUser_ClientId",
+                table: "HairCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_PerformerProfile_PerformerId",
+                table: "HairCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_HairPrestation_PrestationId",
+                table: "HairCutQuery",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_Activity_ActivityCode",
+                table: "HairMultiCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_ApplicationUser_ClientId",
+                table: "HairMultiCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId",
+                table: "HairMultiCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaint_Color_ColorId",
+                table: "HairTaint",
+                column: "ColorId",
+                principalTable: "Color",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_Notification_NotificationId",
+                table: "DimissClicked",
+                column: "NotificationId",
+                principalTable: "Notification",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_ApplicationUser_UserId",
+                table: "DimissClicked",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Instrumentation_Instrument_InstrumentId",
+                table: "Instrumentation",
+                column: "InstrumentId",
+                principalTable: "Instrument",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_Circle_CircleId",
+                table: "CircleMember",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_ApplicationUser_MemberId",
+                table: "CircleMember",
+                column: "MemberId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PostTag_Blog_PostId",
+                table: "PostTag",
+                column: "PostId",
+                principalTable: "Blog",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandForm_Activity_ActivityCode",
+                table: "CommandForm",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_Location_OrganizationAddressId",
+                table: "PerformerProfile",
+                column: "OrganizationAddressId",
+                principalTable: "Location",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_ApplicationUser_PerformerId",
+                table: "PerformerProfile",
+                column: "PerformerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_Activity_ActivityCode",
+                table: "RdvQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_ApplicationUser_ClientId",
+                table: "RdvQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_PerformerProfile_PerformerId",
+                table: "RdvQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_Activity_DoesCode",
+                table: "UserActivity",
+                column: "DoesCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_PerformerProfile_UserId",
+                table: "UserActivity",
+                column: "UserId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId", table: "AspNetRoleClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId", table: "AspNetUserClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId", table: "AspNetUserLogins");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_IdentityRole_RoleId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_ApplicationUser_UserId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_BlackListed_ApplicationUser_OwnerId", table: "BlackListed");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Blog_BlogPostId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance");
+            migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact");
+            migrationBuilder.DropForeignKey(name: "FK_CommandLine_Estimate_EstimateId", table: "CommandLine");
+            migrationBuilder.DropForeignKey(name: "FK_Estimate_ApplicationUser_ClientId", table: "Estimate");
+            migrationBuilder.DropForeignKey(name: "FK_Estimate_PerformerProfile_OwnerId", table: "Estimate");
+            migrationBuilder.DropForeignKey(name: "FK_Connection_ApplicationUser_ApplicationUserId", table: "Connection");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_Activity_ActivityCode", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_ApplicationUser_ClientId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_PerformerProfile_PerformerId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_HairPrestation_PrestationId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_Activity_ActivityCode", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_ApplicationUser_ClientId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaint_Color_ColorId", table: "HairTaint");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_Notification_NotificationId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_ApplicationUser_UserId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_Instrumentation_Instrument_InstrumentId", table: "Instrumentation");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_PostTag_Blog_PostId", table: "PostTag");
+            migrationBuilder.DropForeignKey(name: "FK_CommandForm_Activity_ActivityCode", table: "CommandForm");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_Activity_ActivityCode", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_ApplicationUser_ClientId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_PerformerProfile_PerformerId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_Activity_DoesCode", table: "UserActivity");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_PerformerProfile_UserId", table: "UserActivity");
+            migrationBuilder.AlterColumn<long>(
+                name: "LocationId",
+                table: "HairCutQuery",
+                nullable: false);
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "EventDate",
+                table: "HairCutQuery",
+                nullable: false);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId",
+                table: "AspNetRoleClaims",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId",
+                table: "AspNetUserClaims",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId",
+                table: "AspNetUserLogins",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_IdentityRole_RoleId",
+                table: "AspNetUserRoles",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_ApplicationUser_UserId",
+                table: "AspNetUserRoles",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlackListed_ApplicationUser_OwnerId",
+                table: "BlackListed",
+                column: "OwnerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_Blog_BlogPostId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "BlogPostId",
+                principalTable: "Blog",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_AccountBalance_ApplicationUser_UserId",
+                table: "AccountBalance",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BalanceImpact_AccountBalance_BalanceId",
+                table: "BalanceImpact",
+                column: "BalanceId",
+                principalTable: "AccountBalance",
+                principalColumn: "UserId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandLine_Estimate_EstimateId",
+                table: "CommandLine",
+                column: "EstimateId",
+                principalTable: "Estimate",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Estimate_ApplicationUser_ClientId",
+                table: "Estimate",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Estimate_PerformerProfile_OwnerId",
+                table: "Estimate",
+                column: "OwnerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Connection_ApplicationUser_ApplicationUserId",
+                table: "Connection",
+                column: "ApplicationUserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_Activity_ActivityCode",
+                table: "HairCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_ApplicationUser_ClientId",
+                table: "HairCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_PerformerProfile_PerformerId",
+                table: "HairCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_HairPrestation_PrestationId",
+                table: "HairCutQuery",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_Activity_ActivityCode",
+                table: "HairMultiCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_ApplicationUser_ClientId",
+                table: "HairMultiCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId",
+                table: "HairMultiCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaint_Color_ColorId",
+                table: "HairTaint",
+                column: "ColorId",
+                principalTable: "Color",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_Notification_NotificationId",
+                table: "DimissClicked",
+                column: "NotificationId",
+                principalTable: "Notification",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_ApplicationUser_UserId",
+                table: "DimissClicked",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Instrumentation_Instrument_InstrumentId",
+                table: "Instrumentation",
+                column: "InstrumentId",
+                principalTable: "Instrument",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_Circle_CircleId",
+                table: "CircleMember",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_ApplicationUser_MemberId",
+                table: "CircleMember",
+                column: "MemberId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PostTag_Blog_PostId",
+                table: "PostTag",
+                column: "PostId",
+                principalTable: "Blog",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandForm_Activity_ActivityCode",
+                table: "CommandForm",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_Location_OrganizationAddressId",
+                table: "PerformerProfile",
+                column: "OrganizationAddressId",
+                principalTable: "Location",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_ApplicationUser_PerformerId",
+                table: "PerformerProfile",
+                column: "PerformerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_Activity_ActivityCode",
+                table: "RdvQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_ApplicationUser_ClientId",
+                table: "RdvQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_PerformerProfile_PerformerId",
+                table: "RdvQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_Activity_DoesCode",
+                table: "UserActivity",
+                column: "DoesCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_PerformerProfile_UserId",
+                table: "UserActivity",
+                column: "UserId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+        }
+    }
+}
diff --git a/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs b/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs
index a6e5d03e..97a68ddf 100644
--- a/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -1,8 +1,6 @@
 using System;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Infrastructure;
-using Microsoft.Data.Entity.Metadata;
-using Microsoft.Data.Entity.Migrations;
 using Yavsc.Models;
 
 namespace Yavsc.Migrations
@@ -536,9 +534,9 @@ namespace Yavsc.Migrations
 
                     b.Property<DateTime>("DateModified");
 
-                    b.Property<DateTime>("EventDate");
+                    b.Property<DateTime?>("EventDate");
 
-                    b.Property<long>("LocationId");
+                    b.Property<long?>("LocationId");
 
                     b.Property<string>("PerformerId")
                         .IsRequired();
diff --git a/Yavsc/Models/ApplicationDbContext.cs b/Yavsc/Models/ApplicationDbContext.cs
index 881208be..88ae3084 100644
--- a/Yavsc/Models/ApplicationDbContext.cs
+++ b/Yavsc/Models/ApplicationDbContext.cs
@@ -27,6 +27,7 @@ namespace Yavsc.Models
     using Workflow.Profiles;
     using Drawing;
     using Yavsc.Attributes;
+    using Yavsc.Models.Bank;
 
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {
@@ -47,12 +48,12 @@ namespace Yavsc.Models
             builder.Entity<CircleAuthorizationToBlogPost>().HasKey(a=> new { a.CircleId, a.BlogPostId});
             builder.Entity<CircleMember>().HasKey(c=> new { MemberId = c.MemberId, CircleId = c.CircleId });
             builder.Entity<DimissClicked>().HasKey(c=>new { uid = c.UserId, notid = c.NotificationId});
-            
+
             foreach (var et in builder.Model.GetEntityTypes()) {
                 if (et.ClrType.GetInterface("IBaseTrackedEntity")!=null)
                 et.FindProperty("DateCreated").IsReadOnlyAfterSave = true;
             }
-                
+
         }
         public DbSet<TSettings> GetDbSet<TSettings>() where TSettings : class,  ISpecializationSettings
 
@@ -75,7 +76,7 @@ namespace Yavsc.Models
         }
 
         public DbSet<Client> Applications { get; set; }
-        
+
         public DbSet<RefreshToken> RefreshTokens { get; set; }
         /// <summary>
         /// Activities referenced on this site
@@ -115,6 +116,7 @@ namespace Yavsc.Models
         /// <returns></returns>
         public DbSet<RdvQuery> RdvQueries { get; set; }
         public DbSet<HairCutQuery> HairCutQueries { get; set; }
+        public DbSet<HairPrestation> HairPrestation { get; set; }
         public DbSet<HairMultiCutQuery> HairMultiCutQueries { get; set; }
         public DbSet<PerformerProfile> Performers { get; set; }
         public DbSet<Estimate> Estimates { get; set; }
@@ -128,7 +130,7 @@ namespace Yavsc.Models
         /// </summary>
         /// <returns>tokens</returns>
         public DbSet<OAuth2Tokens> Tokens { get; set; }
-        
+
         /// <summary>
         /// References all declared external GCM devices
         /// </summary>
@@ -237,24 +239,24 @@ namespace Yavsc.Models
 
         public DbSet<Instrument> Instrument { get; set; }
 
-        [ActivitySettings]   
+        [ActivitySettings]
         public DbSet<DjSettings> DjSettings { get; set; }
-        
+
         [ActivitySettings]
         public DbSet<Instrumentation> Instrumentation { get; set; }
 
         [ActivitySettings]
         public DbSet<FormationSettings> FormationSettings { get; set; }
-        
+
         [ActivitySettings]
         public DbSet<GeneralSettings> GeneralSettings { get; set; }
         public DbSet<CoWorking> WorkflowProviders { get; set; }
 
         private void AddTimestamps(string currentUsername)
     {
-        var entities = 
+        var entities =
         ChangeTracker.Entries()
-        .Where(x => x.Entity.GetType().GetInterface("IBaseTrackedEntity")!=null 
+        .Where(x => x.Entity.GetType().GetInterface("IBaseTrackedEntity")!=null
         && (x.State == EntityState.Added || x.State == EntityState.Modified));
 
 
@@ -279,7 +281,7 @@ namespace Yavsc.Models
             AddTimestamps(userId);
             return await base.SaveChangesAsync();
         }
-        
+
          public DbSet<Circle> Circle { get; set; }
 
          public DbSet<CircleAuthorizationToBlogPost> BlogACL { get; set; }
@@ -298,11 +300,10 @@ namespace Yavsc.Models
 
          public DbSet<DimissClicked> DimissClicked { get; set; }
 
-         public DbSet<HairPrestation> HairPrestation { get; set; }
 
          [ActivitySettings]
          public DbSet<BrusherProfile> BrusherProfile { get; set; }
-         
 
+         public DbSet<BankIdentity> BankIdentity { get; set; }
     }
 }
diff --git a/Yavsc/Models/Haircut/HairCutQuery.cs b/Yavsc/Models/Haircut/HairCutQuery.cs
index d59cce7e..22bfae5d 100644
--- a/Yavsc/Models/Haircut/HairCutQuery.cs
+++ b/Yavsc/Models/Haircut/HairCutQuery.cs
@@ -16,20 +16,20 @@ namespace Yavsc.Models.Haircut
         [Required]
         public long PrestationId { get; set; }
 
-        [ForeignKey("PrestationId")]
+        [ForeignKey("PrestationId"),Required]
         public virtual HairPrestation  Prestation { get; set; }
 
-        [Required][ForeignKey("LocationId")]
+        [ForeignKey("LocationId")]
 
-        public Location Location { get; set; }
+        public virtual Location Location { get; set; }
 
-        public DateTime EventDate
+        public DateTime? EventDate
         {
             get;
             set;
         }
 
-        public long LocationId
+        public long? LocationId
         {
             get;
 
diff --git a/Yavsc/Models/Haircut/HairMultiCutQuery.cs b/Yavsc/Models/Haircut/HairMultiCutQuery.cs
index 35e958fc..5ab90dd8 100644
--- a/Yavsc/Models/Haircut/HairMultiCutQuery.cs
+++ b/Yavsc/Models/Haircut/HairMultiCutQuery.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Yavsc.Models.Billing;
@@ -6,11 +7,27 @@ using Yavsc.Models.Relationship;
 
 namespace Yavsc.Models.Haircut
 {
+    public class HairPrestationCollectionItem {
+
+        [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id { get; set; }
+        public long PrestationId { get; set; }
+        [ForeignKeyAttribute("PrestationId")]
+        public virtual HairPrestation Prestation { get; set; }
+
+        public long QueryId { get; set; }
+
+        [ForeignKeyAttribute("QueryId")]
+        public virtual HairMultiCutQuery Query { get; set; }
+    }
+
     public class HairMultiCutQuery : NominativeServiceCommand
     {
         [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
-        HairPrestation [] Prestations { get; set; }
+
+        [InversePropertyAttribute("Query")]
+        public virtual List<HairPrestationCollectionItem>  Prestations { get; set; }
 
         public Location Location { get; set; }
 
@@ -20,4 +37,4 @@ namespace Yavsc.Models.Haircut
             set;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Yavsc/Models/Identity/ApplicationUser.cs b/Yavsc/Models/Identity/ApplicationUser.cs
index 05200ac5..4daef2b1 100644
--- a/Yavsc/Models/Identity/ApplicationUser.cs
+++ b/Yavsc/Models/Identity/ApplicationUser.cs
@@ -75,7 +75,9 @@ namespace Yavsc.Models
         /// Billing postal address
         /// </summary>
         /// <returns></returns>
+        [ForeignKeyAttribute("PostalAddressId")]
         public virtual Location PostalAddress { get; set; }
+        public long? PostalAddressId { get; set; }
 
         /// <summary>
         /// User's Google calendar
@@ -92,7 +94,7 @@ namespace Yavsc.Models
         public long DiskQuota { get; set; } = 512*1024*1024;
         public long DiskUsage { get; set; } = 0;
 
-        [JsonIgnore]
+        [JsonIgnore][InverseProperty("Owner")]
         public virtual List<BlackListed> BlackList { get; set; }
     }
 }
diff --git a/Yavsc/Models/Messaging/RdvQueryProviderInfo.cs b/Yavsc/Models/Messaging/RdvQueryProviderInfo.cs
index 55dd2f43..123bbf13 100644
--- a/Yavsc/Models/Messaging/RdvQueryProviderInfo.cs
+++ b/Yavsc/Models/Messaging/RdvQueryProviderInfo.cs
@@ -12,12 +12,12 @@ namespace Yavsc.Models
 
         public long Id { get; set; }
 
-        public DateTime EventDate { get; set; }
+        public DateTime? EventDate { get; set; }
         public decimal? Previsional { get; set; }
 
         public string Reason { get; set; }
 
-        public string ActivityCode { get; set; } 
+        public string ActivityCode { get; set; }
     }
-    
+
 }
diff --git a/Yavsc/Startup/Startup.cs b/Yavsc/Startup/Startup.cs
index 8b2e4dbe..7a816c28 100755
--- a/Yavsc/Startup/Startup.cs
+++ b/Yavsc/Startup/Startup.cs
@@ -3,7 +3,6 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
-using System.Threading.Tasks;
 using System.Web.Optimization;
 using Microsoft.AspNet.Authentication;
 using Microsoft.AspNet.Authorization;
@@ -309,8 +308,6 @@ namespace Yavsc
                 options.AutomaticAuthentication = false;
             });
 
-
-
             ConfigureOAuthApp(app, SiteSetup);
             ConfigureFileServerApp(app, SiteSetup, env, authorizationService);
             ConfigureWebSocketsApp(app, SiteSetup, env);
diff --git a/Yavsc/ViewModels/Manage/AddBankInfoViewModel.cs b/Yavsc/ViewModels/Manage/AddBankInfoViewModel.cs
deleted file mode 100644
index 0f459bf1..00000000
--- a/Yavsc/ViewModels/Manage/AddBankInfoViewModel.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Yavsc.ViewModels.Manage
-{
-    using Models.Bank;
-    public class AddBankInfoViewModel
-    {
-        public BankIdentity Data{get; private set; }
-        public AddBankInfoViewModel(BankIdentity data)
-        {
-            this.Data = data;
-        }
-
-        public bool IsValid { get {
-            return ByIbanBIC || ByAccountNumber ;
-        }}
-        public bool ByIbanBIC { get { 
-            return (Data.BIC != null && Data.IBAN != null) ;
-        }}
-        public bool ByAccountNumber { 
-            get { 
-                return (Data.BankCode != null && Data.WicketCode != null && Data.AccountNumber != null && Data.BankedKey >0);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Yavsc/Views/Administration/Index.cshtml b/Yavsc/Views/Administration/Index.cshtml
index a6ea5893..c8058dfe 100644
--- a/Yavsc/Views/Administration/Index.cshtml
+++ b/Yavsc/Views/Administration/Index.cshtml
@@ -3,7 +3,15 @@
 @{ 
     ViewBag.Title = SR["Administration"];
 }
-
+@section ctxmenu {
+    <ul class="nav navbar-nav">
+                        <li><a asp-controller="Activity" asp-action="Index" class="navbar-link">Activités</a></li>
+                        <li><a asp-controller="CommandForms" asp-action="Index" class="navbar-link">Formulaires</a></li>
+                        <li><a asp-controller="Notifications" asp-action="Index" class="navbar-link">Notifications</a></li>
+                        <li><a asp-controller="SIRENExceptions" asp-action="Index" class="navbar-link">Excéptions au numéro de SIREN</a> 
+                        </li>
+    </ul>
+}
 <h2>@ViewBag.Title</h2>
 <p>
 Rôles : 
@@ -19,4 +27,5 @@ Nombre d'administrateurs :
 </p>
 <p>
 Vous êtes administrateur: @(Model.YouAreAdmin?"Oui":"Non")
-</p>
\ No newline at end of file
+</p>
+
diff --git a/Yavsc/Views/CommandForms/Index.cshtml b/Yavsc/Views/CommandForms/Index.cshtml
index d02f2a43..c4f3d5ae 100644
--- a/Yavsc/Views/CommandForms/Index.cshtml
+++ b/Yavsc/Views/CommandForms/Index.cshtml
@@ -14,6 +14,9 @@
         <th>
             @Html.DisplayNameFor(model => model.Title)
         </th>
+        <th>
+            @Html.DisplayNameFor(model => model.Context)
+        </th>
         <th>
             @Html.DisplayNameFor(model => model.ActionName)
         </th>
@@ -21,10 +24,13 @@
     </tr>
     
 @foreach (var item in Model) {
-    <tr>
+    <tr class="@(item.Context.Hidden?"disabled":null)">
         <td>
             @Html.DisplayFor(modelItem => item.Title)
         </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.Context)
+        </td>
         <td>
             @Html.DisplayFor(modelItem => item.ActionName)
         </td>
diff --git a/Yavsc/Views/FrontOffice/HairCut.cshtml b/Yavsc/Views/FrontOffice/HairCut.cshtml
index e25d65bc..e527eebb 100644
--- a/Yavsc/Views/FrontOffice/HairCut.cshtml
+++ b/Yavsc/Views/FrontOffice/HairCut.cshtml
@@ -12,7 +12,7 @@
              <a asp-controller="HairCutCommand" asp-action="HairCut"
               asp-route-activityCode="@ViewBag.Activity.Code"
               asp-route-performerId="@profile.Performer.Id" 
-              class="btn btn-link">
+              class="btn btn-success">
                  @SR["Proposer un rendez-vous à"] @profile.Performer.UserName
                  </a>
   
diff --git a/Yavsc/Views/HairCutCommand/BrusherProfileScript.cshtml b/Yavsc/Views/HairCutCommand/BrusherProfileScript.cshtml
index bf184bb7..4ff384d0 100644
--- a/Yavsc/Views/HairCutCommand/BrusherProfileScript.cshtml
+++ b/Yavsc/Views/HairCutCommand/BrusherProfileScript.cshtml
@@ -3,16 +3,16 @@
 var tarifs = 
     [
        { 
-           cut: [ @Model.WomenLongCutPrice, @Model.WomenHalfCutPrice, @Model.WomenShortCutPrice ],
+           cut: [ @Model.WomenHalfCutPrice, @Model.WomenShortCutPrice, @Model.WomenLongCutPrice ],
            tech: [ 
-            [@Model.LongColorPrice, @Model.HalfColorPrice, @Model.ShortColorPrice],
-            [@Model.LongPermanentPrice, @Model.HalfPermanentPrice, @Model.ShortPermanentPrice],
-            [@Model.LongDefrisPrice, @Model.HalfDefrisPrice, @Model.ShortDefrisPrice],
-            [@Model.LongMechPrice, @Model.HalfMechPrice, @Model.ShortMechPrice],
-            [@Model.LongBalayagePrice, @Model.HalfBalayagePrice, @Model.ShortBalayagePrice],
+            [@Model.HalfColorPrice, @Model.ShortColorPrice, @Model.LongColorPrice],
+            [@Model.HalfPermanentPrice, @Model.ShortPermanentPrice, @Model.LongPermanentPrice],
+            [@Model.HalfDefrisPrice, @Model.ShortDefrisPrice, @Model.LongDefrisPrice],
+            [@Model.HalfMechPrice, @Model.ShortMechPrice, @Model.LongMechPrice],
+            [@Model.HalfBalayagePrice, @Model.ShortBalayagePrice, @Model.LongBalayagePrice],
             ],
-            brush: [@Model.LongBrushingPrice, @Model.HalfBrushingPrice, @Model.ShortBrushingPrice],
-            multicolor: [@Model.LongMultiColorPrice, @Model.HalfMultiColorPrice, @Model.ShortMultiColorPrice],
+            brush: [@Model.HalfBrushingPrice, @Model.ShortBrushingPrice, @Model.LongBrushingPrice],
+            multicolor: [@Model.HalfMultiColorPrice, @Model.ShortMultiColorPrice, @Model.LongMultiColorPrice],
             shampoo: @Model.ShampooPrice,
             care: @Model.CarePrice
         },
diff --git a/Yavsc/Views/HairCutCommand/CommandConfirmation.cshtml b/Yavsc/Views/HairCutCommand/CommandConfirmation.cshtml
index 5a4cb368..495b626c 100644
--- a/Yavsc/Views/HairCutCommand/CommandConfirmation.cshtml
+++ b/Yavsc/Views/HairCutCommand/CommandConfirmation.cshtml
@@ -6,11 +6,40 @@
     <div class="form-horizontal">
         <h4>@SR["Your book query"]</h4>
         <hr />
-        <label for="EventDate">@SR["Event date"]</label>: @Html.DisplayFor(m => m.EventDate)
-        <br/>
+        <ul>
+            <li>
+                Votre star de la coiffure:
+                @Html.DisplayFor(m=>m.PerformerProfile)
+            </li>
+            <li>
+                @Html.DisplayFor(m=>m.Prestation)
+<p>
+    Addition minimale 
+    (Compter des frais supplémentaires 
+    en cas de longs déplacements,
+        ou des majorations en cas de weekend et jour férie)
+   <span class="price"> @ViewBag.Addition </span></p>
+            </li>
+            <li>
+        @if (Model.EventDate == null) {
+         <p>Pas de date convenue ...</p>
+        } else {
+        <label for="EventDate">
+            @SR["Event date"]</label>
+           @Html.DisplayFor(m => m.EventDate)
+        }
+            </li>
+            <li>
+
+        @if (Model.Location == null) {
+         <p>Pas de lieu convenu ...</p> 
+         } else {
+        <label for="Location">@SR["Location"]</label>
+         @Html.DisplayFor(m => m.Location)  
 
-        <label for="Location">@SR["Location"]</label>: @Html.DisplayFor(m => m.Location)
-        <br/>
+        }
+        </li>
+        </ul>
 
         @if (ViewBag.GooglePayload !=null) 
         {
@@ -20,10 +49,10 @@
             else {
                 if (ViewBag.GooglePayload.failure>0)
                     {
-                        <h4>@SR["GCM Notification sending failed"]</h4>
+                        <div class="error">@SR["GCM Notification sending failed"]</div>
                     }
                     else {
-                        <!-- email sent -->
+                       <div class="error">@SR["E-mail sent"]</div>
                     }
             }
         }
diff --git a/Yavsc/Views/HairCutCommand/HairCut.cshtml b/Yavsc/Views/HairCutCommand/HairCut.cshtml
index 9b265424..4e03aabc 100644
--- a/Yavsc/Views/HairCutCommand/HairCut.cshtml
+++ b/Yavsc/Views/HairCutCommand/HairCut.cshtml
@@ -127,10 +127,10 @@
 
 @Html.DisplayFor(m=>m.PerformerProfile)
 
-<form asp-controller="HairCutCommand" asp-action="HairCut" id="form">
+<form asp-controller="HairCutCommand" asp-action="CreateHairCutQuery" id="form">
     <div class="form-horizontal">
         <hr />
-        <div asp-validation-summary="ValidationSummary.ModelOnly" class="text-danger"></div>
+        <div asp-validation-summary="ValidationSummary.All" class="text-danger"></div>
         <div class="form-group">
             <label asp-for="Prestation.Gender" class="col-md-2 control-label"></label>
             <div class="col-md-10">
@@ -210,8 +210,9 @@
         </div>
         <span>Total: <span id="Total" class="total"></span>
       </span>
-             <input type="submit" class="btn btn-success btn-submit" value="@SR["Validez ce choix, et prendre rendez-vous"] avec @Model.PerformerProfile.Performer.UserName, sans préciser ni lieu ni date (pour prendre rendez-vous la prise de contact)"/>
-        <input type="submit" class="btn btn-success btn-submit" value="@SR["Validez ce choix, et prendre rendez-vous"] avec @Model.PerformerProfile.Performer.UserName"/>
+      <input asp-for="ClientId" type="hidden" />
+      <input type="submit" class="btn btn-success btn-submit" value="@SR["Validez ce choix, et prendre rendez-vous"] avec @Model.PerformerProfile.Performer.UserName, sans préciser ni lieu ni date (pour prendre rendez-vous la prise de contact)"/>
+      <input type="submit" class="btn btn-success btn-submit" value="@SR["Validez ce choix, et prendre rendez-vous"] avec @Model.PerformerProfile.Performer.UserName"/>
     
    </div>
     <input type="hidden" name="performerId" value="@Model.PerformerProfile.PerformerId" />
diff --git a/Yavsc/Views/Home/Index.cshtml b/Yavsc/Views/Home/Index.cshtml
index c310996e..809bee22 100755
--- a/Yavsc/Views/Home/Index.cshtml
+++ b/Yavsc/Views/Home/Index.cshtml
@@ -66,24 +66,12 @@
 @if (!ViewBag.IsFromSecureProx) {
     <div  class="alert alert-warning alert-dismissable">
 <markdown>
-# Alerte, alerte!
+## Connexion non chiffrée ##
 
-Votre connexion n'est **pas** sécurisée.
-
-Un accés sécurisé est disponible, mais le certificat qui le chiffre n'est pas certifié
+Un accés plus sécurisé est disponible, mais le certificat qui le chiffre n'est pas certifié
 comme il se devrait ...
-
-Pour l'utiliser, vous devrez ajouter une exception pour lui, et continuer votre navigation,
-malgré ce défaut de sécurité (ce sera toujours mieux que sans chiffrement).
-
----------------
-Ainsi va la vie ...
 </markdown>
-
-<p>
-    <a data-dismiss="alert" class="btn close ">J'ai compris, et je continue avec cette connexion.</a>
-   
-    <a href="@ViewBag.SecureHomeUrl" class="btn close" >Lien vers le site sécurisé</a>
-    </p>
-    </div>
+<a data-dismiss="alert" class="btn close ">J'ai compris, et je continue avec cette connexion.</a>
+ <a href="@ViewBag.SecureHomeUrl" class="btn alert-link" >Accès sécurisé</a>
+ </div>
 }
diff --git a/Yavsc/Views/Manage/AddBankInfo.cshtml b/Yavsc/Views/Manage/AddBankInfo.cshtml
index 47351abb..cb51e694 100644
--- a/Yavsc/Views/Manage/AddBankInfo.cshtml
+++ b/Yavsc/Views/Manage/AddBankInfo.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.ViewModels.Manage.AddBankInfoViewModel
+@model Yavsc.Models.Bank.BankIdentity
 @{
     ViewData["Title"] = SR["Fill in your Bank Info"];
 }
@@ -12,43 +12,43 @@
 
     <fieldset>
     <div class="form-group">
-        <label asp-for="Data.BIC" class="col-md-2 control-label"></label>
+        <label asp-for="BIC" class="col-md-2 control-label"></label>
         <div class="col-md-10">
-            <input asp-for="Data.BIC" class="form-control" />
-            <span asp-validation-for="Data.BIC" class="text-danger"></span>
+            <input asp-for="BIC" class="form-control" />
+            <span asp-validation-for="BIC" class="text-danger"></span>
         </div>
-        <label asp-for="Data.IBAN" class="col-md-2 control-label"></label>
+        <label asp-for="IBAN" class="col-md-2 control-label"></label>
         <div class="col-md-10">
-            <input asp-for="Data.IBAN" class="form-control" />
-            <span asp-validation-for="Data.IBAN" class="text-danger"></span>
+            <input asp-for="IBAN" class="form-control" />
+            <span asp-validation-for="IBAN" class="text-danger"></span>
         </div>
     </div>
     </fieldset>
     <fieldset>
     <div class="form-group">
 
-        <label asp-for="Data.AccountNumber" class="col-md-2 control-label"></label>
+        <label asp-for="AccountNumber" class="col-md-2 control-label"></label>
         <div class="col-md-10">
-            <input asp-for="Data.AccountNumber" class="form-control" />
-            <span asp-validation-for="Data.AccountNumber" class="text-danger"></span>
+            <input asp-for="AccountNumber" class="form-control" />
+            <span asp-validation-for="AccountNumber" class="text-danger"></span>
         </div>
 
-        <label asp-for="Data.BankCode" class="col-md-2 control-label"></label>
+        <label asp-for="BankCode" class="col-md-2 control-label"></label>
         <div class="col-md-10">
-            <input asp-for="Data.BankCode" class="form-control" />
-            <span asp-validation-for="Data.BankCode" class="text-danger"></span>
+            <input asp-for="BankCode" class="form-control" />
+            <span asp-validation-for="BankCode" class="text-danger"></span>
         </div>
 
-        <label asp-for="Data.WicketCode" class="col-md-2 control-label"></label>
+        <label asp-for="WicketCode" class="col-md-2 control-label"></label>
         <div class="col-md-10">
-            <input asp-for="Data.WicketCode" class="form-control" />
-            <span asp-validation-for="Data.WicketCode" class="text-danger"></span>
+            <input asp-for="WicketCode" class="form-control" />
+            <span asp-validation-for="WicketCode" class="text-danger"></span>
         </div>
 
-        <label asp-for="Data.BankedKey" class="col-md-2 control-label"></label>
+        <label asp-for="BankedKey" class="col-md-2 control-label"></label>
         <div class="col-md-10">
-            <input asp-for="Data.BankedKey" class="form-control" />
-            <span asp-validation-for="Data.BankedKey" class="text-danger"></span>
+            <input asp-for="BankedKey" class="form-control" />
+            <span asp-validation-for="BankedKey" class="text-danger"></span>
         </div>
 
     </div>
diff --git a/Yavsc/Views/Manage/SetActivity.cshtml b/Yavsc/Views/Manage/SetActivity.cshtml
index 18e71e4c..f177ca9f 100644
--- a/Yavsc/Views/Manage/SetActivity.cshtml
+++ b/Yavsc/Views/Manage/SetActivity.cshtml
@@ -1,9 +1,6 @@
 @model PerformerProfile 
 @{ ViewData["Title"] = SR["Your performer profile"]; } 
-@section header{ 
-    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
-    <script src="https://maps.googleapis.com/maps/api/js?key=@ViewBag.GoogleSettings.BrowserApiKey"></script>
-}
+@section header {
 <style>
     #map {
         width: 100%;
@@ -11,7 +8,8 @@
     }
 </style>
 } 
-@section scripts{
+@section scripts {
+<script src="https://maps.googleapis.com/maps/api/js?key=@ViewBag.GoogleSettings.BrowserApiKey"></script>
 <script>
      $(document).ready(function(){
          var config = {
@@ -206,4 +204,8 @@
 <form asp-controller="Manage" asp-action="UnsetActivity" method="post" class="form-horizontal" role="form">
     @Html.Hidden("PerfomerId")
     <button type="submit" class="btn btn-default">@SR["UnsetActivity"]</button>
-</form>
\ No newline at end of file
+</form>
+
+ @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+
+
diff --git a/Yavsc/Views/Manage/SetAddress.cshtml b/Yavsc/Views/Manage/SetAddress.cshtml
new file mode 100644
index 00000000..a17531cb
--- /dev/null
+++ b/Yavsc/Views/Manage/SetAddress.cshtml
@@ -0,0 +1,50 @@
+@model Location
+
+<style>
+    #map {
+        width: 100%;
+        height: 250px;
+    }
+</style>
+
+  
+<form asp-action="SetAddress">
+<div asp-validation-summary="ValidationSummary.All" class="text-danger" id="ValidationSummary"></div>
+
+    <div class="form-group">
+
+        <label asp-for="Address" class="col-md-2 control-label">@SR["Address"]</label>
+        <div class="col-md-10">
+            <input asp-for="Address" class="form-control" type="text" />
+
+            <span id="AddressError" asp-validation-for="Address" class="text-danger"></span>
+            <ul id="LocationCombo" >
+            </ul>
+            <div id="map"></div>
+        </div>
+    </div>
+    <input type="submit" class="btn btn-success" value="Enregistrer" />
+    
+@Html.HiddenFor(model=>model.Latitude)
+ @Html.HiddenFor(model=>model.Longitude)
+</form>
+
+@{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+
+@section scripts { 
+    
+<script src="https://maps.googleapis.com/maps/api/js?key=@ViewBag.GoogleSettings.BrowserApiKey"></script>
+<script src="~/js/google-geoloc.js" asp-append-version="true"></script>
+ <script >
+        $(document).ready(function(){
+        $.validator.setDefaults({
+            messages: {
+                remote:  "Ce lieu n'est pas identifié par les services de géo-localisation Google",
+                required: "Veuillez renseigner ce champ"
+            }
+        });
+        $("#Address").googlegeocode()
+        })
+    </script>
+
+} 
diff --git a/Yavsc/Views/Shared/DisplayTemplates/TwitterAccount.cshtml b/Yavsc/Views/Shared/DisplayTemplates/TwitterAccount.cshtml
new file mode 100644
index 00000000..ec5171b7
--- /dev/null
+++ b/Yavsc/Views/Shared/DisplayTemplates/TwitterAccount.cshtml
@@ -0,0 +1,3 @@
+<a href="https://twitter.com/intent/tweet?screen_name=TwitterDev" 
+class="twitter-mention-button" data-show-count="false">Tweet to @TwitterDev</a>
+<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
\ No newline at end of file
diff --git a/Yavsc/Views/Shared/_Layout.cshtml b/Yavsc/Views/Shared/_Layout.cshtml
index ea85d9ca..12001c90 100755
--- a/Yavsc/Views/Shared/_Layout.cshtml
+++ b/Yavsc/Views/Shared/_Layout.cshtml
@@ -45,14 +45,7 @@
         @RenderSection("header", required: false)
     </head>
     <body>
-        @if (ViewData ["Notify"] != null) {
-            foreach (Notification n in ViewData ["Notify"] as IEnumerable<Notification>) {
-            <div class="alert alert-info alert-dismissable">
-  <h1>@n.title</h1>@n.body
-  <a class="close" data-dismiss="alert" aria-label="close" onclick="notifClick(@n.Id)">@((n.click_action==null)?SR["Fermer"]:SR[n.click_action])</a>
-</div>
-            }
-        }
+        
         <nav class="navbar navbar-inverse navbar-static-top" role="navigation">
             <div class="container">
                 <div class="navbar-header">
@@ -71,11 +64,25 @@
                         <li><a asp-controller="Home" asp-action="Chat" class="navbar-link">@SR["Chat"]</a></li>
                         <li><a asp-controller="Home" asp-action="Contact" class="navbar-link">@SR["Contact"]</a></li>
                         <li><a asp-controller="Home" asp-action="About" class="navbar-link">@SR["About"] @SiteSettings.Value.Title</a> </li>
+                        @if (User.IsInRole(Constants.AdminGroupName)) {
+                         <li><a asp-controller="Administration" asp-action="Index" class="navbar-link">Administration</a> </li>
+                           
+                        }
                     </ul>
+                     @RenderSection("ctxmenu", required: false)
                     @await Html.PartialAsync("_LoginPartial")
                 </div>
             </div>
         </nav>
+    @if (ViewData ["Notify"] != null) {
+    foreach (Notification n in ViewData ["Notify"] as IEnumerable<Notification>) {
+    <div class="alert alert-info alert-dismissable">
+    <h2 markdown="@n.title"></h2>
+    <a class="close" data-dismiss="alert" aria-label="close" onclick="notifClick(@n.Id)">@((n.click_action==null)?SR["Fermer"]:SR[n.click_action])</a>
+    <markdown>@n.body</markdown>
+    </div>
+            }
+        }
         @RenderSection("subbanner", required: false)
         <main class="container body-content" role="main">
             @RenderBody()
diff --git a/Yavsc/Views/Shared/_ValidationScriptsPartial.cshtml b/Yavsc/Views/Shared/_ValidationScriptsPartial.cshtml
index 810c13bc..5474bb20 100755
--- a/Yavsc/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/Yavsc/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -2,7 +2,6 @@
     <script src="~/lib/jquery-validation/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
-<script src="~/js/jquery-ui.js" ></script>
 <script src="~/lib/jquery-validation/additional-methods.js" charset="UTF-8"></script>
 <environment names="Staging,Production,yavsc,yavscpre,zicmoove,lua">
     <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"
diff --git a/Yavsc/wwwroot/css/main/bootstrap.css b/Yavsc/wwwroot/css/main/bootstrap.css
index d7dd80c1..39a16aa1 100644
--- a/Yavsc/wwwroot/css/main/bootstrap.css
+++ b/Yavsc/wwwroot/css/main/bootstrap.css
@@ -5091,8 +5091,8 @@ a.thumbnail.active {
 .alert-dismissable .close,
 .alert-dismissible .close {
   position: relative;
-  top: -2px;
-  right: -21px;
+  top: 0;
+  right: 0;
   color: inherit;
 }
 .alert-success {
diff --git a/Yavsc/wwwroot/css/main/site.css b/Yavsc/wwwroot/css/main/site.css
index d0060e52..5f888a46 100644
--- a/Yavsc/wwwroot/css/main/site.css
+++ b/Yavsc/wwwroot/css/main/site.css
@@ -2,6 +2,14 @@
 /* Wrapping element */
 /* Set some basic padding to keep content from hitting the edges */
 
+.performer {
+    padding-left: 1em;
+    background-repeat: no-repeat;
+    background-image: url('/images/greenstar.svg');
+}
+.performer ul {
+    margin-left: 2.5em;
+}
 
 .smalltofhol { max-height: 3em; max-width: 3em; float:left; margin:.5em; }
 .price {
@@ -218,7 +226,9 @@ footer {
     font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
     font-stretch: condensed;
     display: inline-flex;
-    color: #444;
+    color: #ff8;
+    padding: .1em;
+    border-radius: .5em;
     background-color: #210912;
 }
 
diff --git a/Yavsc/wwwroot/images/greenstar.svg b/Yavsc/wwwroot/images/greenstar.svg
new file mode 100644
index 00000000..4acd9d1e
--- /dev/null
+++ b/Yavsc/wwwroot/images/greenstar.svg
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:ns1="http://sozi.baierouge.fr"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    id="svg2"
+    sodipodi:docname="New document 1"
+    viewBox="0 0 744.09 1052.4"
+    version="1.1"
+    inkscape:version="0.48.2 r9819"
+  >
+  <defs
+      id="defs4"
+    >
+    <filter
+        id="filter3962"
+        inkscape:collect="always"
+      >
+      <feGaussianBlur
+          id="feGaussianBlur3964"
+          stdDeviation="14.937759"
+          inkscape:collect="always"
+      />
+    </filter
+    >
+    <filter
+        id="filter3962-5"
+        color-interpolation-filters="sRGB"
+        inkscape:collect="always"
+      >
+      <feGaussianBlur
+          id="feGaussianBlur3964-1"
+          stdDeviation="14.937759"
+          inkscape:collect="always"
+      />
+    </filter
+    >
+    <filter
+        id="filter3962-5-1"
+        color-interpolation-filters="sRGB"
+        inkscape:collect="always"
+      >
+      <feGaussianBlur
+          id="feGaussianBlur3964-1-1"
+          stdDeviation="14.937759"
+          inkscape:collect="always"
+      />
+    </filter
+    >
+  </defs
+  >
+  <sodipodi:namedview
+      id="base"
+      bordercolor="#666666"
+      inkscape:pageshadow="2"
+      inkscape:window-y="-4"
+      pagecolor="#ffffff"
+      inkscape:window-height="719"
+      inkscape:window-maximized="1"
+      inkscape:zoom="4.9055355"
+      inkscape:window-x="-4"
+      showgrid="false"
+      borderopacity="1.0"
+      inkscape:current-layer="layer2"
+      inkscape:cx="426.89648"
+      inkscape:cy="580.44685"
+      inkscape:window-width="1024"
+      inkscape:pageopacity="0.0"
+      inkscape:document-units="px"
+  />
+  <g
+      id="layer2"
+      inkscape:label="Layer"
+      inkscape:groupmode="layer"
+    >
+    <path
+        id="path2985-5"
+        style="stroke-linejoin:round;fill-opacity:.68159;filter:url(#filter3962);stroke:#000000;stroke-linecap:round;fill:#222b00"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="308.78299"
+        sodipodi:r2="33.812248"
+        sodipodi:arg1="-0.68052122"
+        sodipodi:arg2="0.10487694"
+        transform="translate(216.85 -7.2305)"
+        inkscape:randomized="0"
+        sodipodi:cy="469.50504"
+        sodipodi:cx="168.57143"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m408.57 275.22-206.37 197.82 160.66 236.47-197.83-206.38-236.46 160.66 206.37-197.82-160.65-236.46 197.82 206.37z"
+    />
+    <path
+        id="path2985-5-7"
+        style="stroke-linejoin:round;fill-opacity:.68159;filter:url(#filter3962-5);stroke:#000000;stroke-linecap:round;fill:#677821"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="308.78299"
+        sodipodi:r2="33.812248"
+        sodipodi:arg1="-0.68052122"
+        sodipodi:arg2="0.10487694"
+        transform="matrix(.85789 .51384 -.51384 .85789 490.03 -43.074)"
+        inkscape:randomized="0"
+        sodipodi:cy="469.50504"
+        sodipodi:cx="168.57143"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m408.57 275.22-206.37 197.82 160.66 236.47-197.83-206.38-236.46 160.66 206.37-197.82-160.65-236.46 197.82 206.37z"
+    />
+    <path
+        id="path2985-5-7-5"
+        style="stroke-linejoin:round;fill-opacity:.68159;filter:url(#filter3962-5-1);stroke:#000000;stroke-linecap:round;fill:#89a02c"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="308.78299"
+        sodipodi:r2="33.812248"
+        sodipodi:arg1="-0.68052122"
+        sodipodi:arg2="0.10487694"
+        transform="matrix(.48272 .87577 -.87577 .48272 725.86 74.714)"
+        inkscape:randomized="0"
+        sodipodi:cy="469.50504"
+        sodipodi:cx="168.57143"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m408.57 275.22-206.37 197.82 160.66 236.47-197.83-206.38-236.46 160.66 206.37-197.82-160.65-236.46 197.82 206.37z"
+    />
+  </g
+  >
+  <g
+      id="layer1"
+      inkscape:label="Layer 1"
+      inkscape:groupmode="layer"
+    >
+    <path
+        id="path2985"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#222b00"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="308.78299"
+        sodipodi:r2="33.812248"
+        sodipodi:arg1="-0.68052122"
+        sodipodi:arg2="0.10487694"
+        transform="translate(221.93 -7.6428)"
+        inkscape:randomized="0"
+        sodipodi:cy="469.50504"
+        sodipodi:cx="168.57143"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m408.57 275.22-206.37 197.82 160.66 236.47-197.83-206.38-236.46 160.66 206.37-197.82-160.65-236.46 197.82 206.37z"
+    />
+    <path
+        id="path2989"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#445500"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="237.67583"
+        sodipodi:r2="26.025894"
+        sodipodi:arg1="1.7398976"
+        sodipodi:arg2="2.5252957"
+        transform="translate(233.59 -14.246)"
+        inkscape:randomized="0"
+        sodipodi:cy="475.21933"
+        sodipodi:cx="160"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m120 709.51 18.762-219.24-213.05-55.043 219.24 18.762 55.043-213.05-18.762 219.24 213.05 55.043-219.24-18.762z"
+    />
+    <path
+        id="path2993"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#668000"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="159.23285"
+        sodipodi:r2="17.43626"
+        sodipodi:arg1="1.4085975"
+        sodipodi:arg2="2.1939957"
+        transform="translate(233.56 -12.676)"
+        inkscape:randomized="0"
+        sodipodi:cy="475.21933"
+        sodipodi:cx="162.85715"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m188.57 632.36-35.89-142.98-146.97 11.55 142.99-35.89-11.56-146.96 35.89 142.98 146.97-11.55-142.98 35.89z"
+    />
+    <path
+        id="path2993-1"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#88aa00"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="159.23285"
+        sodipodi:r2="17.43626"
+        sodipodi:arg1="1.4085975"
+        sodipodi:arg2="2.1939957"
+        transform="matrix(.75245 -.42879 .42879 .75245 70.116 173.02)"
+        inkscape:randomized="0"
+        sodipodi:cy="475.21933"
+        sodipodi:cx="162.85715"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m188.57 632.36-35.89-142.98-146.97 11.55 142.99-35.89-11.56-146.96 35.89 142.98 146.97-11.55-142.98 35.89z"
+    />
+    <path
+        id="path2993-1-7"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#aad400"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="159.23285"
+        sodipodi:r2="17.43626"
+        sodipodi:arg1="1.4085975"
+        sodipodi:arg2="2.1939957"
+        transform="matrix(.35360 -.53777 .53777 .35360 83.289 380.3)"
+        inkscape:randomized="0"
+        sodipodi:cy="475.21933"
+        sodipodi:cx="162.85715"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m188.57 632.36-35.89-142.98-146.97 11.55 142.99-35.89-11.56-146.96 35.89 142.98 146.97-11.55-142.98 35.89z"
+    />
+    <path
+        id="path2993-1-7-4"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#ccff00"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="159.23285"
+        sodipodi:r2="17.43626"
+        sodipodi:arg1="1.4085975"
+        sodipodi:arg2="2.1939957"
+        transform="matrix(.022335 -.44239 .44239 .022335 182.03 522)"
+        inkscape:randomized="0"
+        sodipodi:cy="475.21933"
+        sodipodi:cx="162.85715"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m188.57 632.36-35.89-142.98-146.97 11.55 142.99-35.89-11.56-146.96 35.89 142.98 146.97-11.55-142.98 35.89z"
+    />
+    <path
+        id="path2993-1-7-4-0"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#ddff55"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        inkscape:transform-center-x="74.779817"
+        sodipodi:r1="159.23285"
+        sodipodi:r2="17.43626"
+        inkscape:transform-center-y="25.019476"
+        sodipodi:arg1="1.4085975"
+        sodipodi:arg2="2.1939957"
+        transform="matrix(-.15559 -.23697 .23697 -.15559 309.65 572.97)"
+        inkscape:randomized="0"
+        sodipodi:cy="475.21933"
+        sodipodi:cx="162.85715"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m188.57 632.36-35.89-142.98-146.97 11.55 142.99-35.89-11.56-146.96 35.89 142.98 146.97-11.55-142.98 35.89z"
+    />
+    <path
+        id="path2993-1-7-4-8"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#e5ff80"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="159.23285"
+        sodipodi:r2="17.43626"
+        sodipodi:arg1="1.4085975"
+        sodipodi:arg2="2.1939957"
+        transform="matrix(-.031858 -.15423 .15423 -.031858 328.27 501.07)"
+        inkscape:randomized="0"
+        sodipodi:cy="475.21933"
+        sodipodi:cx="162.85715"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m188.57 632.36-35.89-142.98-146.97 11.55 142.99-35.89-11.56-146.96 35.89 142.98 146.97-11.55-142.98 35.89z"
+    />
+    <path
+        id="path2993-1-7-4-8-8"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#e5ff80"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="159.23285"
+        sodipodi:r2="17.43626"
+        sodipodi:arg1="1.4085975"
+        sodipodi:arg2="2.1939957"
+        transform="matrix(-.086843 -.049011 .049011 -.086843 387.55 510.35)"
+        inkscape:randomized="0"
+        sodipodi:cy="475.21933"
+        sodipodi:cx="162.85715"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m188.57 632.36-35.89-142.98-146.97 11.55 142.99-35.89-11.56-146.96 35.89 142.98 146.97-11.55-142.98 35.89z"
+    />
+    <path
+        id="path2993-1-7-4-8-8-2"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#eeffaa"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="159.23285"
+        sodipodi:r2="17.43626"
+        sodipodi:arg1="1.4085975"
+        sodipodi:arg2="2.1939957"
+        transform="matrix(-.051379 .023697 -.023697 -.051379 416.52 481.6)"
+        inkscape:randomized="0"
+        sodipodi:cy="475.21933"
+        sodipodi:cx="162.85715"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m188.57 632.36-35.89-142.98-146.97 11.55 142.99-35.89-11.56-146.96 35.89 142.98 146.97-11.55-142.98 35.89z"
+    />
+    <path
+        id="path2993-1-7-4-8-8-2-4"
+        style="stroke-linejoin:round;fill-opacity:.98039;stroke:#000000;stroke-linecap:round;fill:#f6ffd5"
+        sodipodi:type="star"
+        sodipodi:sides="4"
+        sodipodi:r1="159.23285"
+        sodipodi:r2="17.43626"
+        sodipodi:arg1="1.4085975"
+        sodipodi:arg2="2.1939957"
+        transform="matrix(-.0075125 .017226 -.017226 -.0075125 406.72 461.92)"
+        inkscape:randomized="0"
+        sodipodi:cy="475.21933"
+        sodipodi:cx="162.85715"
+        inkscape:rounded="-3.469447e-018"
+        inkscape:flatsided="false"
+        d="m188.57 632.36-35.89-142.98-146.97 11.55 142.99-35.89-11.56-146.96 35.89 142.98 146.97-11.55-142.98 35.89z"
+    />
+  </g
+  >
+  <metadata
+    >
+    <rdf:RDF
+      >
+      <cc:Work
+        >
+        <dc:format
+          >image/svg+xml</dc:format
+        >
+        <dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+        />
+        <cc:license
+            rdf:resource="http://creativecommons.org/licenses/publicdomain/"
+        />
+        <dc:publisher
+          >
+          <cc:Agent
+              rdf:about="http://openclipart.org/"
+            >
+            <dc:title
+              >Openclipart</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:publisher
+        >
+        <dc:title
+          >Green Star</dc:title
+        >
+        <dc:date
+          >2012-05-28T15:51:10</dc:date
+        >
+        <dc:description
+          >Many four pointed stars on top of each other.</dc:description
+        >
+        <dc:source
+          >https://openclipart.org/detail/170275/green-star-by-mairor</dc:source
+        >
+        <dc:creator
+          >
+          <cc:Agent
+            >
+            <dc:title
+              >mairor</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:creator
+        >
+        <dc:subject
+          >
+          <rdf:Bag
+            >
+            <rdf:li
+              >colours</rdf:li
+            >
+            <rdf:li
+              >green</rdf:li
+            >
+            <rdf:li
+              >shades</rdf:li
+            >
+            <rdf:li
+              >star</rdf:li
+            >
+          </rdf:Bag
+          >
+        </dc:subject
+        >
+      </cc:Work
+      >
+      <cc:License
+          rdf:about="http://creativecommons.org/licenses/publicdomain/"
+        >
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Reproduction"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Distribution"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
+        />
+      </cc:License
+      >
+    </rdf:RDF
+    >
+  </metadata
+  >
+</svg
+>
diff --git a/Yavsc/wwwroot/js/google-geoloc.js b/Yavsc/wwwroot/js/google-geoloc.js
new file mode 100644
index 00000000..bffeca70
--- /dev/null
+++ b/Yavsc/wwwroot/js/google-geoloc.js
@@ -0,0 +1,88 @@
++(function($,maps){
+$.widget("psc.googlegeocode" , {
+    options: {
+        mapId: 'map',
+        longId: 'Longitude',
+        latId: 'Latitude',
+        addrValidationId: 'AddressError',
+        formValidId: 'ValidationSummary',
+        locComboId: 'LocationCombo'
+    },
+     marker: null,
+     gmap: null,
+
+     _create: function() {
+         this.element.addClass("googlegeocode");
+         this.gmap = new maps.Map(document.getElementById(this.options.mapId), {
+            zoom: 16,
+            center: { lat: 48.862854, lng: 2.2056466 }
+	    });
+         var _this =this;
+         this.element.rules("add",
+    {
+        remote: {
+            url: 'https://maps.googleapis.com/maps/api/geocode/json',
+            type: 'get',
+            data: {
+                sensor: false,
+                address: function () { return _this.element.val() }
+                },
+            dataType: 'json',
+            dataFilter: function(datastr) {
+                $('#'+_this.options.locComboId).html("");
+                var data = JSON.parse(datastr);
+                data.results.forEach(function(item) {
+                    if (item.formatted_address !== _this.element.val()) {
+                        $('<li>'+item.formatted_address+'</li>')
+                        .data("geoloc",item)
+                        .click(function() { _this.chooseLoc('user',item) })
+                        .css('cursor','pointer')
+                        .appendTo($('#'+_this.options.locComboId));}
+                    else {  }
+                });
+               if  ((data.status === 'OK') && (data.results.length == 1))
+                { 
+             //       _this.chooseLoc('google',data.results[0]);
+                    return true;
+                } 
+                return false;
+                },
+            error: function()
+                {
+                // xhr, textStatus, errorThrown console.log('ajax loading error ... '+textStatus+' ... '+ errorThrown);
+                return false;
+                }
+         }
+        })},
+        chooseLoc: function(sender,loc) {
+        if (sender === 'user') this.element.val(loc.formatted_address);
+        var pos = loc.geometry.location;
+        var lat = new Number(pos.lat);
+        var lng = new Number(pos.lng);
+        $(document.getElementById(this.options.latId)).val(lat.toLocaleString('en'));
+        $(document.getElementById(this.options.longId)).val(lng.toLocaleString('en'));
+        this.gmap.setCenter(pos);
+        if (this.marker) { 
+            this.marker.setMap(null);
+        }
+        this.marker = new maps.Marker({
+            map: this.gmap,
+            draggable: true,
+            animation: maps.Animation.DROP,
+            position: pos
+            });
+        maps.event.addListener(this.marker, 'dragend', function() {
+            // TODO reverse geo code
+            var pos = this.marker.getPosition();
+                $('#'+this.options.latId).val(pos.lat);
+                $('#'+this.options.longId).val(pos.lng);
+        });
+        this.element.valid();
+        $('#'+this.options.addrValidationId).empty();
+        $('#'+this.options.formValidId).empty();
+        $('#'+this.options.locComboId).empty();
+        
+        return this;
+    }
+})
+})(jQuery,google.maps)
diff --git a/Yavsc/wwwroot/js/parallax.js b/Yavsc/wwwroot/js/parallax.js
new file mode 100644
index 00000000..4dce2d3c
--- /dev/null
+++ b/Yavsc/wwwroot/js/parallax.js
@@ -0,0 +1,97 @@
+//
+//  parralax.js
+//
+//  Author:
+//       Paul Schneider <paul@pschneider.fr>
+//
+//  Copyright (c) 2015 GNU GPL
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+$(document).ready(function($){
+	var $window = $(window); 
+	var $stwidth = $(window).width();
+	var $stheight = $(window).height();
+
+	var onPos = function (bgobj,ax,ay) {
+	  	var speed = bgobj.data('speed');
+		var dx=($window.scrollLeft()+ax-$stwidth/2)/speed;
+		var dy=($window.scrollTop()+ay-$stheight/2)/speed;
+		var xPos = bgobj.attr('orgbgpx') - Math.round( dx );
+		var yPos = bgobj.attr('orgbgpy') - Math.round( dy );
+		// Put together our final background position
+		var coords = '' + xPos + bgobj.attr('orgbgpxu') + yPos + bgobj.attr('orgbgpyu');
+		// Move the background
+		bgobj.css({ backgroundPosition: coords });
+	};
+	 var tiltLR=0;
+	 var titleFB=0;
+
+	$('[data-type="background"]').each(function(){
+		var $bgobj = $(this); // assigning the object
+		// get the initial background position, assumes a "X% Yem" ?
+		var orgpos = $bgobj.css('backgroundPosition');
+		var bgpos = orgpos.split(" ");
+
+		var bgposx = bgpos[0];
+		var bgposy = bgpos[1];
+		if (/%$/.test(bgposx)){ 
+			bgposx = bgposx.substr(0,bgposx.length-1);
+			$bgobj.attr('orgbgpxu','% ');
+		}
+		else if (/em$/.test(bgposx)){
+			bgposx = bgposx.substr(0,bgposx.length-2);
+			$bgobj.attr('orgbgpxu','em ');
+		}
+		else if (/px$/.test(bgposx)){
+			bgposx = bgposx.substr(0,bgposx.length-2);
+			$bgobj.attr('orgbgpxu','px ');
+		}
+		else { $bgobj.attr('orgbgpxu','px '); } 
+
+		if (/%$/.test(bgposy)){ 
+			bgposy = bgposy.substr(0,bgposy.length-1);
+			$bgobj.attr('orgbgpyu','% ');
+		}
+		else if (/em$/.test(bgposy)){
+			bgposy = bgposy.substr(0,bgposy.length-2);
+			$bgobj.attr('orgbgpyu','em ');
+		}
+		else if (/px$/.test(bgposy)){
+			bgposy = bgposy.substr(0,bgposy.length-2);
+			$bgobj.attr('orgbgpyu','px ');
+		}
+		else { $bgobj.attr('orgbgpyu','px '); } 
+		$bgobj.attr('orgbgpx',parseInt(bgposx));
+		$bgobj.attr('orgbgpy',parseInt(bgposy));
+		    
+		$(window).scroll(function() {
+		  onPos($bgobj,tiltLR,titleFB);
+		});
+		if (window.DeviceOrientationEvent) {
+		if ($stwidth>320 && $stheight>320) {
+		  window.addEventListener('deviceorientation', function(event) {
+		  tiltLR = $stwidth*Math.sin(event.gamma*Math.PI/180);
+		  	titleFB = $stheight*Math.sin(event.beta*Math.PI/90);
+			onPos($bgobj,tiltLR,titleFB);
+		  },false); }
+		  $(window).mousemove(function(e) {
+		  	tiltLR = e.pageX;
+		  	titleFB = e.pageY;
+			onPos($bgobj,e.pageX,e.pageY);
+			});
+		}  
+	});
+}(jQuery));
diff --git a/YavscLib/HairCut/IHairCutQuery.cs b/YavscLib/HairCut/IHairCutQuery.cs
index 9004d649..82e46689 100644
--- a/YavscLib/HairCut/IHairCutQuery.cs
+++ b/YavscLib/HairCut/IHairCutQuery.cs
@@ -5,6 +5,6 @@ namespace YavscLib.HairCut
         long Id { get; set; }
         long PrestationId { get; set; }
 
-        long LocationId { get; set; }
+        long? LocationId { get; set; }
     }
 }