Egalware/SHERPA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udpate vari

Browse Source
This commit is contained in:
Samuele Locatelli
2021-05-14 14:10:50 +02:00
parent a4397f91bd
commit ff757c15d5
10 changed files with 97 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SHERPA.BBM.UI/Pages/Baskets.razor
+2 -1
View File
@@ -7,6 +7,7 @@
@inject BBM_EFService BBMService
@inject BBM_SelectData SelectData
@inject NavigationManager NavManager
@inject MessageService MessageService
<div class="card">
<div class="card-header">
@@ -93,7 +94,7 @@
protected override async Task OnInitializedAsync()
{
SelectData.ShowSearch = true;
MessageService.ShowSearch = true;
baskets = await BBMService.BasketsGetAsync(numRecord);
}
SHERPA.BBM.UI/Pages/Customers.razor
+2 -1
View File
@@ -6,6 +6,7 @@
@inject BBM_SelectData SelectData
@inject IJSRuntime JSRuntime
@inject BBM_EFService BBMService
@inject MessageService MessageService
<div class="card">
<div class="card-header">
@@ -93,7 +94,7 @@
protected override async Task OnInitializedAsync()
{
SelectData.ShowSearch = true;
MessageService.ShowSearch = true;
await ReloadAllData();
}
SHERPA.BBM.UI/Pages/Docs.razor
+50 -47
View File
@@ -7,6 +7,7 @@
@inject BBM_EFService BBMService
@inject BBM_SelectData SelectData
@inject NavigationManager NavManager
@inject MessageService MessageService
<div class="card">
<div class="card-header">
@@ -25,7 +26,7 @@
<option value="0">--- Tutti ---</option>
@foreach (var item in basketList)
{
<option value="@item.BasketId">@item.CodBasket | @item.Descript</option>
<option value="@item.BasketId">@item.CodBasket | @item.Descript</option>
}
</select>
</div>
@@ -41,7 +42,7 @@
<option value="0">--- Tutti ---</option>
@foreach (var item in negotiationList)
{
<option value="@item.NegotiationId">@item.CodNegotiation | @item.Descript</option>
<option value="@item.NegotiationId">@item.CodNegotiation | @item.Descript</option>
}
</select>
</div>
@@ -60,57 +61,59 @@
<div class="card-body">
@if (currItem != null)
{
<DocsEditor currItem="@currItem" DataReset="ResetData" DataUpdated="UpdateData"></DocsEditor>
<DocsEditor currItem="@currItem" DataReset="ResetData" DataUpdated="UpdateData"></DocsEditor>
}
@if (itemsList == null)
{
<p><em>Loading...</em></p>
<p><em>Loading...</em></p>
}
else
{
<table class="table table-sm table-striped">
<thead>
<tr>
<th></th>
<th>Attivo</th>
<th>Tipo</th>
<th>Cod</th>
<th>Descrizione</th>
<th class="text-right">Importo</th>
<th class="text-right">Fatturazione</th>
<th class="text-right"></th>
</tr>
</thead>
<tbody>
@foreach (var record in itemsList)
<table class="table table-sm table-striped">
<thead>
<tr>
<th></th>
<th>Attivo</th>
<th>Tipo</th>
<th>Cod</th>
<th>Descrizione</th>
<th class="text-right">Importo</th>
<th class="text-right">Fatturazione</th>
<th class="text-right"></th>
</tr>
</thead>
<tbody>
@foreach (var record in itemsList)
{
<tr class="@checkSelect(@record.DocId)">
<td><button class="btn btn-sm btn-info" @onclick="() => Edit(record)"><span class="oi oi-pencil"></span></button>&nbsp;<button class="btn btn-sm btn-warning" @onclick="() => NewRelease(record)" title="Clona"><span class="oi oi-fork"></span></button>&nbsp;<button class="btn btn-sm btn-success" @onclick="() => ShowResources(record)" title="Vai al dettaglio Risorse"><span class="oi oi-puzzle-piece"></span></button>&nbsp;<button class="btn btn-sm btn-primary" @onclick="() => ShowBills(record)" title="Vai al dettaglio Fatture"><span class="oi oi-envelope-open"></span></button></td>
<td>
<button class="btn btn-sm @btnFromState(record.IsActive)" @onclick="() => SetActive(record)" title="@tooltipFromState(record.IsActive)" disabled=@record.IsActive>
<span class="oi oi-power-standby"></span>
</button>
@*<input type="checkbox" value="@record.IsActive" @onclick="() => SetActive(record)" />*@
</td>
<td>@record.DocType</td>
<td>
<div>@record.CodDoc</div>
<div class="small">@record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")</div>
</td>
<td>
<div>@record.Descript</div>
<div class="small">@record.Note</div>
</td>
<td class="text-right"><b>@getGrandTot(@record.DocId).Result.ToString("C2")</b></td>
<td class="text-right">
<div><b>@getFatturato(@record.DocId).Result.ToString("C2")</b></div>
<div class="small">@getIncassato(@record.DocId).Result.ToString("C2")</div>
</td>
<td class="text-right"><button class="btn btn-sm btn-danger" @onclick="() => Delete(record)"><span class="oi oi-trash"></span></button></td>
</tr>
<tr class="@checkSelect(@record.DocId)">
<td><button class="btn btn-sm btn-info" @onclick="() => Edit(record)"><span class="oi oi-pencil"></span></button>&nbsp;<button class="btn btn-sm btn-warning" @onclick="() => NewRelease(record)" title="Clona"><span class="oi oi-fork"></span></button>&nbsp;<button class="btn btn-sm btn-success" @onclick="() => ShowResources(record)" title="Vai al dettaglio Risorse"><span class="oi oi-puzzle-piece"></span></button>&nbsp;<button class="btn btn-sm btn-primary" @onclick="() => ShowBills(record)" title="Vai al dettaglio Fatture"><span class="oi oi-envelope-open"></span></button></td>
<td>
<button class="btn btn-sm @btnFromState(record.IsActive)" @onclick="() => SetActive(record)" title="@tooltipFromState(record.IsActive)" disabled=@record.IsActive>
<span class="oi oi-power-standby"></span>
</button>
@*<input type="checkbox" value="@record.IsActive" @onclick="() => SetActive(record)" />*@
</td>
<td>@record.DocType</td>
<td>
<div>@record.CodDoc</div>
<div class="small">@record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")</div>
</td>
<td>
<div>@record.Descript</div>
<div class="small">@record.Note</div>
</td>
<td class="text-right" title="Importo"><b>@getGrandTot(@record.DocId).Result.ToString("C2")</b></td>
<td class="text-right">
@*<i class="fas fa-cash-register"></i>
<i class="far fa-money-bill-alt"></i>*@
<div title="Fatturato"><b>@getFatturato(@record.DocId).Result.ToString("C2")</b> [F]</div>
<div title="Incassato" class="small">@getIncassato(@record.DocId).Result.ToString("C2") [I]</div>
</td>
<td class="text-right"><button class="btn btn-sm btn-danger" @onclick="() => Delete(record)"><span class="oi oi-trash"></span></button></td>
</tr>
}
</tbody>
</table>
</tbody>
</table>
}
</div>
<div class="card-footer py-1">
@@ -132,7 +135,7 @@
if (currItem != null)
{
try
{
{
answ = (currItem.DocId == DocId) ? "table-info" : "";
}
catch
@@ -256,7 +259,7 @@
protected override async Task OnInitializedAsync()
{
SelectData.ShowSearch = true;
MessageService.ShowSearch = true;
await ReloadAllData();
}
SHERPA.BBM.UI/Pages/Index.razor
+5 -2
View File
@@ -4,6 +4,7 @@
@using SHERPA.BBM.UI.Components
@using SHERPA.BBM.UI.Data
@inject BBM_SelectData SelectData
@inject MessageService MessageService
<div class="jumbotron">
<div class="row">
@@ -81,8 +82,10 @@
bool alertVisible = true;
bool infoVisible = true;
protected override async Task OnInitializedAsync()
protected override Task OnInitializedAsync()
{
SelectData.ShowSearch = false;
MessageService.ShowSearch = false;
return base.OnInitializedAsync();
}
}
SHERPA.BBM.UI/Pages/Negotiations.razor
+26 -11
View File
@@ -44,11 +44,8 @@
<tr>
<th></th>
<th>Cod</th>
<th>Data ins</th>
<th>Descript</th>
<th>Cliente</th>
<th>Path</th>
<th>Refer</th>
<th>Descrizione</th>
<th></th>
</tr>
</thead>
@@ -57,12 +54,30 @@
{
<tr class="@checkSelect(@record.NegotiationId)">
<td><button class="btn btn-sm btn-info" @onclick="() => Edit(record)"><span class="oi oi-pencil"></span></button>&nbsp;<button class="btn btn-sm btn-success" @onclick="() => ShowDocs(record)" title="Vai ai documenti"><span class="oi oi-document"></span></button></td>
<td>@record.CodNegotiation</td>
<td>@record.DataIns</td>
<td>@record.Descript</td>
<td>@record.Customer.RagSoc | @record.Customer.PI | @record.Customer.Descript</td>
<td>@record.BasePath</td>
<td>@record.Refer</td>
<td>
<div>
@record.CodNegotiation
</div>
<div class="small">
@record.DataIns
</div>
</td>
<td>
<div>
@record.Customer.RagSoc | @record.Customer.Descript
</div>
<div class="small">
@record.Refer
</div>
</td>
<td>
<div>
@record.Descript
</div>
<div class="small">
@record.BasePath
</div>
</td>
<td><button class="btn btn-sm btn-danger" @onclick="() => Delete(record)"><span class="oi oi-trash"></span></button></td>
</tr>
}
@@ -112,7 +127,7 @@
protected void CreateNew()
{
// recupero counter
string newCode = BBMService.CounterGetNext($"{SelectData.Company}.{DateTime.Today.Year}", 6);
string newCode = BBMService.CounterGetNext($"{SelectData.Company}.N.{DateTime.Today.Year}", 6);
DatabaseModels.NegotiationsModel newRecord = new DatabaseModels.NegotiationsModel()
{
CodNegotiation = newCode,
SHERPA.BBM.UI/Pages/Utility.razor
+7 -1
View File
@@ -1,6 +1,8 @@
@page "/utility"
@using SHERPA.BBM.UI.Components
@using SHERPA.BBM.UI.Data
@inject MessageService MessageService
<div class="card">
<div class="card-header">
@@ -27,5 +29,9 @@
</div>
@code {
protected override Task OnInitializedAsync()
{
MessageService.ShowSearch = false;
return base.OnInitializedAsync();
}
}
SHERPA.BBM.UI/Startup.cs
+1
View File
@@ -92,6 +92,7 @@ namespace SHERPA.BBM.UI
services.AddServerSideBlazor();
services.AddSingleton<BBM_EFService>();
services.AddScoped<BBM_SelectData>();
services.AddScoped<MessageService>();
}
#endregion Public Methods
SHERPA.BBM/Controllers/BBMController.cs
+1
View File
@@ -842,6 +842,7 @@ namespace SHERPA.BBM.Controllers
}
dbResult = dbCtx
.DbSetNegotiations
.Where(x => x.NegotiationId > 1)
.OrderByDescending(x => x.CodNegotiation)
.OrderByDescending(x => x.DataIns)
.Take(numRecord)
SHERPA.BBM/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
// usando l'asterisco '*' come illustrato di seguito:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("0.0.0.0")]
VersGen/VersGen.cs
+1 -1
View File
@@ -6,5 +6,5 @@ using System.Reflection;
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("0.0.0.0")]
[assembly: AssemblyCopyright("Steamware © 2006-2020")]
[assembly: AssemblyCopyright("Steamware © 2006-2021")]
[assembly: AssemblyCompany("Steamware")]