hair cut command

Yavsc/Controllers/CommandFormsController.cs

@@ -50,7 +50,7 @@ namespace Yavsc.Controllers
         }
         private void SetViewBag(CommandForm commandForm=null) {
             ViewBag.ActivityCode = new SelectList(_context.Activities, "Code", "Name", commandForm?.ActivityCode);
-            ViewBag.Action = Startup.Forms.Select( c => new SelectListItem { Text = c, Selected = commandForm?.Action == c } );
+            ViewBag.ActionName = Startup.Forms.Select( c => new SelectListItem { Value = c, Text = c, Selected = (commandForm?.ActionName == c) } );
         }
         // POST: CommandForms/Create
         [HttpPost]

Yavsc/Controllers/FrontOfficeController.cs

@@ -10,14 +10,9 @@ using System.Security.Claims;
 namespace Yavsc.Controllers
 {
     using Helpers;
-    using Microsoft.AspNet.Http;
     using Microsoft.Extensions.Localization;
     using Models;
-    using Newtonsoft.Json;
     using ViewModels.FrontOffice;
-    using Yavsc.Extensions;
-    using Yavsc.Models.Haircut;
-    using Yavsc.ViewModels.Haircut;
 
     public class FrontOfficeController : Controller
     {
@@ -67,30 +62,20 @@ namespace Yavsc.Controllers
             var result = _context.ListPerformers(id);
             return View(result);
         }
-        
         [AllowAnonymous]
         public ActionResult HairCut(string id)
         {
-            HairPrestation pPrestation=null;
-            var prestaJson = HttpContext.Session.GetString("HairCutPresta") ;
-            if (prestaJson!=null) {
-                pPrestation = JsonConvert.DeserializeObject<HairPrestation>(prestaJson);
+            if (id == null)
+            {
+                throw new NotImplementedException("No Activity code");
             }
-            else pPrestation = new HairPrestation {};
-            ViewBag.HairTaints = _context.HairTaint.Include(t=>t.Color);
-            ViewBag.HairTechnos = EnumExtensions.GetSelectList(typeof(HairTechnos),_SR);
-            ViewBag.HairLength = EnumExtensions.GetSelectList(typeof(HairLength),_SR);
-            ViewBag.Activity = _context.Activities.First(a => a.Code == id);
-            ViewBag.Gender = EnumExtensions.GetSelectList(typeof(HairCutGenders),_SR);
-            ViewBag.HairDressings = EnumExtensions.GetSelectList(typeof(HairDressings),_SR);
-            var result = new HairCutView {
-                HairBrushers = _context.ListPerformers(id),
-                Topic = pPrestation
-            } ;
+            ViewBag.Activity = _context.Activities.FirstOrDefault(a => a.Code == id);
+            var result = _context.ListPerformers(id);
             return View(result);
         }
         
 
+
         [Produces("text/x-tex"), Authorize, Route("estimate-{id}.tex")]
         public ViewResult EstimateTex(long id)
         {

Yavsc/Controllers/HairCutCommandController.cs

@@ -9,15 +9,20 @@ using Microsoft.Data.Entity;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.OptionsModel;
-using Yavsc.Helpers;
-using Yavsc.Models;
-using Yavsc.Models.Google.Messaging;
-using Yavsc.Models.Haircut;
-using Yavsc.Models.Relationship;
-using Yavsc.Services;
 
 namespace Yavsc.Controllers
 {
+    using Yavsc.Helpers;
+    using Yavsc.Models;
+    using Yavsc.Models.Google.Messaging;
+    using Yavsc.Models.Relationship;
+    using Yavsc.Services;
+    using Newtonsoft.Json;
+    using Microsoft.AspNet.Http;
+    using Yavsc.Extensions;
+    using Yavsc.Models.Haircut;
+    using Yavsc.ViewModels.Haircut;
+
     public class HairCutCommandController : CommandController
     {
         public HairCutCommandController(ApplicationDbContext context, 
@@ -111,6 +116,28 @@ namespace Yavsc.Controllers
        
         }
 
+        [AllowAnonymous]
+        public ActionResult HairCut(string performerId, string activityCode)
+        {
+            HairPrestation pPrestation=null;
+            var prestaJson = HttpContext.Session.GetString("HairCutPresta") ;
+            if (prestaJson!=null) {
+                pPrestation = JsonConvert.DeserializeObject<HairPrestation>(prestaJson);
+            }
+            else pPrestation = new HairPrestation {};
+           
+            ViewBag.HairTaints = _context.HairTaint.Include(t=>t.Color);
+            ViewBag.HairTechnos = EnumExtensions.GetSelectList(typeof(HairTechnos),_localizer);
+            ViewBag.HairLength = EnumExtensions.GetSelectList(typeof(HairLength),_localizer);
+            ViewBag.Activity = _context.Activities.First(a => a.Code == activityCode);
+            ViewBag.Gender = EnumExtensions.GetSelectList(typeof(HairCutGenders),_localizer);
+            ViewBag.HairDressings = EnumExtensions.GetSelectList(typeof(HairDressings),_localizer);
+            var result = new HairCutView {
+                HairBrusher = _context.Performers.Single(p=>p.PerformerId == performerId),
+                Topic = pPrestation
+            } ;
+            return View(result);
+        }
         [HttpPost, Authorize]
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> CreateHairMultiCutQuery(HairMultiCutQuery command)

Yavsc/Migrations/20170228145057_actionName.cs

@@ -0,0 +1,569 @@
+using Microsoft.Data.Entity.Migrations;
+
+namespace Yavsc.Migrations
+{
+    public partial class actionName : 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_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_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.DropColumn(name: "Action", table: "CommandForm");
+            migrationBuilder.AddColumn<string>(
+                name: "ActionName",
+                table: "CommandForm",
+                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_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_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_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_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.DropColumn(name: "ActionName", table: "CommandForm");
+            migrationBuilder.AddColumn<string>(
+                name: "Action",
+                table: "CommandForm",
+                nullable: true);
+            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_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_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);
+        }
+    }
+}

Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -944,7 +944,7 @@ namespace Yavsc.Migrations
                     b.Property<long>("Id")
                         .ValueGeneratedOnAdd();
 
-                    b.Property<string>("Action");
+                    b.Property<string>("ActionName");
 
                     b.Property<string>("ActivityCode")
                         .IsRequired();

Yavsc/Models/Haircut/HairPrestation.cs

@@ -7,6 +7,10 @@ namespace Yavsc.Models.Haircut
 {
     public class HairPrestation 
     { 
+        // Homme ou enfant => Coupe seule
+        // Couleur => Shampoing 
+        // Forfaits : Coupe - Technique
+
         [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
 

Yavsc/Models/Workflow/CommandForm.cs

@@ -10,7 +10,7 @@ namespace Yavsc.Models.Workflow
         [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
 
-        public string Action { get; set; }
+        public string ActionName { get; set; }
 
         public string Title { get; set; } 
         

Yavsc/ViewModels/Haircut/HairCutView.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Yavsc.Models.Haircut;
 using Yavsc.Models.Workflow;
 
@@ -6,7 +5,7 @@ namespace Yavsc.ViewModels.Haircut
 {
     public class HairCutView
     {
-        public List<PerformerProfile> HairBrushers { get; set; }
+        public PerformerProfile HairBrusher { get; set; }
         
         public HairPrestation Topic { get; set; }
     }

Yavsc/Views/CommandForms/Create.cshtml

@@ -18,9 +18,9 @@
             </div>
         </div>
         <div class="form-group">
-            <label asp-for="Action" class="col-md-2 control-label"></label>
+            <label asp-for="ActionName" class="col-md-2 control-label"></label>
             <div class="col-md-10">
-                <select asp-for="Action" asp-items="@ViewBag.Action" class ="form-control"></select>
+                <select asp-for="ActionName" asp-items="@ViewBag.ActionName" class ="form-control"></select>
             </div>
         </div>
         <div class="form-group">

Yavsc/Views/CommandForms/Details.cshtml

@@ -16,6 +16,12 @@
         <dd>
             @Html.DisplayFor(model => model.Title)
         </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.ActionName)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.ActionName)
+        </dd>
     </dl>
 </div>
 <p>

Yavsc/Views/CommandForms/Edit.cshtml

@@ -17,20 +17,20 @@
             <div class="col-md-10">
                 <select asp-for="ActivityCode" asp-items="@ViewBag.ActivityCode" class="form-control"  >
                 </select>
-                <span asp-validation-for="ActivityCode" class="text-danger" />
+                <span asp-validation-for="ActivityCode" class="text-danger" ></span>
             </div>
         </div>
         <div class="form-group">
-            <label asp-for="Action" class="col-md-2 control-label"></label>
+            <label asp-for="ActionName" class="col-md-2 control-label"></label>
             <div class="col-md-10">
-                <select asp-for="Action" asp-items="@ViewBag.Action" class ="form-control"></select>
+                <select asp-for="ActionName" asp-items="@ViewBag.ActionName" class ="form-control"></select>
             </div>
         </div>
         <div class="form-group">
             <label asp-for="Title" class="col-md-2 control-label"></label>
             <div class="col-md-10">
                 <input asp-for="Title" class="form-control" />
-                <span asp-validation-for="Title" class="text-danger" />
+                <span asp-validation-for="Title" class="text-danger" ></span>
             </div>
         </div>
         <div class="form-group">

Yavsc/Views/CommandForms/Index.cshtml

@@ -14,6 +14,9 @@
         <th>
             @Html.DisplayNameFor(model => model.Title)
         </th>
+        <th>
+            @Html.DisplayNameFor(model => model.ActionName)
+        </th>
         <th></th>
     </tr>
     
@@ -22,6 +25,9 @@
         <td>
             @Html.DisplayFor(modelItem => item.Title)
         </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.ActionName)
+        </td>
         <td>
             <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
             <a asp-action="Details" asp-route-id="@item.Id">Details</a> |

Yavsc/Views/FrontOffice/HairCut.cshtml

@@ -1,86 +1,18 @@
-@model HairCutView
+@model IEnumerable<PerformerProfile>
   
 @{
-    ViewData["Title"] = $"{ViewBag.Activity.Name}: Votre commande";
+    ViewData["Title"] = "Les profiles - " + (ViewBag.Activity?.Name ?? SR["Any"]);
 }
+<h1>@ViewData["Title"]</h1>
 <em>@ViewBag.Activity.Description</em>
 
-
-   @Html.DisplayFor(m=>m)
-    <form asp-controller="HairCutCommand" asp-action="HairCutProfiles" >
-
-
-    <div class="form-horizontal">
-        <h1>@ViewData["Title"]</h1>
-        <hr />
-        <div asp-validation-summary="ValidationSummary.ModelOnly" class="text-danger"></div>
-        <div class="form-group">
-            <label asp-for="Topic.Gender" class="col-md-2 control-label"></label>
-            <div class="col-md-10">
-                <select asp-for="Topic.Gender" asp-items="@ViewBag.Gender" class="form-control"></select>
-                <span asp-validation-for="Topic.Gender" class="text-danger" />
-            </div>
-        </div>
-        <div class="form-group">
-            <label asp-for="Topic.Length" class="col-md-2 control-label"></label>
-            <div class="col-md-10">
-                <select asp-for="Topic.Length" asp-items="@ViewBag.HairLength" class="form-control"></select>
-                <span asp-validation-for="Topic.Length" class="text-danger" />
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <div class="checkbox">
-                    <input asp-for="Topic.Cut" />
-                    <label asp-for="Topic.Cut"></label>
-                </div>
-            </div>
-        </div>
-        <div class="form-group">
-            <label asp-for="Topic.Dressing" asp-items="@ViewBag.Dressing" class="col-md-2 control-label"></label>
-            <div class="col-md-10">
-                <select asp-for="Topic.Dressing" class="form-control" asp-items="@ViewBag.HairDressings"></select>
-                <span asp-validation-for="Topic.Dressing" class="text-danger" />
-            </div>
-        </div>
-        <div class="form-group">
-            <label asp-for="Topic.Tech" class="col-md-2 control-label"></label>
-            <div class="col-md-10">
-                <select asp-for="Topic.Tech" asp-items="@ViewBag.HairTechnos" class="form-control"></select>
-                <span asp-validation-for="Topic.Tech" class="text-danger" />
-            </div>
-        </div>
-        <div class="form-group">
-            <label asp-for="Topic.Taints" class="col-md-2 control-label"></label>
-            <div class="col-md-10">
-               
-@foreach (HairTaint color in ViewBag.HairTaints) {
-    <label>
-     <input type="checkbox" value="@color.Id" name="Topic.Taints[]"/>
-     @await Html.PartialAsync("HairTaint",color)
-     </label>
-     }
-                 <input type="hidden" asp-for="Topic.Taints" />
-                <span asp-validation-for="Topic.Taints" class="text-danger" />
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <div class="checkbox">
-                    <input asp-for="Topic.Shampoo" />
-                    <label asp-for="Topic.Shampoo"></label>
-                </div>
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <div class="checkbox">
-                    <input asp-for="Topic.Cares" />
-                    <label asp-for="Topic.Cares"></label>
-                </div>
-            </div>
-        </div>
-
+@foreach (var profile in Model) {
+    <hr/>
+   @Html.DisplayFor(m=>profile)
+    <form asp-controller="HairCutCommand" asp-action="HairCut">
+        <input type="hidden" name="performerId" value="@profile.PerformerId" />
         <input type="hidden" name="activityCode" value="@ViewBag.Activity.Code" />
-             <input type="submit" value="@SR["Selectionnez maintenant votre prestataire"]"/>
+             <input type="submit" value="@SR["Proposer un rendez-vous à"] @profile.Performer.UserName"/>
     </form> 
+}
+

Yavsc/Views/HairCutCommand/HairCut.cshtml

@@ -0,0 +1,89 @@
+@model HairCutView
+  
+@{
+    ViewData["Title"] = $"{ViewBag.Activity.Name}: Votre commande";
+}
+<em>@ViewBag.Activity.Description</em>
+
+
+   @Html.DisplayFor(m=>m)
+    <form asp-controller="HairCutCommand" asp-action="HairCut" >
+
+
+    <div class="form-horizontal">
+        <h2>@ViewData["Title"]</h2>
+        <hr />
+        <div asp-validation-summary="ValidationSummary.ModelOnly" class="text-danger"></div>
+        <div class="form-group">
+            <label asp-for="Topic.Gender" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select asp-for="Topic.Gender" asp-items="@ViewBag.Gender" class="form-control"></select>
+                <span asp-validation-for="Topic.Gender" class="text-danger" ></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="Topic.Length" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select asp-for="Topic.Length" asp-items="@ViewBag.HairLength" class="form-control"></select>
+                <span asp-validation-for="Topic.Length" class="text-danger"  ></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <div class="checkbox">
+                    <input asp-for="Topic.Cut" />
+                    <label asp-for="Topic.Cut"></label>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="Topic.Dressing" asp-items="@ViewBag.Dressing" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select asp-for="Topic.Dressing" class="form-control" asp-items="@ViewBag.HairDressings"></select>
+                <span asp-validation-for="Topic.Dressing" class="text-danger"  ></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="Topic.Tech" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select asp-for="Topic.Tech" asp-items="@ViewBag.HairTechnos" class="form-control"></select>
+                <span asp-validation-for="Topic.Tech" class="text-danger" ></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="Topic.Taints" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+               
+@foreach (HairTaint color in ViewBag.HairTaints) {
+    <label>
+     <input type="checkbox" value="@color.Id" name="Topic.Taints[]"/>
+     @await Html.PartialAsync("HairTaint",color)
+     </label>
+     }
+                 <input type="hidden" asp-for="Topic.Taints" />
+                <span asp-validation-for="Topic.Taints" class="text-danger"  ></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <div class="checkbox">
+                    <input asp-for="Topic.Shampoo" />
+                    <label asp-for="Topic.Shampoo"></label>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <div class="checkbox">
+                    <input asp-for="Topic.Cares" />
+                    <label asp-for="Topic.Cares"></label>
+                </div>
+            </div>
+        </div>
+
+        <input type="hidden" name="performerId" value="@Model.HairBrusher.PerformerId" />
+        <input type="hidden" name="activityCode" value="@ViewBag.Activity.Code" />
+             <input type="submit" value="@SR["Selectionnez maintenant votre prestataire"]"/>
+    </div>
+    
+    </form>

Yavsc/Views/Home/Index.cshtml

@@ -44,7 +44,7 @@
                     }
 
                 @foreach (var frm in act.Forms) {
-                    <a class="btn btn-success" asp-controller="FrontOffice" asp-action="@frm.Action" asp-route-id="@act.Code">
+                    <a class="btn btn-success" asp-controller="FrontOffice" asp-action="@frm.ActionName" asp-route-id="@act.Code">
                     @frm.Title
                     </a>
                 }

Yavsc/wwwroot/css/site.css

@@ -109,11 +109,11 @@ a:hover {
 .carousel-indicators {
     position: absolute;
     z-index: 15;
-    padding-left: 0;
+    padding: 0;
     text-align: center;
     list-style: none;
-    bottom: 1em;
-    top: initial;
+    top: .1em;
+    height: 1em;
 }
 
 @-webkit-keyframes mymove {

YavscLib/ICommandForm.cs

@@ -3,7 +3,7 @@ namespace YavscLib
     public interface ICommandForm
     {
          long Id { get; set; }
-         string Action { get; set; }
+         string ActionName { get; set; }
          string Title { get; set; } 
          string ActivityCode { get; set; }