From 583adaa09b8b8132feec91f353663651947f8e3f Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 3 Nov 2016 15:27:06 +0100 Subject: [PATCH] Fixe l'affichage du devis --- Yavsc/Controllers/EstimateController.cs | 1 + Yavsc/Views/Estimate/Details.cshtml | 15 +++++++++-- Yavsc/Views/Shared/BillingLine.cshtml | 33 +++++++++++++++++++++++++ Yavsc/tasks.todo | 2 +- 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 Yavsc/Views/Shared/BillingLine.cshtml diff --git a/Yavsc/Controllers/EstimateController.cs b/Yavsc/Controllers/EstimateController.cs index f9e9f454..a3374f8d 100644 --- a/Yavsc/Controllers/EstimateController.cs +++ b/Yavsc/Controllers/EstimateController.cs @@ -50,6 +50,7 @@ namespace Yavsc.Controllers .Include(e => e.Query) .Include(e => e.Query.PerformerProfile) .Include(e => e.Query.PerformerProfile.Performer) + .Include(e=> e.Bill) .Where( e=>e.OwnerId == uid || e.ClientId == uid ) diff --git a/Yavsc/Views/Estimate/Details.cshtml b/Yavsc/Views/Estimate/Details.cshtml index 384dab3b..cc3d783f 100644 --- a/Yavsc/Views/Estimate/Details.cshtml +++ b/Yavsc/Views/Estimate/Details.cshtml @@ -10,23 +10,34 @@

Estimate


+
+ @Html.DisplayNameFor(model => model.Title) +
+
+ @Html.DisplayFor(model => model.Title) +
+
@Html.DisplayNameFor(model => model.Description)
@Html.DisplayFor(model => model.Description)
+
@Html.DisplayNameFor(model => model.Status)
@Html.DisplayFor(model => model.Status)
+
- @Html.DisplayNameFor(model => model.Title) + @Html.DisplayNameFor(model => model.Bill)
- @Html.DisplayFor(model => model.Title) + @foreach (var cl in Model.Bill) { + @await Html.PartialAsync("BillingLine", cl); + }
diff --git a/Yavsc/Views/Shared/BillingLine.cshtml b/Yavsc/Views/Shared/BillingLine.cshtml new file mode 100644 index 00000000..190e84b2 --- /dev/null +++ b/Yavsc/Views/Shared/BillingLine.cshtml @@ -0,0 +1,33 @@ +@model Yavsc.Models.Billing.CommandLine + + +
+
+ @Html.DisplayNameFor(model => model.Id) +
+
+ @Html.DisplayFor(model => model.Id) +
+ +
+ @Html.DisplayNameFor(model => model.Description) +
+
+ @Html.DisplayFor(model => model.Description) +
+ +
+ @Html.DisplayNameFor(model => model.Count) +
+
+ @Html.DisplayFor(model => model.Count) +
+ +
+ @Html.DisplayNameFor(model => model.UnitaryCost) +
+
+ @Html.DisplayFor(model => model.UnitaryCost) +
+ +
\ No newline at end of file diff --git a/Yavsc/tasks.todo b/Yavsc/tasks.todo index 2a88f715..62bcd68c 100644 --- a/Yavsc/tasks.todo +++ b/Yavsc/tasks.todo @@ -16,7 +16,7 @@ Da road to the hell ☐ Signature de contrat ✔ Chat privé (coté serveur) @done (October 13th 2016, 16:27) ✔ Accès mobile au salon public @done (October 13th 2016, 16:27) - ☐ Accès Web au chat privé + ✔ Accès Web au chat privé @done (November 3rd 2016, 14:57) ✔ Accès mobile au chat privé @done (November 3rd 2016, 11:15) ## Jalon 2