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

Merge branch 'develop' of https://gitlab.steamware.net/etis/lux into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2026-06-04 16:09:57 +02:00
parent 1f8418e724 b3d08f012d
commit dd36901d88
13 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Lux.UI/Components/Compo/Config/GlassMan.razor
+9 -7
View File
@@ -1,8 +1,10 @@
<div class="card shadow">
@inherits BaseComp
<div class="card shadow">
<div class="card-header text-bg-secondary">
<div class="d-flex justify-content-between">
<div class="px-0">
<h5>Tipologie di Vetro</h5>
<h5>@Traduci("config_tipiVetro")</h5>
</div>
<div class="px-0">
<div class="px-0 d-flex justify-content-between">
@@ -17,7 +19,7 @@
</div>
</div>
<div class="row small px-2">
NB: le configurazioni sono modificabili
@Traduci("config_modificabile")
</div>
</div>
<div class="card-body p-1">
@@ -27,7 +29,7 @@
}
else if (totalCount == 0)
{
<div class="alert alert-info text-center display-6">Nessun record trovato</div>
<div class="alert alert-info text-center display-6">@Traduci("noRecord")</div>
}
else
{
@@ -38,9 +40,9 @@
<button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button>
</th>
@* <th>ID</th> *@
<th class="col-1 text-nowrap">Cod.</th>
<th class="col-7">Descrizione</th>
<th class="col-2 text-nowrap text-center">Size mm</th>
<th class="col-1 text-nowrap">@Traduci("cod")</th>
<th class="col-7">@Traduci("descrizione")</th>
<th class="col-2 text-nowrap text-center">@Traduci("config_spessore")</th>
<th class="col-1 text-nowrap text-end">
<button class="btn btn-sm btn-success" @onclick="DoAdd"><i class="fa-solid fa-plus"></i></button>
</th>
Lux.UI/Components/Compo/Config/HardwareMan.razor
+10 -8
View File
@@ -1,9 +1,11 @@
<div class="card shadow">
@inherits BaseComp
<div class="card shadow">
<div class="card-header text-bg-secondary">
<div class="d-flex justify-content-between">
<div class="px-0 d-flex">
<div class="px-0">
<h5>Tipologie di Hardware</h5>
<h5>@Traduci("config_tipiHardware")</h5>
</div>
<div class="px-2">
<button class="btn btn-sm btn-primary" title="Richiesta Update" @onclick="DoReqUpdate"><i class="fa-solid fa-arrow-rotate-right"></i></button>
@@ -22,7 +24,7 @@
</div>
</div>
<div class="row small px-2">
NB: le configurazioni sono ricevute dal sistema CAD/CAM di calcolo
@Traduci("config_noModificabile")
</div>
</div>
<div class="card-body p-1">
@@ -32,7 +34,7 @@
}
else if (totalCount == 0)
{
<div class="alert alert-info text-center display-6">Nessun record trovato</div>
<div class="alert alert-info text-center display-6">@Traduci("noRecord")</div>
}
else
{
@@ -40,11 +42,11 @@
<thead>
<tr>
<th class="text-nowrap col-1">
Cod.
@Traduci("cod")
</th>
<th class="text-nowrap col-2">Famiglia</th>
<th class="col-7">Descrizione</th>
<th class="text-end col-2">Shape</th>
<th class="text-nowrap col-2">@Traduci("config_famiglia")</th>
<th class="col-7">@Traduci("descrizione")</th>
<th class="text-end col-2">@Traduci("config_forma")</th>
</tr>
</thead>
<tbody>
Lux.UI/Components/Compo/Config/ProfDataDetail.razor
+7 -5
View File
@@ -1,8 +1,10 @@
<div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
@inherits BaseComp
<div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header text-bg-info bg-gradient bg-opacity-50">
<h5 class="modal-title fs-4">Dizionario Parametri</h5>
<h5 class="modal-title fs-4">@Traduci("config_parametri")</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" @onclick="DoClose"></button>
</div>
<div class="modal-body">
@@ -12,15 +14,15 @@
}
else if (ListRecords == null || totalCount == 0)
{
<div class="alert alert-warning fs-4">Nessun record trovato</div>
<div class="alert alert-warning fs-4">@Traduci("noRecord")</div>
}
else
{
<table class="table table-sm table-striped">
<thead>
<tr>
<th class="text-nowrap">Name</th>
<th class="text-nowrap">Value</th>
<th class="text-nowrap">@Traduci("nome")</th>
<th class="text-nowrap">@Traduci("valore")</th>
</tr>
</thead>
<tbody>
Lux.UI/Components/Compo/Config/ProfThreshDetail.razor
+7 -5
View File
@@ -1,7 +1,9 @@
<div class="card shadow my-4">
@inherits BaseComp
<div class="card shadow my-4">
<div class="card-header text-bg-info bg-gradient bg-opacity-50">
<div class="d-flex justify-content-between align-items-center">
<h5 class="fs-4">Dettaglio Soglie</h5>
<h5 class="fs-4">@Traduci("config_dettSoglie")</h5>
<button type="button" class="btn-close" @onclick="DoClose"></button>
</div>
</div>
@@ -12,15 +14,15 @@
}
else if (ListRecords == null || totalCount == 0)
{
<div class="alert alert-warning fs-4">Nessun record trovato</div>
<div class="alert alert-warning fs-4">@Traduci("noRecord")</div>
}
else
{
<table class="table table-sm table-striped">
<thead>
<tr>
<th class="col-2 px-3 text-left text-nowrap">Type</th>
<th class="text-lef text-nowrap">Name</th>
<th class="col-2 px-3 text-left text-nowrap">@Traduci("tipo")</th>
<th class="text-lef text-nowrap">@Traduci("nome")</th>
</tr>
</thead>
<tbody>
Lux.UI/Components/Compo/Config/ProfileMan.razor
+12 -10
View File
@@ -1,15 +1,17 @@
<div class="card shadow">
@inherits BaseComp
<div class="card shadow">
<div class="card-header text-bg-secondary">
<div class="d-flex justify-content-between">
<div class="px-0 d-flex">
<div class="px-0">
<h5>Tipi di Profili</h5>
<h5>@Traduci("config_tipiProfilo")</h5>
</div>
<div class="px-2">
<button class="btn btn-sm btn-primary" title="Richiesta Update Profili" @onclick="DoReqUpdate">Profili <i class="fa-solid fa-arrow-rotate-right"></i></button>
<button class="btn btn-sm btn-primary" title="Richiesta Update Profili" @onclick="DoReqUpdate">@Traduci("profilo") <i class="fa-solid fa-arrow-rotate-right"></i></button>
</div>
<div class="px-2">
<button class="btn btn-sm @cssBtnThresh" title="Richiesta Update Soglie Profili" @onclick="DoReqUpdateThresh">Soglie <i class="fa-solid fa-arrow-rotate-right"></i></button>
<button class="btn btn-sm @cssBtnThresh" title="Richiesta Update Soglie Profili" @onclick="DoReqUpdateThresh">@Traduci("config_soglie") <i class="fa-solid fa-arrow-rotate-right"></i></button>
</div>
</div>
<div class="px-0">
@@ -25,7 +27,7 @@
</div>
</div>
<div class="row small px-2">
NB: le configurazioni sono ricevute dal sistema CAD/CAM di calcolo
@Traduci("config_noModificabile")
</div>
</div>
<div class="card-body p-1">
@@ -35,7 +37,7 @@
}
else if (totalCount == 0)
{
<div class="alert alert-info text-center display-6">Nessun record trovato</div>
<div class="alert alert-info text-center display-6">@Traduci("noRecord")</div>
}
else
{
@@ -45,10 +47,10 @@
<th class="text-nowrap text-center">
<button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button>
</th>
<th class="text-nowrap">Cod.</th>
<th class="text-nowrap">Descr.</th>
<th class="text-nowrap text-end">Threshold</th>
<th class="text-nowrap text-end">Data</th>
<th class="text-nowrap">@Traduci("cod")</th>
<th class="text-nowrap">@Traduci("descrizione")</th>
<th class="text-nowrap text-end">@Traduci("config_soglie")</th>
<th class="text-nowrap text-end">@Traduci("data")</th>
<th></th>
</tr>
</thead>
Lux.UI/Components/Compo/Config/WoodMan.razor
+9 -7
View File
@@ -1,8 +1,10 @@
<div class="card shadow">
@inherits BaseComp
<div class="card shadow">
<div class="card-header text-bg-secondary">
<div class="d-flex justify-content-between">
<div class="px-0">
<h5>Tipologie di Legno</h5>
<h5>@Traduci("config_tipiLegno")</h5>
</div>
<div class="px-0">
<div class="px-0 d-flex justify-content-between">
@@ -17,7 +19,7 @@
</div>
</div>
<div class="row small px-2">
NB: le configurazioni sono modificabili
@Traduci("config_modificabile")
</div>
</div>
<div class="card-body p-1">
@@ -27,7 +29,7 @@
}
else if (totalCount == 0)
{
<div class="alert alert-info text-center display-6">Nessun record trovato</div>
<div class="alert alert-info text-center display-6">@Traduci("noRecord")</div>
}
else
{
@@ -38,9 +40,9 @@
<button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button>
</th>
@* <th>ID</th> *@
<th class="col-1 text-nowrap">Cod.</th>
<th class="col-8">Descrizione</th>
<th class="col-1 text-nowrap text-center">Tipo</th>
<th class="col-1 text-nowrap">@Traduci("cod")</th>
<th class="col-8">@Traduci("descrizione")</th>
<th class="col-1 text-nowrap text-center">@Traduci("tipo")</th>
<th class="col-1 text-nowrap text-end">
<button class="btn btn-sm btn-success" @onclick="DoAdd"><i class="fa-solid fa-plus"></i></button>
</th>
Lux.UI/Components/Compo/Item/DataFilter.razor
+1 -1
View File
@@ -19,7 +19,7 @@
<option value="@item.CodGroup">@item.Description</option>
}
</select>
<span class="input-group-text">@Traduci("articoli_tipo")</span>
<span class="input-group-text">@Traduci("tipo")</span>
<select @bind="@SelType" class="form-select">
@foreach (var sType in Enum.GetValues(typeof(EgwCoreLib.Lux.Core.Enums.ItemClassType)))
{
Lux.UI/Components/Compo/Item/ItemEdit.razor
+1 -1
View File
@@ -24,7 +24,7 @@
<option value="@sType">@sType</option>
}
</select>
<label class="small bg-opacity-50">@Traduci("articoli_tipo")</label>
<label class="small bg-opacity-50">@Traduci("tipo")</label>
</div>
</div><div class="col-md-1">
<div class="form-floating">
Lux.UI/Components/Compo/Item/ItemMan.razor
+1 -1
View File
@@ -18,7 +18,7 @@ else
</th>
<th>@Traduci("id")</th>
<th>@Traduci("gruppo")</th>
<th>@Traduci("articoli_tipo")</th>
<th>@Traduci("tipo")</th>
<th>@Traduci("articoli_servizio")</th>
<th>@Traduci("codice")</th>
<th>@Traduci("articoli_itemCode")</th>
Lux.UI/Components/Compo/Offer/OfferCommonPar.razor
+1 -1
View File
@@ -16,7 +16,7 @@
<option value="@item">@item</option>
}
</select>
<label class="small">@Traduci("offerta_profilo")</label>
<label class="small">@Traduci("profilo")</label>
</div>
@if (ForceMode && !string.IsNullOrEmpty(@SelProfile))
{
Lux.UI/Components/Compo/Offer/OfferRowMan.razor
+1 -1
View File
@@ -110,7 +110,7 @@ else
}
<th>@Traduci("codice")</th>
<th>@Traduci("descrizione")</th>
<th class="text-end" title="Quantità Articoli">@Traduci("quantita") <i class="fa-regular fa-file-lines"></i></th>
<th class="text-end" title="Quantità Articoli">@Traduci("qty") <i class="fa-regular fa-file-lines"></i></th>
<th class="text-end">@Traduci("importo")</th>
@if (DisplayMode == DisplayMode.Edit)
{
Lux.UI/Components/Layout/NavMenu.razor
+1 -1
View File
@@ -32,7 +32,7 @@
</NavLink>
</div>
<GroupElem NameList="@(NameDict.GetValueOrDefault("Articoli"))" PageList="@(PageDict.GetValueOrDefault("Articoli"))" IconList="@(IconDict.GetValueOrDefault("Articoli"))" ShowText="@(showText)"></GroupElem>
<GroupElem NameList="@(NameDict.GetValueOrDefault("Ciclo prod"))" PageList="@(PageDict.GetValueOrDefault("Ciclo prod"))" IconList="@(IconDict.GetValueOrDefault("Ciclo prod"))" ShowText="@(showText)"></GroupElem>
<GroupElem NameList="@(NameDict.GetValueOrDefault("CicloProd"))" PageList="@(PageDict.GetValueOrDefault("CicloProd"))" IconList="@(IconDict.GetValueOrDefault("CicloProd"))" ShowText="@(showText)"></GroupElem>
<GroupElem NameList="@(NameDict.GetValueOrDefault("Contatti"))" PageList="@(PageDict.GetValueOrDefault("Contatti"))" IconList="@(IconDict.GetValueOrDefault("Contatti"))" ShowText="@(showText)"></GroupElem>
<div class="nav-item px-3">
<NavLink class="nav-link" href="Template">
Lux.UI/Components/Layout/NavMenu.razor.cs
+3 -3
View File
@@ -85,17 +85,17 @@ namespace Lux.UI.Components.Layout
{
// Inserimento nomi segnaposto nav-item
NameDict.Add("Articoli", new List<string>() { "articoli", "artAcquisto", "artVendita" });
NameDict.Add("Ciclo prod", new List<string>() { "cicloProd", "risorse", "cicli" });
NameDict.Add("CicloProd", new List<string>() { "cicloProd", "risorse", "cicli" });
NameDict.Add("Contatti", new List<string>() { "contatti", "clienti", "venditori" });
// Inserimento icone
IconDict.Add("Articoli", new List<string>() { "fa-book-open", "fa-book", "fa-book-bookmark" });
IconDict.Add("Ciclo prod", new List<string>() { "fa-industry", "fa-location-dot", "fa-route" });
IconDict.Add("CicloProd", new List<string>() { "fa-industry", "fa-location-dot", "fa-route" });
IconDict.Add("Contatti", new List<string>() { "fa-address-book", "fa-users", "fa-stamp" });
// Inserimento reindirizzamento elementi sotto menu
PageDict.Add("Articoli", new List<string>() { "Items", "SellItems" });
PageDict.Add("Ciclo prod", new List<string>() { "Resources", "JobRoute" });
PageDict.Add("CicloProd", new List<string>() { "Resources", "JobRoute" });
PageDict.Add("Contatti", new List<string>() { "Customer", "Dealer" });
}