This commit is contained in:
Paul Schneider 2017-04-08 09:17:15 +02:00
commit a96faa6f6c
35 changed files with 2787 additions and 62 deletions

View file

@ -0,0 +1,16 @@
@model HairCutQuery
@{
ViewData["Title"] = @SR["Annuler votre commande"];
}
<h2>@ViewData["Title"]</h2>
<div>
<hr />
@Html.DisplayFor(m=>m)
</div>
<p>
<a asp-action="ClientCancelConfirm" asp-route-id="@Model.Id" class="btn btn-success">Je confirme, je veux annuler cette commande</a> |
<a asp-action="Index" class="btn btn-link">@SR["Back to List"]</a>
</p>

View file

@ -6,13 +6,25 @@
<div class="form-horizontal">
<h4>@SR["Your book query"]</h4>
<hr />
<ul>
<li>
Votre star de la coiffure:
<dl>
<dt>
Votre star de la coiffure
</dt>
<dd>
@Html.DisplayFor(m=>m.PerformerProfile)
</li>
<li>
</dd>
<dt>
@Html.DisplayNameFor(m=>m.Prestation)
</dt>
<dd>
@Html.DisplayFor(m=>m.Prestation)
</dd>
<dt>
@Html.DisplayNameFor(m=>m.AdditionalInfo)
</dt>
<dd>@Html.DisplayFor(m=>m.AdditionalInfo)
</dd>
</dl>
<p>
Addition minimale
(Compter des frais supplémentaires
@ -21,6 +33,10 @@
<span class="price"> @ViewBag.Addition </span></p>
</li>
<li>
@Model.AdditionalInfo
</li>
<li>
@if (Model.EventDate == null) {
<p>Pas de date convenue ...</p>
} else {

View file

@ -0,0 +1,16 @@
@model HairCutQuery
@{
ViewData["Title"] = @SR["Le detail de votre commande de prestation en coiffure à domicile"];
}
<h2>@ViewData["Title"]</h2>
<div>
<hr />
@Html.DisplayFor(m=>m)
</div>
<p>
<a asp-action="ClientCancel" asp-route-id="@Model.Id" class="btn btn-primary">Annuler cette commande</a> |
<a asp-action="Index" class="btn btn-link">@SR["Back to List"]</a>
</p>

View file

@ -208,6 +208,13 @@
</div>
</div>
</div>
<div class="form-group">
<label asp-for="AdditionalInfo" class="col-md-2 control-label"></label>
<div class="col-md-offset-2 col-md-10">
<textarea asp-for="AdditionalInfo" class="form-control">
</textarea>
</div>
</div>
<span>Total: <span id="Total" class="total"></span>
</span>
<input asp-for="ClientId" type="hidden" />

View file

@ -0,0 +1,51 @@
@model IEnumerable<HairCutQuery>
@{
ViewData["Title"] = "Vos commandes en coiffure à domicile";
}
<h2>@ViewData["Title"]</h2>
<table class="table">
<tr>
<th>
@SR["DateCreated"]
</th>
<th>
@SR["EventDate"]
</th>
<th>
@SR["Location"]
</th>
<th>
@SR["Performer"]
</th>
<th>
@SR["ValidationDate"]
</th>
<th></th>
</tr>
@foreach (var item in Model) {
<tr>
<td>
@Html.DisplayFor(modelItem => item.DateCreated)
</td>
<td>
@Html.DisplayFor(modelItem => item.EventDate)
</td>
<td>
@Html.DisplayFor(modelItem => item.Location.Address)
</td>
<td>
@Html.DisplayFor(modelItem => item.PerformerProfile.Performer.UserName)
</td>
<td>
@Html.DisplayFor(modelItem => item.ValidationDate)
</td>
<td>
<a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
</td>
</tr>
}
</table>

View file

@ -0,0 +1,51 @@
@model IEnumerable<HairCutQuery>
@{
ViewData["Title"] = "Vos commandes en coiffure à domicile";
}
<h2>@ViewData["Title"]</h2>
<table class="table">
<tr>
<th>
@SR["DateCreated"]
</th>
<th>
@SR["EventDate"]
</th>
<th>
@SR["Location"]
</th>
<th>
@SR["Client"]
</th>
<th>
@SR["ValidationDate"]
</th>
<th></th>
</tr>
@foreach (var item in Model) {
<tr>
<td>
@Html.DisplayFor(modelItem => item.DateCreated)
</td>
<td>
@Html.DisplayFor(modelItem => item.EventDate)
</td>
<td>
@Html.DisplayFor(modelItem => item.Location.Address)
</td>
<td>
@Html.DisplayFor(modelItem => item.Client.UserName)
</td>
<td>
@Html.DisplayFor(modelItem => item.ValidationDate)
</td>
<td>
<a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
</td>
</tr>
}
</table>

View file

@ -114,6 +114,18 @@ Paul,
</environment>
<environment names="coiffure">
<markdown>
Vous êtes sur le site de commande en coiffure à domicile de Soraya Boudjouraf,
un as de la coiffure, qui oeuvre en région parisienne.
En validant un formulaire de commande ici, c'est à elle que vous notifiez votre demande.
Laissez lui votre numéro de téléphone, et des détails sur votre demande lors de votre premier contact,
elle vous rappelera si besoin.
</markdown>
</environment>
<environment names="Development">
<markdown>
## Ceci est un site de développement.

View file

@ -0,0 +1,10 @@
@Model BasketView
<ul>
<li>
<a asp-controller="HaircutCommand" asp-action="Index">
@Model.HairCutActiveQueryCount </a>
</li>
</ul>

View file

@ -71,3 +71,10 @@
}
</div>
}
@section ctxmenu {
@if ((bool)ViewData["HasHaircutCommand"]) {
<li><a asp-controller="HairCutCommand" class="badge" >
<img src="~/images/shoppingcart.svg" alt="basket" /></a></li>
}
}

