diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 76694d86..4f73438f 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2606.0311 + 1.1.2606.0317 diff --git a/Lux.UI/Components/Compo/Contatti/CustomerEdit.razor b/Lux.UI/Components/Compo/Contatti/CustomerEdit.razor index 42dd8c65..a6baddad 100644 --- a/Lux.UI/Components/Compo/Contatti/CustomerEdit.razor +++ b/Lux.UI/Components/Compo/Contatti/CustomerEdit.razor @@ -1,4 +1,6 @@ -
+@inherits BaseComp + +
@if (CurrRecord != null) {
# @(CurrRecord?.CustomerID)
@@ -6,34 +8,34 @@
- +
- +
- +
- +
- +
- +
diff --git a/Lux.UI/Components/Compo/Contatti/CustomerMan.razor b/Lux.UI/Components/Compo/Contatti/CustomerMan.razor index 559bda65..e41accf1 100644 --- a/Lux.UI/Components/Compo/Contatti/CustomerMan.razor +++ b/Lux.UI/Components/Compo/Contatti/CustomerMan.razor @@ -1,10 +1,12 @@ -@if (isLoading || ListRecords == null) +@inherits BaseComp + +@if (isLoading || ListRecords == null) { } else if (totalCount == 0) { -
Nessun record trovato
+
@Traduci("noRecord")
} else { @@ -14,12 +16,12 @@ else - Nome - Cognome - Nome azienda - Codice fiscale/P.Iva - N° Offerte - N° Ordini + @Traduci("nome") + @Traduci("contatti_cognome") + @Traduci("contatti_nomeAzienda") + @Traduci("contatti_cf") + @Traduci("contatti_nOfferte") + @Traduci("contatti_nOrdini") diff --git a/Lux.UI/Components/Compo/Contatti/DealerEdit.razor b/Lux.UI/Components/Compo/Contatti/DealerEdit.razor index 24fd601f..23d2a81c 100644 --- a/Lux.UI/Components/Compo/Contatti/DealerEdit.razor +++ b/Lux.UI/Components/Compo/Contatti/DealerEdit.razor @@ -1,4 +1,6 @@ -
+@inherits BaseComp + +
@if (CurrRecord != null) {
# @(CurrRecord?.DealerID)
@@ -6,34 +8,34 @@
- +
- +
- +
- +
- +
- +
diff --git a/Lux.UI/Components/Compo/Contatti/DealerMan.razor b/Lux.UI/Components/Compo/Contatti/DealerMan.razor index 4df16e1d..5aaaa4e6 100644 --- a/Lux.UI/Components/Compo/Contatti/DealerMan.razor +++ b/Lux.UI/Components/Compo/Contatti/DealerMan.razor @@ -1,10 +1,12 @@ -@if (isLoading || ListRecords == null) +@inherits BaseComp + +@if (isLoading || ListRecords == null) { } else if (totalCount == 0) { -
Nessun record trovato
+
@Traduci("noRecord")
} else { @@ -14,12 +16,12 @@ else - Nome - Cognome - Nome azienda - Codice fiscale/P.Iva - N° Offerte - N° Ordini + @Traduci("nome") + @Traduci("contatti_cognome") + @Traduci("contatti_nomeAzienda") + @Traduci("contatti_cf") + @Traduci("contatti_nOfferte") + @Traduci("contatti_nOrdini") diff --git a/Lux.UI/Components/Compo/Item/DataFilter.razor b/Lux.UI/Components/Compo/Item/DataFilter.razor index 0b20a801..379dd9b6 100644 --- a/Lux.UI/Components/Compo/Item/DataFilter.razor +++ b/Lux.UI/Components/Compo/Item/DataFilter.razor @@ -1,15 +1,17 @@ -
+@inherits BaseComp + +
@if (AddEnabled()) { - + }
@if (ShowItemsBuy) { - Gruppo + @Traduci("articoli_gruppo") - Tipo + @Traduci("articoli_tipo") @foreach (var item in Enum.GetValues(typeof(EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS)) diff --git a/Lux.UI/Components/Compo/Item/ItemEdit.razor b/Lux.UI/Components/Compo/Item/ItemEdit.razor index 5455bc18..59d20152 100644 --- a/Lux.UI/Components/Compo/Item/ItemEdit.razor +++ b/Lux.UI/Components/Compo/Item/ItemEdit.razor @@ -1,4 +1,6 @@ -
+@inherits BaseComp + +
@if (CurrRecord != null) {
# @(CurrRecord?.ItemID) | Codice @CurrRecord.ItemCode
@@ -11,7 +13,7 @@ } - +
@@ -22,7 +24,7 @@ } - +
@@ -31,66 +33,66 @@
- +
- +
- +
@* *@ - +
@* *@ - +
- +
- +
- +
- +
- +
- +
diff --git a/Lux.UI/Components/Compo/Item/ItemMan.razor b/Lux.UI/Components/Compo/Item/ItemMan.razor index 254fcc4f..6dfdfa0e 100644 --- a/Lux.UI/Components/Compo/Item/ItemMan.razor +++ b/Lux.UI/Components/Compo/Item/ItemMan.razor @@ -1,10 +1,12 @@ -@if (isLoading || ListRecords == null) +@inherits BaseComp + +@if (isLoading || ListRecords == null) { } else if (totalCount == 0) { -
Nessun record trovato
+
@Traduci("noRecord")
} else { @@ -14,18 +16,18 @@ else - ID - Gruppo - Tipo - Serv - Codice - ItemCode - Suppl.Code - Descrizione - Costo - Margine - Qty Range - UM + @Traduci("id") + @Traduci("articoli_gruppo") + @Traduci("articoli_tipo") + @Traduci("articoli_servizio") + @Traduci("articoli_codice") + @Traduci("articoli_itemCode") + @Traduci("articoli_supplCode") + @Traduci("descrizione") + @Traduci("articoli_costo") + @Traduci("margine") + @Traduci("articoli_qtyRange") + @Traduci("unitaMisura") diff --git a/Lux.UI/Components/Compo/Item/SellingItemEdit.razor b/Lux.UI/Components/Compo/Item/SellingItemEdit.razor index 959f5e75..fedb093a 100644 --- a/Lux.UI/Components/Compo/Item/SellingItemEdit.razor +++ b/Lux.UI/Components/Compo/Item/SellingItemEdit.razor @@ -1,7 +1,11 @@ -
+@inherits BaseComp + +
@if (CurrRecord != null) { -
# @(CurrRecord?.SellingItemID) | Codice @CurrRecord.ItemCode
+
+ # @(CurrRecord?.SellingItemID) | Codice @CurrRecord?.ItemCode +
@@ -12,7 +16,7 @@ } - +
@@ -22,102 +26,102 @@
- +
- -
+
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
- @if (CurrRecord.ImgType != Enums.ImageType.Calculated) +
+
+
+
+ +
- } +
+
+
+ + +
+
+
+
+ @if (CurrRecord.ImgType != Enums.ImageType.Calculated) + { +
+ + +
+ } +
+
+
+
+ +
+
+ +
+
+
+
+ } +
diff --git a/Lux.UI/Components/Compo/Item/SellingItemMan.razor b/Lux.UI/Components/Compo/Item/SellingItemMan.razor index 3253dcb5..856b06d3 100644 --- a/Lux.UI/Components/Compo/Item/SellingItemMan.razor +++ b/Lux.UI/Components/Compo/Item/SellingItemMan.razor @@ -1,10 +1,12 @@ -@if (isLoading || ListRecords == null) +@inherits BaseComp + +@if (isLoading || ListRecords == null) { } else if (totalCount == 0) { -
Nessun record trovato
+
@Traduci("noRecord")
} else { @@ -18,18 +20,18 @@ else - Envir - Preview - Source - Job ID - Serv - Codice - ItemCode - Suppl.Code - Descrizione - Costo - Margine - UM + @Traduci("ambiente") + @Traduci("preview") + @Traduci("articoli_sorgente") + @Traduci("articoli_jobId") + @Traduci("articoli_servizio") + @Traduci("articoli_codice") + @Traduci("articoli_itemCode") + @Traduci("articoli_supplCode") + @Traduci("descrizione") + @Traduci("articoli_costo") + @Traduci("margine") + @Traduci("unitaMisura") diff --git a/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor b/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor index cd2812a6..f76aaf7c 100644 --- a/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor +++ b/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor @@ -1,10 +1,12 @@ - @if (ForceMode && !string.IsNullOrEmpty(@SelColor)) {
- +
}
@@ -86,10 +88,10 @@
- +
- +
} } diff --git a/Lux.UI/Components/Compo/Offer/OfferMan.razor b/Lux.UI/Components/Compo/Offer/OfferMan.razor index 1f7aea5d..fbdb3685 100644 --- a/Lux.UI/Components/Compo/Offer/OfferMan.razor +++ b/Lux.UI/Components/Compo/Offer/OfferMan.razor @@ -1,4 +1,5 @@ @using EgwCoreLib.Lux.Core +@inherits BaseComp
@@ -13,7 +14,7 @@ } - +
@@ -28,7 +29,7 @@ } - +
@@ -39,25 +40,25 @@ } - +
- +
- +
- +
@if (HasChanged() && IsValid()) @@ -65,10 +66,10 @@
- +
- +
} \ No newline at end of file diff --git a/Lux.UI/Components/Compo/Offer/OfferRowMan.razor b/Lux.UI/Components/Compo/Offer/OfferRowMan.razor index e1278d34..91f3a3af 100644 --- a/Lux.UI/Components/Compo/Offer/OfferRowMan.razor +++ b/Lux.UI/Components/Compo/Offer/OfferRowMan.razor @@ -1,4 +1,5 @@ @using static EgwCoreLib.Lux.Core.Enums +@inherits BaseComp @if (addFromTemplate) { @@ -47,10 +48,10 @@ else {
- +
- +
} @@ -64,13 +65,13 @@ else else if (DisplayMode == DisplayMode.Edit) {
- +
- +
- +
} @@ -89,7 +90,7 @@ else } else if (totalCount == 0) { -
Nessun record trovato
+
@Traduci("noRecord")
} else { @@ -101,24 +102,24 @@ else - Preview + @Traduci("anteprima") } else { - Preview + @Traduci("anteprima") } - Codice - Descrizione - Qty - Importo + @Traduci("codice") + @Traduci("descrizione") + @Traduci("quantita") + @Traduci("importo") @if (DisplayMode == DisplayMode.Edit) { Mat. Lav. } - Totale - Marg. + @Traduci("totale") + @Traduci("margine") @if (DisplayMode == DisplayMode.Edit) { @@ -416,7 +417,7 @@ else
- Materiali + @Traduci("offerta_materiali")
@EditRecord.Note
@@ -443,7 +444,7 @@ else
- Lavorazioni (Cicli) + @Traduci("offerta_lavorazioni")
@EditRecord.Note
diff --git a/Lux.UI/Components/Compo/Templates/TemplateList.razor b/Lux.UI/Components/Compo/Templates/TemplateList.razor index 2979a643..3639bf99 100644 --- a/Lux.UI/Components/Compo/Templates/TemplateList.razor +++ b/Lux.UI/Components/Compo/Templates/TemplateList.razor @@ -1,4 +1,6 @@ -@if (EditRecord != null) +@inherits BaseComp + +@if (EditRecord != null) { } @@ -13,10 +15,10 @@ else
- Nessun Gruppo Template trovato + @Traduci("noRecords")
- +
@@ -29,13 +31,13 @@ else - ID - Envir - Nome + @Traduci("id") + @Traduci("ambiente") + @Traduci("nome") @if (SelRecord == null) { - Descrizione - Qty + @Traduci("descrizione") + @Traduci("cataloghi_quantita") } diff --git a/Lux.UI/Components/Compo/Templates/TemplateMan.razor b/Lux.UI/Components/Compo/Templates/TemplateMan.razor index 5f18d2d8..036aff3b 100644 --- a/Lux.UI/Components/Compo/Templates/TemplateMan.razor +++ b/Lux.UI/Components/Compo/Templates/TemplateMan.razor @@ -1,4 +1,5 @@ @using EgwCoreLib.Lux.Core +@inherits BaseComp
@@ -9,7 +10,7 @@ } - +
@@ -20,25 +21,25 @@ } - +
- +
- +
- +
- +
diff --git a/Lux.UI/Components/Compo/Templates/TemplateRowList.razor b/Lux.UI/Components/Compo/Templates/TemplateRowList.razor index 6866a3f5..f30b3176 100644 --- a/Lux.UI/Components/Compo/Templates/TemplateRowList.razor +++ b/Lux.UI/Components/Compo/Templates/TemplateRowList.razor @@ -1,4 +1,5 @@ @using static EgwCoreLib.Lux.Core.Enums +@inherits BaseComp @if (EditRecord != null) { @@ -41,11 +42,11 @@ else
- Nessun Template trovato + @Traduci("noRecord")
- Envir + @Traduci("ambiente") @if (CurrSellingItemId == 0) { - + } else { - + }
@@ -75,8 +76,8 @@ else - Preview - Prodotto + @Traduci("anteprima") + @Traduci("cataloghi_prod") @* Importo *@ diff --git a/Lux.UI/Components/Compo/Templates/TemplateRowMan.razor b/Lux.UI/Components/Compo/Templates/TemplateRowMan.razor index 12cd4bcf..1da1899e 100644 --- a/Lux.UI/Components/Compo/Templates/TemplateRowMan.razor +++ b/Lux.UI/Components/Compo/Templates/TemplateRowMan.razor @@ -1,4 +1,5 @@ @using EgwCoreLib.Lux.Core +@inherits BaseComp
@@ -10,13 +11,13 @@ } - +
- +
@if (ShowImgUpload(CurrRecord.SellingItemID)) @@ -24,17 +25,17 @@
- +
- +
}
- +
- +
diff --git a/Lux.UI/Components/Layout/GroupElem.razor b/Lux.UI/Components/Layout/GroupElem.razor index 77beda3f..0b278c9a 100644 --- a/Lux.UI/Components/Layout/GroupElem.razor +++ b/Lux.UI/Components/Layout/GroupElem.razor @@ -1,4 +1,5 @@ - +@inherits BaseComp +
@@ -6,7 +7,7 @@ @if (ShowText) { - @NameList.FirstOrDefault() + @Traduci("navMan_" + NameList.FirstOrDefault()) }
@@ -17,7 +18,7 @@ {
- @elem + @Traduci("navMan_"+elem)
} diff --git a/Lux.UI/Components/Layout/NavMenu.razor b/Lux.UI/Components/Layout/NavMenu.razor index 46c0215d..456ef6b4 100644 --- a/Lux.UI/Components/Layout/NavMenu.razor +++ b/Lux.UI/Components/Layout/NavMenu.razor @@ -27,7 +27,7 @@ @if (showText) { - Home + @Traduci("navMan_home") }
@@ -36,38 +36,38 @@
- Cataloghi + @Traduci("navMan_cataloghi")
- Offerte + @Traduci("navMan_offerte")
- Ordini + @Traduci("navMan_ordini")
- Ordini Fornitore + @Traduci("navMan_ordiniFornitore")
- Carico Macchine + @Traduci("navMan_caricoMacchine")
- Planner + @Traduci("navMan_pianificazione")
- Anagrafiche + @Traduci("navMan_anagrafiche")
@@ -82,12 +82,12 @@
- Stats + @Traduci("navMan_stats")
- Offer Stats + @Traduci("navMan_offerStats")
diff --git a/Lux.UI/Components/Layout/NavMenu.razor.cs b/Lux.UI/Components/Layout/NavMenu.razor.cs index 9bfa206b..9515dfab 100644 --- a/Lux.UI/Components/Layout/NavMenu.razor.cs +++ b/Lux.UI/Components/Layout/NavMenu.razor.cs @@ -92,8 +92,8 @@ namespace Lux.UI.Components.Layout private void UpdateDict() { // Inserimento nomi segnaposto nav-item - NameDict.Add("Articoli", new List() { "Articoli", "Buy", "Sell" }); - NameDict.Add("Ciclo prod", new List() { "Ciclo prod", "Risorse", "Cicli" }); + NameDict.Add("Articoli", new List() { "Articoli", "ArtAcquisto", "ArtVendita" }); + NameDict.Add("Ciclo prod", new List() { "CicloProd", "Risorse", "Cicli" }); NameDict.Add("Contatti", new List() { "Contatti", "Clienti", "Venditori" }); // Inserimento icone diff --git a/Lux.UI/Components/Pages/Customer.razor b/Lux.UI/Components/Pages/Customer.razor index b5be8030..e8f7e49c 100644 --- a/Lux.UI/Components/Pages/Customer.razor +++ b/Lux.UI/Components/Pages/Customer.razor @@ -1,11 +1,12 @@ @page "/Customer" +@inherits BaseComp
- Clienti - + @Traduci("navMan_Clienti") +
diff --git a/Lux.UI/Components/Pages/Dealer.razor b/Lux.UI/Components/Pages/Dealer.razor index 26df3c43..859f0cff 100644 --- a/Lux.UI/Components/Pages/Dealer.razor +++ b/Lux.UI/Components/Pages/Dealer.razor @@ -1,11 +1,12 @@ @page "/Dealer" +@inherits BaseComp
- Fornitori - + @Traduci("navMan_venditori") +
diff --git a/Lux.UI/Components/Pages/Items.razor b/Lux.UI/Components/Pages/Items.razor index 605085ec..fd7123f9 100644 --- a/Lux.UI/Components/Pages/Items.razor +++ b/Lux.UI/Components/Pages/Items.razor @@ -1,10 +1,11 @@ @page "/Items" +@inherits BaseComp
- Articoli Acquisto + @Traduci("navMan_artAcquisto")
diff --git a/Lux.UI/Components/Pages/Offers.razor b/Lux.UI/Components/Pages/Offers.razor index 9da672ac..394a8a7f 100644 --- a/Lux.UI/Components/Pages/Offers.razor +++ b/Lux.UI/Components/Pages/Offers.razor @@ -1,4 +1,5 @@ @page "/Offers" +@inherits BaseComp @if (EditRecord != null) { @@ -80,7 +81,7 @@ else
-
Imposta Stato Offerta
+
@Traduci("offerta_impostaStato")
@@ -102,38 +103,26 @@ else
- Offerte - + @Traduci("navMan_offerte") + - Stats + @Traduci("offerta_stats")
-
-
- - + + @foreach (var item in Enum.GetNames(typeof(Enums.OfferStates))) { } -
-
- @*
-
- Stato -
- - -
-
-
*@ -
-
+
@@ -152,7 +141,7 @@ else } else if (totalCount == 0) { -
Nessun record trovato
+
@Traduci("noRecord")
} else { @@ -166,27 +155,27 @@ else @if (SelRecord == null) { - ID + @Traduci("id") } - Date + @Traduci("data") @if (SelRecord == null) { - Stato + @Traduci("stato") } - Codice - Agente/Riv - Cliente + @Traduci("codice") + @Traduci("venditore") + @Traduci("cliente") @if (SelRecord == null) { - Descrizione + @Traduci("descrizione") } - Importo + @Traduci("importo") @if (SelRecord == null) { - Marg. + @Traduci("margine") } diff --git a/Lux.UI/Components/Pages/Offers.razor.cs b/Lux.UI/Components/Pages/Offers.razor.cs index 2da30fef..4a4ec7ab 100644 --- a/Lux.UI/Components/Pages/Offers.razor.cs +++ b/Lux.UI/Components/Pages/Offers.razor.cs @@ -31,15 +31,15 @@ namespace Lux.UI.Components.Pages .ToList(); } - private string searchValByState { get; set; } = Enums.OfferStates.Open.ToString(); - private string SearchVal + private Enums.OfferStates? filtState { get; set; } = null; + private Enums.OfferStates? FiltState { - get => searchValByState; + get => filtState; set { - if (searchValByState != value) + if (filtState != value) { - searchValByState = value; + filtState = value; DoFilter(); UpdateTable(); } @@ -281,17 +281,9 @@ namespace Lux.UI.Components.Pages private void DoFilter() { - if (searchValByState.Equals("All")) - { - ListFilt = AllRecords + ListFilt = AllRecords + .Where(x => filtState == null || x.OffertState == FiltState) .ToList(); - } - else - { - ListFilt = AllRecords - .Where(x => x.OffertState.ToString().Equals(SearchVal)) - .ToList(); - } //// verifico eventuali filtri //ListFilt = AllRecords // .Where(x => x.OffertState == OfferStates.Open || allState) diff --git a/Lux.UI/Components/Pages/Orders.razor b/Lux.UI/Components/Pages/Orders.razor index ce9bd7c2..8292df24 100644 --- a/Lux.UI/Components/Pages/Orders.razor +++ b/Lux.UI/Components/Pages/Orders.razor @@ -170,7 +170,7 @@ else Ordini @* *@
-
+
diff --git a/Lux.UI/Components/Pages/SellItems.razor b/Lux.UI/Components/Pages/SellItems.razor index 1d144fe5..3ff54a19 100644 --- a/Lux.UI/Components/Pages/SellItems.razor +++ b/Lux.UI/Components/Pages/SellItems.razor @@ -1,10 +1,11 @@ @page "/SellItems" +@inherits BaseComp
- Articoli Vendita + @Traduci("navMan_ArtVendita")
diff --git a/Lux.UI/Components/Pages/Template.razor b/Lux.UI/Components/Pages/Template.razor index 4041b9bf..9cffaa1a 100644 --- a/Lux.UI/Components/Pages/Template.razor +++ b/Lux.UI/Components/Pages/Template.razor @@ -1,12 +1,12 @@ @page "/Template" -@using Lux.UI.Components.Compo.Templates +@inherits BaseComp
- Gestione Cataloghi (Template) + @Traduci("navMan_cataloghi")
@*
@@ -58,7 +58,7 @@ } else { - Prodotti a Catalogo | @SelRecord.Name + @Traduci("cataloghi_prodotti") | @SelRecord.Name }
diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 63be1cb9..c033755b 100644 --- a/Lux.UI/Lux.UI.csproj +++ b/Lux.UI/Lux.UI.csproj @@ -5,7 +5,7 @@ enable enable aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50 - 1.1.2606.0311 + 1.1.2606.0317 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index abebfbd9..99d7c647 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2606.0311

+

Versione: 1.1.2606.0317


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 05dc50a7..7a8d9073 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2606.0311 +1.1.2606.0317 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 56c535fd..9e9955ad 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2606.0311 + 1.1.2606.0317 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false