From 2a64f2dc84e7d1b52144771652d027cdcdd14331 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 16 Jan 2017 15:33:45 +0100
Subject: [PATCH] Mide en forms

---
 Yavsc/Views/Command/Details.cshtml  | 44 +----------------------------
 Yavsc/Views/Do/Details.cshtml       |  6 ++--
 Yavsc/Views/Estimate/Create.cshtml  |  2 +-
 Yavsc/Views/Estimate/Details.cshtml | 30 ++------------------
 4 files changed, 7 insertions(+), 75 deletions(-)

diff --git a/Yavsc/Views/Command/Details.cshtml b/Yavsc/Views/Command/Details.cshtml
index 76a2270a..dcb28d2d 100644
--- a/Yavsc/Views/Command/Details.cshtml
+++ b/Yavsc/Views/Command/Details.cshtml
@@ -9,49 +9,7 @@
 <div>
     <h4>Command</h4>
     <hr />
-    <dl class="dl-horizontal">
-        
-        <dt>
-            @Html.DisplayNameFor(model => model.EventDate)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.EventDate)
-        </dd>
-        
-        <dt>
-             @Html.DisplayNameFor(model => model.Client)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Client.UserName)
-        </dd>
-       
-        <dt>
-            @Html.DisplayNameFor(model => model.Location.Address)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Location.Address)
-        </dd>
-        
-        <dt>
-            @Html.DisplayNameFor(model => model.PerformerProfile)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.PerformerProfile.Performer.UserName)
-        </dd>
-        
-        <dt>
-            @Html.DisplayNameFor(model => model.ValidationDate)
-        </dt>
-        <dd>
-            @if (Model.ValidationDate==null) {
-                @SR["NotValidated"]
-            }
-            else { 
-                @Html.DisplayFor(model => model.ValidationDate)
-            }
-        </dd>
-        
-    </dl>
+    @Html.DisplayFor(m=>m)
 </div>
 <p>
     <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
diff --git a/Yavsc/Views/Do/Details.cshtml b/Yavsc/Views/Do/Details.cshtml
index 7f74294d..4970cd99 100644
--- a/Yavsc/Views/Do/Details.cshtml
+++ b/Yavsc/Views/Do/Details.cshtml
@@ -1,13 +1,13 @@
 @model Yavsc.Models.Workflow.UserActivity
 
 @{
-    ViewData["Title"] = "Details";
+    ViewData["Title"] = SR["Details"];
 }
 
-<h2>Details</h2>
+<h2>@ViewData["Title"]</h2>
 
 <div>
-    <h4>UserActivity</h4>
+    <h4>Détails de votre activité @Model.DoesCode</h4>
     <hr />
     <dl class="dl-horizontal">
         <dt>@SR["Activity"]</dt>
diff --git a/Yavsc/Views/Estimate/Create.cshtml b/Yavsc/Views/Estimate/Create.cshtml
index 1300fb1b..d9ad10c6 100644
--- a/Yavsc/Views/Estimate/Create.cshtml
+++ b/Yavsc/Views/Estimate/Create.cshtml
@@ -27,7 +27,7 @@
             <div class="col-md-10">
                 <select name="CommandId" id="CommandId">
                     @foreach (var query in ViewBag.Queries) {
-                    <option value="@query.Id" data-clientid="@query.ClientId">@query.GetDescription()</option>
+                    <option value="@query.Id" data-clientid="@query.ClientId">@Html.DisplayFor(m=> query)</option>
                     }
                 </select>
                 <span asp-validation-for="ClientId" class="text-danger" />
diff --git a/Yavsc/Views/Estimate/Details.cshtml b/Yavsc/Views/Estimate/Details.cshtml
index b45f2bc1..b65a1c83 100644
--- a/Yavsc/Views/Estimate/Details.cshtml
+++ b/Yavsc/Views/Estimate/Details.cshtml
@@ -9,35 +9,9 @@
 <div>
     <h4>Estimate</h4>
     <hr />
-    <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.Title)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Title)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Description)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Description)
-        </dd>
-
-        <dt>
-            @Html.DisplayNameFor(model => model.Bill)
-        </dt>
-        <dd>
-            @foreach (var cl in Model.Bill) {
-                @await Html.PartialAsync("BillingLine", cl);
-            }
-        </dd>
-    </dl>
-</div>
+    
+            @Html.DisplayNameFor(model => model)
 <p>
     <a asp-action="Edit" asp-route-id="@Model.Id">@SR["Edit"]</a> |
     <a asp-action="Index">@SR["Back to List"]</a> 
 </p>
-<div>
-@await Component.InvokeAsync("Estimate",Model.Id)
-</div>