View file

@ -0,0 +1,24 @@
@model HairCutQuery
<dl>
<dt>@Html.DisplayNameFor(m=>m.Prestation)
</dt>
<dd>@Html.DisplayFor(m=>m.Prestation)
</dd>
<dt>@Html.DisplayNameFor(m=>m.PerformerProfile)
</dt>
<dd>@Html.DisplayFor(m=>m.PerformerProfile)
</dd>
<dt>@Html.DisplayNameFor(m=>m.EventDate)
</dt>
<dd>@Html.DisplayFor(m=>m.EventDate)
</dd>
<dt>@Html.DisplayNameFor(m=>m.Location)
</dt>
<dd>@Html.DisplayFor(m=>m.Location)
</dd>
</dl>

View file

@ -0,0 +1,46 @@
@model HairPrestation
<dl class="dl-horizontal">
<dt>
@Html.DisplayNameFor(model => model.Cares)
</dt>
<dd>
@Html.DisplayFor(model => model.Cares)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Cut)
</dt>
<dd>
@Html.DisplayFor(model => model.Cut)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Dressing)
</dt>
<dd>
@Html.DisplayFor(model => model.Dressing)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Gender)
</dt>
<dd>
@Html.DisplayFor(model => model.Gender)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Length)
</dt>
<dd>
@Html.DisplayFor(model => model.Length)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Shampoo)
</dt>
<dd>
@Html.DisplayFor(model => model.Shampoo)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Tech)
</dt>
<dd>
@Html.DisplayFor(model => model.Tech)
</dd>
</dl>

View file

@ -60,27 +60,14 @@
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
@RenderSection("ctxmenu", required: false)
<li><a asp-controller="Blogspot" asp-action="Index" class="navbar-link">@SR["Blogs"]</a></li>
<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 class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Administration <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a asp-controller="Administration" asp-action="Index">Index</a></li>
<li><a asp-controller="Activity" asp-action="Index">Activités</a></li>
<li><a asp-controller="CommandForms" asp-action="Index">Formulaires</a></li>
<li><a asp-controller="Notifications" asp-action="Index">Notifications</a></li>
<li><a asp-controller="SIRENExceptions" asp-action="Index">Excéptions au numéro de SIREN</a></li>
</ul>
</li>
}
</ul>
@RenderSection("ctxmenu", required: false)
@await Html.PartialAsync("_LoginPartial")
</div>
</div>

View file

@ -2,19 +2,35 @@
@if (User.IsSignedIn())
{
<form asp-controller="Account" asp-action="LogOff" method="post" id="logoutForm" class="navbar-right">
<ul class="nav navbar-nav navbar-right">
<li>
<a asp-controller="Manage" class="navbar-link" asp-action="Index" title="Manage">
@Component.Invoke("Avatar", User.GetUserId(), ".xs")
@SR["Hello"] @User.GetUserName()!</a>
</li>
@if (User.IsInRole(Constants.AdminGroupName)) {
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Administration <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a asp-controller="Administration" asp-action="Index">Index</a></li>
<li><a asp-controller="Activity" asp-action="Index">Activités</a></li>
<li><a asp-controller="CommandForms" asp-action="Index">Formulaires</a></li>
<li><a asp-controller="Notifications" asp-action="Index">Notifications</a></li>
<li><a asp-controller="SIRENExceptions" asp-action="Index">Excéptions au numéro de SIREN</a></li>
</ul>
</li>}
<li>
<button type="submit" class="btn navbar-btn" >@SR["Logout"]</button>
<form asp-controller="Account" asp-action="LogOff"
method="post" id="logoutForm">
<button type="submit" class="btn navbar-btn" >@SR["Logout"]</button>
<input type="hidden" name="ReturnUrl" value="@Url.Action()" />
</form>
</li>
</ul>
</form>
}
else
{