fix grafico
This commit is contained in:
zaccaria.majid
@@ -1,6 +1,6 @@
|
||||
<body>
|
||||
<i>WebDoorCreator - Egalware</i>
|
||||
<h4>Version: 0.9.2306.2908</h4>
|
||||
<h4>Version: 0.9.2306.2909</h4>
|
||||
<br /> Release note:
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
@@ -1 +1 @@
|
||||
0.9.2306.2908
|
||||
0.9.2306.2909
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<item>
|
||||
<version>0.9.2306.2908</version>
|
||||
<version>0.9.2306.2909</version>
|
||||
<url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
|
||||
<changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
|
||||
<mandatory>false</mandatory>
|
||||
|
||||
@@ -10,9 +10,12 @@ else
|
||||
<td></td>
|
||||
<th>Order Code <Sorter ParamName="OrderNumber" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
|
||||
<th>Created <Sorter ParamName="DateIns" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
|
||||
<th>Confirmed <Sorter ParamName="DateOrd" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
|
||||
<th>Promised <Sorter ParamName="DateProm" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
|
||||
<th>Delivery <Sorter ParamName="DateDelivery" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
|
||||
@if (!isTplPage)
|
||||
{
|
||||
<th>Confirmed <Sorter ParamName="DateOrd" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
|
||||
<th>Promised <Sorter ParamName="DateProm" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
|
||||
<th>Delivery <Sorter ParamName="DateDelivery" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
|
||||
}
|
||||
<AuthorizeView Roles="SuperAdmin, DcaAdmin, DcaOrdMan, DcaProj" Context="BackOffice">
|
||||
<Authorized>
|
||||
<th>Company</th>
|
||||
@@ -41,30 +44,30 @@ else
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-primary me-1" @onclick="()=>setOrd2Show(item.OrderId)" title="Order detail"><i class="fa-solid fa-magnifying-glass"></i></button>
|
||||
<AuthorizeView Roles="SuperAdmin, DcaAdmin, DcaOrdMan, DcaProj" Context="OrderEdit">
|
||||
<Authorized>
|
||||
@if (item.OrderStatus < 30 || WDCUService.userRole == "DcaAdmin" || WDCUService.userRole == "SuperAdmin")
|
||||
{
|
||||
<button class="btn btn-sm btn-primary me-1" @onclick="()=>editOrder(item)" title="Edit Order"><i class="fa-solid fa-pen"></i></button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-secondary me-1" title="Edit Order" disabled><i class="fa-solid fa-pen"></i></button>
|
||||
}
|
||||
</Authorized>
|
||||
<NotAuthorized>
|
||||
@if (item.OrderStatus < 20)
|
||||
{
|
||||
<button class="btn btn-sm btn-primary me-1" @onclick="()=>editOrder(item)" title="Edit Order"><i class="fa-solid fa-pen"></i></button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-secondary me-1" title="Edit Order" disabled><i class="fa-solid fa-pen"></i></button>
|
||||
}
|
||||
</NotAuthorized>
|
||||
</AuthorizeView>
|
||||
@if (!isTplPage)
|
||||
{
|
||||
<AuthorizeView Roles="SuperAdmin, DcaAdmin, DcaOrdMan, DcaProj" Context="OrderEdit">
|
||||
<Authorized>
|
||||
@if (item.OrderStatus < 30)
|
||||
{
|
||||
<button class="btn btn-sm btn-primary me-1" @onclick="()=>editOrder(item)" title="Edit Order"><i class="fa-solid fa-pen"></i></button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-secondary me-1" title="Edit Order" disabled><i class="fa-solid fa-pen"></i></button>
|
||||
}
|
||||
</Authorized>
|
||||
<NotAuthorized>
|
||||
@if (item.OrderStatus < 20)
|
||||
{
|
||||
<button class="btn btn-sm btn-primary me-1" @onclick="()=>editOrder(item)" title="Edit Order"><i class="fa-solid fa-pen"></i></button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-secondary me-1" title="Edit Order" disabled><i class="fa-solid fa-pen"></i></button>
|
||||
}
|
||||
</NotAuthorized>
|
||||
</AuthorizeView>
|
||||
<button class="btn btn-sm btn-primary" @onclick="()=>cloneAndShow(item.OrderId)" title="Duplicate Order"><i class="fa-solid fa-clone"></i></button>
|
||||
<a class="btn btn-sm btn-info" target="_blank" href="@reportUrl(item.OrderId)" title="Download pdf report"><i class="fa-regular fa-file-pdf"></i></a>
|
||||
}
|
||||
@@ -73,7 +76,7 @@ else
|
||||
<td class="small">
|
||||
@if (isEdit && item.OrderId == currOrderId)
|
||||
{
|
||||
@if (item.OrderStatus < 20)
|
||||
@if (item.OrderStatus < 20 || WDCUService.userRole == "DcaAdmin" || WDCUService.userRole == "SuperAdmin")
|
||||
{
|
||||
<div class="input-group input-group-sm">
|
||||
<span class="input-group-text">Cod</span>
|
||||
@@ -97,51 +100,56 @@ else
|
||||
<div class="small">@item.OrderDescript</div>
|
||||
}
|
||||
</td>
|
||||
<td class="small">
|
||||
<span>@($"{item.DateIns:yyyy-MM-dd}")</span>
|
||||
</td>
|
||||
<td class="small">
|
||||
@if (item.DateOrd > dateLimit)
|
||||
{
|
||||
<span class="fw-bold">@($"{item.DateOrd:yyyy-MM-dd}")</span>
|
||||
}
|
||||
</td>
|
||||
<td class="small">
|
||||
@if (item.OrderStatus == 20 && isEdit && item.OrderId == currOrderId)
|
||||
{
|
||||
<div class="input-group input-group-sm">
|
||||
<span class="input-group-text">Promise</span>
|
||||
<input type="date" class="form-control" placeholder="Order's Descript" aria-label="Order's Descript" @bind="@item.DateProm">
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
@if (item.DateProm > dateLimit)
|
||||
<td class="small">
|
||||
<span>@($"{item.DateIns:yyyy-MM-dd}")</span>
|
||||
</td>
|
||||
|
||||
@if (!isTplPage)
|
||||
{
|
||||
<td class="small">
|
||||
@if (item.DateOrd > dateLimit)
|
||||
{
|
||||
<span class="fw-bold">@($"{item.DateProm:yyyy-MM-dd}")</span>
|
||||
<span class="fw-bold">@($"{item.DateOrd:yyyy-MM-dd}")</span>
|
||||
}
|
||||
}
|
||||
</td>
|
||||
<td class="small">
|
||||
@if (item.DateDelivery > dateLimit)
|
||||
{
|
||||
if (item.DateDelivery <= item.DateProm)
|
||||
</td>
|
||||
<td class="small">
|
||||
@if (item.OrderStatus == 20 && isEdit && item.OrderId == currOrderId)
|
||||
{
|
||||
<span class="fw-bold text-success">@($"{item.DateDelivery:yyyy-MM-dd}")</span>
|
||||
<div class="input-group input-group-sm">
|
||||
<span class="input-group-text">Promise</span>
|
||||
<input type="date" class="form-control" placeholder="Order's Descript" aria-label="Order's Descript" @bind="@item.DateProm">
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span class="fw-bold text-danger">@($"{item.DateDelivery:yyyy-MM-dd}")</span>
|
||||
@if (item.DateProm > dateLimit)
|
||||
{
|
||||
<span class="fw-bold">@($"{item.DateProm:yyyy-MM-dd}")</span>
|
||||
}
|
||||
}
|
||||
}
|
||||
</td>
|
||||
</td>
|
||||
<td class="small">
|
||||
@if (item.DateDelivery > dateLimit)
|
||||
{
|
||||
if (item.DateDelivery <= item.DateProm)
|
||||
{
|
||||
<span class="fw-bold text-success">@($"{item.DateDelivery:yyyy-MM-dd}")</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span class="fw-bold text-danger">@($"{item.DateDelivery:yyyy-MM-dd}")</span>
|
||||
}
|
||||
}
|
||||
</td>
|
||||
|
||||
}
|
||||
<AuthorizeView Roles="SuperAdmin, DcaAdmin, DcaOrdMan, DcaProj" Context="BackOffice">
|
||||
<Authorized>
|
||||
<td class="small">@(GetCompany(item.CompanyId))</td>
|
||||
</Authorized>
|
||||
</AuthorizeView>
|
||||
<td class="text-end">@item.NumDoors</td>
|
||||
<td class="text-center">@item.NumType</td>
|
||||
<td class="text-end">@item.NumType</td>
|
||||
@if (!isTplPage)
|
||||
{
|
||||
<td class="text-end">
|
||||
|
||||
@@ -169,20 +169,20 @@
|
||||
@if (currDoor.ParentId != 1)
|
||||
{
|
||||
<div class="px-3">
|
||||
<div>Door Type:</div>
|
||||
<div>Type:</div>
|
||||
<div class=" fw-bold">@currDoor.ParentId</div>
|
||||
</div>
|
||||
}
|
||||
<div class="px-3">
|
||||
<div>Door description:</div>
|
||||
<div>Description:</div>
|
||||
<div class=" fw-bold">@currDoor.DoorDescript</div>
|
||||
</div>
|
||||
<div class="px-3">
|
||||
<div>Door Unit cost:</div>
|
||||
<div>Unit cost:</div>
|
||||
<div class=" fw-bold">@($"{currDoor.UnitCost:C2}")</div>
|
||||
</div>
|
||||
<div class="px-3">
|
||||
<div>Door quantity:</div>
|
||||
<div>Quantity:</div>
|
||||
<div class=" fw-bold">@currDoor.Quantity</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<Version>0.9.2306.2908</Version>
|
||||
<Version>0.9.2306.2909</Version>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
|
||||
</PropertyGroup>
|
||||
|
||||
Reference in New Issue
Block a user