diff --git a/SHERPA.AD/Components/AccDocDetail.razor.cs b/SHERPA.AD/Components/AccDocDetail.razor.cs index b962d2d..3d75a78 100644 --- a/SHERPA.AD/Components/AccDocDetail.razor.cs +++ b/SHERPA.AD/Components/AccDocDetail.razor.cs @@ -93,7 +93,7 @@ namespace SHERPA.AD.Components bool answ = false; if (CurrRecord != null) { - answ = (CurrRecord.importo == 0 && string.IsNullOrEmpty(CurrRecord.id_ext)); + answ = (CurrRecord.importo == 0 && string.IsNullOrEmpty(CurrRecord.id_ext) && CurrDocRows?.Count == 0); } return answ; } diff --git a/SHERPA.AD/Components/AccDocManager.razor.cs b/SHERPA.AD/Components/AccDocManager.razor.cs index 9a0f256..5f8e708 100644 --- a/SHERPA.AD/Components/AccDocManager.razor.cs +++ b/SHERPA.AD/Components/AccDocManager.razor.cs @@ -161,6 +161,11 @@ namespace SHERPA.AD.Components { await Task.Delay(1); bool needReload = false; + var oldRec = SelRecord; + // verifico eventuali richieste di tenere record selezionato + bool keepSel = CurrFilter.KeepSelected; + //reset + CurrFilter.KeepSelected = false; // verifica filtro if (!LastFilter.Equals(CurrFilter)) { @@ -184,6 +189,10 @@ namespace SHERPA.AD.Components { SelRecord = null; await ReloadData(false); + if (keepSel) + { + SelRecord = oldRec; + } } } diff --git a/SHERPA.AD/Pages/AccuDoc.razor.cs b/SHERPA.AD/Pages/AccuDoc.razor.cs index b9f63d1..833a0e7 100644 --- a/SHERPA.AD/Pages/AccuDoc.razor.cs +++ b/SHERPA.AD/Pages/AccuDoc.razor.cs @@ -67,7 +67,7 @@ namespace SHERPA.AD.Pages private int numRecord { get; set; } = 10; - private bool dataReady { get; set;} = false; + private bool dataReady { get; set; } = false; private vDocsExplModel? SelRecord { get; set; } = null; private int totalCount { get; set; } = 0; @@ -94,8 +94,9 @@ namespace SHERPA.AD.Pages private async Task DocUpdated() { var currAnno = SelFilter.Anno; + SelFilter.KeepSelected = true; SelFilter.Anno = -1; - SelRecord = null; + //SelRecord = null; await Task.Delay(1); SelFilter.Anno = currAnno; await Task.Delay(1); diff --git a/SHERPA.AD/SHERPA.AD.csproj b/SHERPA.AD/SHERPA.AD.csproj index 921a7b8..76f8491 100644 --- a/SHERPA.AD/SHERPA.AD.csproj +++ b/SHERPA.AD/SHERPA.AD.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 2.0.2309.0112 + 2.0.2309.0115 Egalware 2021+ diff --git a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj index 0e6b21e..8c11dfc 100644 --- a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj +++ b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj @@ -4,7 +4,7 @@ net6.0 60fcdaab-6c1e-4bec-9d88-f7727ef1c12c wwwroot\favicon.ico - 2.0.2309.0112 + 2.0.2309.0115 enable enable Egalware 2021+ diff --git a/SHERPA.Data/SelectDocExp.cs b/SHERPA.Data/SelectDocExp.cs index f7328fd..7ba86bc 100644 --- a/SHERPA.Data/SelectDocExp.cs +++ b/SHERPA.Data/SelectDocExp.cs @@ -6,9 +6,6 @@ public int Anno { get; set; } = 0; public int Aperta { get; set; } = 0; -#if false - public string CodTipo { get; set; } = "*"; -#endif public DateTime Fine { get; set; } = new DateTime(DateTime.Today.Year + 1, 1, 1); public int IdxCli { get; set; } = 0; public int IdxTipo { get; set; } = 0; @@ -17,6 +14,7 @@ public bool OnlySync { get; set; } = false; public string RagSoc { get; set; } = "*"; public string SearchVal { get; set; } = ""; + public bool KeepSelected { get; set; } = false; #endregion Public Properties @@ -28,16 +26,14 @@ { Anno = this.Anno, IdxCli = this.IdxCli, -#if false - CodTipo = this.CodTipo, -#endif - IdxTipo= this.IdxTipo, + IdxTipo = this.IdxTipo, IdxGruppo = this.IdxGruppo, RagSoc = this.RagSoc, Inizio = this.Inizio, Fine = this.Fine, Aperta = this.Aperta, OnlySync = this.OnlySync, + KeepSelected = this.KeepSelected, SearchVal = this.SearchVal }; return clonedData; @@ -57,14 +53,9 @@ if (IdxCli != item.IdxCli) return false; - if (IdxTipo!= item.IdxTipo) + if (IdxTipo != item.IdxTipo) return false; -#if false - if (CodTipo != item.CodTipo) - return false; -#endif - if (IdxGruppo != item.IdxGruppo) return false; @@ -83,6 +74,9 @@ if (OnlySync != item.OnlySync) return false; + if (KeepSelected != item.KeepSelected) + return false; + if (SearchVal != item.SearchVal) return false;