Gestion des activités

Yavsc/Views/Do/Index.cshtml

@@ -17,7 +17,7 @@
     
 @foreach (var item in Model) {
     <tr>
-        <td> @Html.Display("item.Name")
+        <td> @item.Does.Name
         </td>
         <td>
             <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |

Yavsc/Views/FrontOffice/Book.cshtml

@@ -6,9 +6,10 @@
 <em>@ViewBag.Activity.Description</em>
 
 @foreach (var profile in Model) {
-    await Html.RenderPartialAsync("_PerformerPartial", profile) ; 
+    <hr/>
+    await Html.RenderPartialAsync("PerformerProfile", profile) ; 
     <form action="~/Command/Create" >
         <input type="hidden" name="id" value="@profile.PerformerId" />
-   <input type="submit" value="@SR["Book "+ViewBag.Activity.Code]"/>
-        </form>
+             <input type="submit" value="@SR["Book "+ViewBag.Activity.Code]"/>
+    </form>
 }

Yavsc/Views/FrontOffice/Index.cshtml

@@ -1,8 +1,7 @@
 
 
 @{
-    ViewData["Title"] = "Index";
+    ViewData["Title"] = "Front office";
 }
 
 <h2>Index</h2>
-

Yavsc/Views/Home/Index.cshtml

@@ -16,7 +16,7 @@
                 <p>
                 Invitez un groupe musical à animer votre événement </p>
                 <p>
-                    <a class="btn btn-default" href="~/do/Book/IT">
+                    <a class="btn btn-default" asp-controller="FrontOffice" asp-action="Book" asp-route-id="IT">
                         En savoir plus
                     </a>
                 </p>
@@ -28,7 +28,7 @@
                 <p>
                     Organisez un concert. </p>
                 <p>
-                    <a class="btn btn-default" href="~/do/Book/IT">
+                    <a class="btn btn-default" asp-controller="FrontOffice" asp-action="Book" asp-route-id="IT">
                         En savoir plus
                     </a>
                 </p>
@@ -40,7 +40,7 @@
                 <p> Offrez-vous un anniversaire, un mariage Hip Hop </p>
                 <p>
 
-                    <a class="btn btn-default" href="~/do/Book/IT">
+                    <a class="btn btn-default" asp-controller="FrontOffice" asp-action="Book" asp-route-id="IT">
                         En savoir plus
 
                     </a>
@@ -53,7 +53,7 @@
                 <p>
                     Invitez votre chanteur à la fête </p>
                 <p>
-                    <a class="btn btn-default" href="~/do/Book/IT">
+                    <a class="btn btn-default" asp-controller="FrontOffice" asp-route-id="Book" >
                         En savoir plus
                     </a>
                 </p>

Yavsc/Views/Manage/Index.cshtml

@@ -1,4 +1,5 @@
 @model IndexViewModel
+@using System.Security.Claims
 @{
     ViewData["Title"] = @SR["Manage your account"];
 }
@@ -53,21 +54,27 @@
             >@SR[@Model.Avatar==null?"Set":"Modify"]</a>]
         </dd> 
 
-        <dt>@SR["Activity"]:</dt>
-        <dd>@Html.DisplayFor(model => model.Activity)
+        <dt>@SR["Professional settings"]:</dt>
+        <dd>
+            @Html.DisplayFor(model => model.HaveProfessionalSettings)
             [<a asp-controller="Manage" asp-action="SetActivity"
+            >@SR[Model.HaveProfessionalSettings?"Modify settings":"Set"]</a>]
+        </dd>
+@if (Model.HaveProfessionalSettings) {
+        <dt>@SR["Activities"]:</dt>
+        <dd>
+           @string.Join(", ",Model.Activity.Select( u=> u.Does.Name ).ToArray())
+            [<a asp-controller="Do" asp-action="Index"
             >@SR[@Model.Activity==null?"Set":"Modify settings"]</a>]
         </dd>
-
+}
         <dt>@SR["Bank info"]:</dt>
         <dd>@Html.DisplayFor(m => m.BankInfo)  [<a asp-controller="Manage" asp-action="AddBankInfo"
             >@SR[@Model.BankInfo==null?"Set":"Modify"]</a>]</dd>
 
-        <dt>@SR["YourPosts"]:</dt>
-        <dd>@Model.PostsCounter
-            [<a asp-controller="Blogspot" asp-action="UserPosts" 
-            asp-route-id="@Model.UserName">@SR["YourPosts"]</a>]
-        </dd>
+        <dt><a asp-controller="Blogspot" asp-action="UserPosts" 
+            asp-route-id="@Model.UserName">@SR["Your posts"]:</a></dt>
+        <dd>@Model.PostsCounter</dd>
        
       <dt>@SR["TwoFactorAuthentication"]:</dt> 
       <dd>
@@ -114,6 +121,10 @@
           @(Model.DiskUsage.ToString("0,#")) / @(Model.DiskQuota.ToString("0,#"))
           </text>
       </dd>
+      <dt>Identifiant utilisateur</dt>
+      <dd>
+          @User.GetUserId()
+      </dd>
     </dl>
     <h4>
       <a asp-controller="Account" asp-action="Delete" >@SR["Unregister"]</a>

Yavsc/Views/Manage/SetActivity.cshtml

@@ -105,22 +105,13 @@
 }
 <h2>@ViewData["Title"].</h2>
 
-@{ await Html.RenderPartialAsync("_PerformerPartial", Model) ; }
+@Html.DisplayFor(model => model)
 
 <form id="FrmSetAct" asp-controller="Manage" asp-action="SetActivity" method="post" class="form-horizontal" role="form">
     <h4>@SR["Choose below your main activity"]:</h4>
     <hr />
     <div asp-validation-summary="ValidationSummary.All" class="text-danger" id="valsum"></div>
-    <div class="form-group">
-        <label asp-for="Activity" class="col-md-2 control-label"></label>
-        <div class="col-md-10">
-            <select asp-for="Activity" asp-items=@ViewBag.Activities class="form-control" multiple>
-
-            </select>
-
-            <span asp-validation-for="Activity" class="text-danger"></span>
-        </div>
-    </div>
+    
     <div class="form-group">
         <label asp-for="AcceptNotifications" class="col-md-2 control-label"></label>
         <div class="col-md-10">

Yavsc/Views/Shared/PerformerProfile.cshtml

@@ -37,6 +37,6 @@
             }
 
     </ul>
-    <button id="btnAddUser">Ajouter aux contacts</button>
+   
      }
 </div>