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

- Aggiunte traduzioni

Browse Source 
- Modificato filtro envir in carico macchine
This commit is contained in:
Annamaria Sassi
2026-06-08 13:03:02 +02:00
parent 91133789e7
commit 01b7c2c7de
15 changed files with 93 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Lux.API/Lux.API.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>1.1.2606.0810</Version>
<Version>1.1.2606.0812</Version>
</PropertyGroup>
<ItemGroup>
Lux.UI/Components/Compo/Common/PrintModal.razor
+22 -9
View File
@@ -22,7 +22,7 @@
<div class="input-group">
<label class="input-group-text">@Traduci("gruppo")</label>
<select class="form-select" @bind="SelectCodGroup">
<option value="" selected>--- Tutti ---</option>
<option value="" selected>--- @Traduci("tutti") ---</option>
@foreach(var group in listGroup)
{
<option value="@group">@group</option>
@@ -32,16 +32,29 @@
</div>
</div>
}
<div class="row">
@foreach (var item in ListRepFiles)
{
<div class="col text-center">
<a href="@(DoPrint(item))" target="_blank" class="btn btn-primary w-100 m-1">
@Descrizione(item)
@if (!string.IsNullOrEmpty(SelectCodGroup))
{
<div class="row">
<div class="d-flex col-4 align-items-center text-center">
<a href="@(DoPrint("MaterialReqOrd_01"))" target="_blank" class="btn btn-primary m-1">
Lista materiale selezionato
</a>
</div>
}
</div>
</div>
}
else
{
<div class="row">
@foreach (var item in ListRepFiles)
{
<div class="col text-center">
<a href="@(DoPrint(item))" target="_blank" class="btn btn-primary w-100 m-1">
@Descrizione(item)
</a>
</div>
}
</div>
}
}
</div>
</div>
Lux.UI/Components/Compo/Item/SellingItemMan.razor
+1 -1
View File
@@ -40,7 +40,7 @@ else
{
<tr class="@checkSel(item)">
<td class="text-start text-nowrap">
<button class="btn btn-sm btn-primary" @onclick="() => DoSelect(item)"><i class="fa-solid fa-magnifying-glass"></i></button>
@* <button class="btn btn-sm btn-primary" @onclick="() => DoSelect(item)"><i class="fa-solid fa-magnifying-glass"></i></button> *@
<button class="btn btn-sm btn-info" @onclick="() => DoEdit(item)"><i class="fa-solid fa-pencil"></i></button>
@* <button class="btn btn-sm @doCloneCss(item)" @onclick="() => DoClone(item)"><i class="fa-solid fa-clone"></i></button> *@
</td>
Lux.UI/Components/Compo/Offer/AddFromTemplate.razor
+12 -9
View File
@@ -3,14 +3,14 @@
<div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header py-1">
<div class="modal-header py-2">
<div class="row w-100 align-items-center">
<div class="col-4 fs-4">
@Traduci("offerta_selezProd")
</div>
<div class="col-4">
<select @bind="@SelTemplateID" class="form-select">
<option value="0">--- Selezionare Catalogo ---</option>
<option value="0">--- @Traduci("offerta_selezCatalogo") ---</option>
@foreach (var itemAlt in ListCataloghi)
{
<option value="@itemAlt.TemplateID">@itemAlt.Name | @itemAlt.Description</option>
@@ -23,7 +23,7 @@
</div>
</div>
</div>
<div class="modal-body pt-0 pb-2">
<div class="modal-body py-2">
@if (SelTemplateID == 0)
{
<div class="alert alert-info fs-4">@Traduci("offerta_selezCatalogo")!</div>
@@ -36,12 +36,12 @@
<div class="col-2 gx-2 gy-2">
<div class="card shadow image-big-hover-pop p-0" @onclick="() => DoAddOrderRow(item)">
@* <img src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" class="card-img-top card-img-fixed img-fluid"> *@
<img src="@imgSrc(item.ImgUrl)" class="card-img-top card-img-fixed img-fluid">
<img src="@imgSrc(item.ImgUrl)" class="card-img-top card-img-fixed img-fluid" title="@item.Name">
<div class="card-body bg-secondary bg-opacity-25 bg-gradient px-2 py-2" style="height: 5rem;">
<div class="card-text fs-5 condensed text-truncate" title="@item.TemplateRowUID">
@item.TemplateRowUID
</div>
<div class="card-text text-secondary condensed text-truncate" tit="@item.Name">
<div class="card-text text-secondary condensed text-truncate" title="@item.Name">
@item.Name
</div>
</div>
@@ -51,11 +51,14 @@
</div>
}
</div>
<div class="modal-footer">
<div class="w-100">
<EgwCoreLib.Razor.DataPager currPage="@currPage" PageSize="@numRecord" totalCount="@totalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec" PageSizeList="pageSizes"></EgwCoreLib.Razor.DataPager>
@if (totalCount > numRecord)
{
<div class="modal-footer">
<div class="w-100">
<EgwCoreLib.Razor.DataPager currPage="@currPage" PageSize="@numRecord" totalCount="@totalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec" PageSizeList="pageSizes"></EgwCoreLib.Razor.DataPager>
</div>
</div>
</div>
}
</div>
</div>
</div>
Lux.UI/Components/Compo/Offer/OfferRowMan.razor
+2 -2
View File
@@ -83,7 +83,7 @@ else
</div>
}
</div>
<div class="cad-body px-2">
<div class="cad-body px-2 py-2">
@if (isLoading || ListRecords == null)
{
<LoadingData></LoadingData>
@@ -286,7 +286,7 @@ else
</div>
</td>
<td class="text-end">
<input class="form-control text-end" style="width: 4rem;" type="number" @bind="@item.Qty" />
<input class="form-control text-end" style="width: 4rem;display: inline-block;" type="number" @bind="@item.Qty" />
</td>
}
else
Lux.UI/Components/Compo/Order/OrderRowMan.razor
+1 -1
View File
@@ -70,7 +70,7 @@ else
</div>
</div>
</div>
<div class="cad-body px-2">
<div class="cad-body px-2 py-2">
@if (isLoading || ListRecords == null)
{
<LoadingData></LoadingData>
Lux.UI/Components/Compo/Warehouse/MatReqList.razor
+1 -1
View File
@@ -12,7 +12,7 @@
<div class="input-group input-group-sm">
<span class="input-group-text">Ord</span>
<select @bind="@SelOrder" class="form-select form-select-sm">
<option value="">--- Tutti ---</option>
<option value="">--- @Traduci("tutti") ---</option>
@foreach (var item in AvailOrdList)
{
<option value="@item">@item</option>
Lux.UI/Components/Pages/Offers.razor
+5 -5
View File
@@ -15,22 +15,22 @@
<div class="px-0 row">
<div class="col px-0">
<span @onclick="() => AdvStep(Enums.CompileStep.Header)">
<StepArrow ObjId="1" StepText="Testata" BlockStyle="@(ArrowBackCol(Enums.CompileStep.Header))" StrokeWidth="4" ObjW="360" ObjH="60" StrokeColors="@listBord01" TipAngle="90" TextStyle="@txtStyle"></StepArrow>
<StepArrow ObjId="1" StepText="@Traduci("offerta_testata")" BlockStyle="@(ArrowBackCol(Enums.CompileStep.Header))" StrokeWidth="4" ObjW="360" ObjH="60" StrokeColors="@listBord01" TipAngle="90" TextStyle="@txtStyle"></StepArrow>
</span>
</div>
<div class="col px-0">
<span @onclick="() => AdvStep(Enums.CompileStep.General)">
<StepArrow ObjId="2" StepText="Generale" BlockStyle="@(ArrowBackCol(Enums.CompileStep.General))" StrokeWidth="4" ObjW="360" ObjH="60" StrokeColors="@listBord01" TipAngle="90" TextStyle="@txtStyle"></StepArrow>
<StepArrow ObjId="2" StepText="@Traduci("offerta_generale")" BlockStyle="@(ArrowBackCol(Enums.CompileStep.General))" StrokeWidth="4" ObjW="360" ObjH="60" StrokeColors="@listBord01" TipAngle="90" TextStyle="@txtStyle"></StepArrow>
</span>
</div>
<div class="col px-0">
<span @onclick="() => AdvStep(Enums.CompileStep.Rows)">
<StepArrow ObjId="3" StepText="Righe" BlockStyle="@(ArrowBackCol(Enums.CompileStep.Rows))" StrokeWidth="4" ObjW="360" ObjH="60" StrokeColors="@listBord01" TipAngle="90" TextStyle="@txtStyle"></StepArrow>
<StepArrow ObjId="3" StepText="@Traduci("offerta_righe")" BlockStyle="@(ArrowBackCol(Enums.CompileStep.Rows))" StrokeWidth="4" ObjW="360" ObjH="60" StrokeColors="@listBord01" TipAngle="90" TextStyle="@txtStyle"></StepArrow>
</span>
</div>
<div class="col px-0">
<span @onclick="() => AdvStep(Enums.CompileStep.Delivery)">
<StepArrow ObjId="4" StepText="Consegna" BlockStyle="@(ArrowBackCol(Enums.CompileStep.Delivery))" StrokeWidth="4" ObjW="360" ObjH="60" StrokeColors="@listBord01" TipAngle="90" TextStyle="@txtStyle"></StepArrow>
<StepArrow ObjId="4" StepText="@Traduci("offerta_consegna")" BlockStyle="@(ArrowBackCol(Enums.CompileStep.Delivery))" StrokeWidth="4" ObjW="360" ObjH="60" StrokeColors="@listBord01" TipAngle="90" TextStyle="@txtStyle"></StepArrow>
</span>
</div>
@* <div class="col px-0">
@@ -116,7 +116,7 @@ else
<div class="input-group">
<label class="input-group-text bg-opacity-50">@Traduci("stato")</label>
<select class="form-select form-select-sm" @bind="@FiltState">
<option value="">-- Tutti --</option>
<option value="">-- @Traduci("tutti") --</option>
@foreach (var item in Enum.GetNames(typeof(Enums.OfferStates)))
{
<option value="@item">@item</option>
Lux.UI/Components/Pages/Orders.razor
+1 -1
View File
@@ -175,7 +175,7 @@ else
<div class="input-group">
<label class="input-group-text bg-opacity-50">@Traduci("stato")</label>
<select @bind="@FiltState" class="form-select form-select-sm">
<option value="">-- Tutti --</option>
<option value="">-- @Traduci("tutti") --</option>
@foreach (var sType in Enum.GetValues(typeof(EgwCoreLib.Lux.Core.Enums.OrderStates)))
{
<option value="@sType">@Traduci("ordine_" + sType.ToString().ToLower())</option>
Lux.UI/Components/Pages/WorkLoadBalance.razor
+5 -2
View File
@@ -11,8 +11,11 @@
<div class="px-2">
<div class="input-group input-group-sm" title="@Traduci("ricerca")">
<span class="input-group-text">@Traduci("ambiente")</span>
<select class="form-select" @bind="@SearchVal">
@foreach (var item in EnvirList)
<select class="form-select" @bind="@FiltEnvir">
<option value="">-- @Traduci("tutti") --</option>
@foreach (var item in Enum.GetValues(typeof(EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS))
.Cast<EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS>()
.Where(e => Convert.ToInt32(e) != 0))
{
<option value="@item">@item</option>
}
Lux.UI/Components/Pages/WorkLoadBalance.razor.cs
+38 -45
View File
@@ -1,6 +1,7 @@
using EgwCoreLib.Lux.Core.Generic;
using EgwCoreLib.Razor;
using Newtonsoft.Json;
using System.Linq;
using static EgwCoreLib.Lux.Core.Enums;
using static Lux.UI.Components.Compo.Planner.BalanceProgGroup;
@@ -73,28 +74,16 @@ namespace Lux.UI.Components.Pages
#region Private Properties
private List<string> EnvirList
private EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS? searchValByEnvir { get; set; } = null;
private EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS? FiltEnvir
{
get
{
var listEnum = Enum.GetNames(typeof(EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS))
.ToList();
if (listEnum.Count > 0)
{
listEnum[0] = "TUTTI";
}
return listEnum;
}
}
private string searchValByState { get; set; } = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW.ToString();
private string SearchVal
{
get => searchValByState;
get => searchValByEnvir;
set
{
if (searchValByState != value)
if (searchValByEnvir != value)
{
searchValByState = value;
searchValByEnvir = value;
DoFilter();
UpdateTable();
}
}
@@ -484,6 +473,7 @@ namespace Lux.UI.Components.Pages
ListEstimRecordsAll = await OrdRService.GetByStateMinAsync(OrderStates.Estimated, PeriodoSel.Inizio, PeriodoSel.Fine);
ListBalancedRecordsAll = await PGService.GetByOrderStateAsync(OrderStates.Assigned);
ListOdlAll = await POService.GetUnassignOdlDtoAsync();
DoFilter();
}
/// <summary>
@@ -615,39 +605,42 @@ namespace Lux.UI.Components.Pages
UpdateTable();
}
private void DoFilter()
{
ListEstimRecords = ListEstimRecordsAll.Where(x => FiltEnvir == null || x.Envir == FiltEnvir).ToList();
ListBalancedRecords = ListBalancedRecordsAll.Where(x => FiltEnvir == null || x.OrderRowNav.Envir == FiltEnvir).ToList();
ListOdl = ListOdlAll.Where(x => FiltEnvir == null || x.Envir == FiltEnvir).ToList();
// if (ListEstimRecordsAll != null && ListEstimRecordsAll.Count > 0)
// {
// ListEstimRecords = ListEstimRecordsAll.Where(x => x.Envir.ToString() == searchValByEnvir).ToList();
// }
// if (ListBalancedRecordsAll != null && ListBalancedRecordsAll.Count > 0)
// {
// ListBalancedRecords = ListBalancedRecordsAll.Where(x => x.OrderRowNav.Envir.ToString() == searchValByEnvir).ToList();
// }
// if (ListOdlAll != null && ListOdlAll.Count > 0)
// {
// ListOdl = ListOdlAll.Where(x => x.Envir.ToString() == searchValByEnvir).ToList();
// }
}
/// <summary>
/// Filtro e paginazione
/// </summary>
private void UpdateTable()
{
if (searchValByState.Equals("TUTTI"))
{
ListEstimRecords = ListEstimRecordsAll;
ListBalancedRecords = ListBalancedRecordsAll;
ListOdl = ListOdlAll;
}
else
{
if (ListEstimRecordsAll != null && ListEstimRecordsAll.Count > 0)
{
ListEstimRecords = ListEstimRecordsAll.Where(x => x.Envir.ToString() == searchValByState).ToList();
}
if (ListBalancedRecordsAll != null && ListBalancedRecordsAll.Count > 0)
{
ListBalancedRecords = ListBalancedRecordsAll.Where(x => x.OrderRowNav.Envir.ToString() == searchValByState).ToList();
}
if (ListOdlAll != null && ListOdlAll.Count > 0)
{
ListOdl = ListOdlAll.Where(x => x.Envir.ToString() == searchValByState).ToList();
}
#if false
// fix paginazione
ListRecords = ListFilt
.Skip(numRecord * (currPage - 1))
.Take(numRecord)
.ToList();
#endif
}
#if false
// fix paginazione
ListRecords = ListFilt
.Skip(numRecord * (currPage - 1))
.Take(numRecord)
.ToList();
private global::System.Threading.Tasks.Task DoBalance(global::System.Int32 args)
{
throw new global::System.NotImplementedException();
@@ -657,8 +650,8 @@ namespace Lux.UI.Components.Pages
throw new global::System.NotImplementedException();
}
#endif
}
#endregion Private Methods
#endregion Private Methods
}
}
Lux.UI/Lux.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50</UserSecretsId>
<Version>1.1.2606.0810</Version>
<Version>1.1.2606.0812</Version>
</PropertyGroup>
<ItemGroup>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>LUX - Web Windows MES</i>
<h4>Versione: 1.1.2606.0810</h4>
<h4>Versione: 1.1.2606.0812</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.1.2606.0810
1.1.2606.0812
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.1.2606.0810</version>
<version>1.1.2606.0812</version>
<url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory>