diff --git a/SHERPA.BBM.UI/Components/DocMovList.razor b/SHERPA.BBM.UI/Components/DocMovList.razor index 95a2e1c..ad66b34 100644 --- a/SHERPA.BBM.UI/Components/DocMovList.razor +++ b/SHERPA.BBM.UI/Components/DocMovList.razor @@ -8,9 +8,9 @@ Attivo - Trattativa + @*Trattativa Tipo - / + /*@ Cod Descrizione Importo @@ -32,8 +32,7 @@ - -
@record.Negotiation.CodNegotiation
+ @*
@record.Negotiation.Descript @@ -49,8 +48,9 @@ { } - + *@ +
@record.Negotiation.CodNegotiation
@record.CodDoc
@record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")
@@ -72,12 +72,23 @@ @code { + private int _negotIdSour { get; set; } = 0; [Parameter] - public int NegotIdSour { get; set; } - - [Parameter] - public int NegotIdDest { get; set; } + public int NegotIdSour + { + get + { + return _negotIdSour; + } + set + { + _negotIdSour = value; + // condiziono visualizzazione... + var pUpd = Task.Run(async () => await ReloadAllData()); + pUpd.Wait(); + } + } private DatabaseModels.DocsModel currItem = null; @@ -169,8 +180,6 @@ protected async Task ReloadAllData() { - //basketList = await BBMService.BasketsGetAsync(1, 1, MessageService.SearchVal); - //negotiationList = await BBMService.NegotiationsGetAllAsync(); await updateTable(); } protected async Task updateTable() diff --git a/SHERPA.BBM.UI/Components/DocsEditor.razor b/SHERPA.BBM.UI/Components/DocsEditor.razor index c0d08c9..1ce69c2 100644 --- a/SHERPA.BBM.UI/Components/DocsEditor.razor +++ b/SHERPA.BBM.UI/Components/DocsEditor.razor @@ -16,13 +16,13 @@
- - @* + @**@ + @foreach (var item in negotiationList) { } - *@ +
diff --git a/SHERPA.BBM.UI/Components/NaviNegot.razor b/SHERPA.BBM.UI/Components/NaviNegot.razor index cbab087..29104d4 100644 --- a/SHERPA.BBM.UI/Components/NaviNegot.razor +++ b/SHERPA.BBM.UI/Components/NaviNegot.razor @@ -24,7 +24,7 @@ @foreach (var item in negotiationList) { - + }
@@ -88,7 +88,7 @@ @foreach (var item in negotiationList) { - + }
diff --git a/SHERPA.BBM.UI/Data/BBM_EFService.cs b/SHERPA.BBM.UI/Data/BBM_EFService.cs index 3af0ccd..742f396 100644 --- a/SHERPA.BBM.UI/Data/BBM_EFService.cs +++ b/SHERPA.BBM.UI/Data/BBM_EFService.cs @@ -230,13 +230,7 @@ namespace SHERPA.BBM.UI.Data public void DocSetActive(DatabaseModels.DocsModel currItem) { - try - { - dbController.DocSetActive(currItem); - } - catch - { - } + dbController.DocSetActive(currItem); } // da rivedere... @@ -349,7 +343,7 @@ namespace SHERPA.BBM.UI.Data public Task> NegotiationsGetAsync(int CompanyId, int CustomerId, int BasketId, string searchVal) { - return Task.FromResult(dbController.NegotGetLastDesc(CompanyId,CustomerId,BasketId, searchVal)); + return Task.FromResult(dbController.NegotGetLastDesc(CompanyId, CustomerId, BasketId, searchVal)); } public void NegotiationUpdate(DatabaseModels.NegotiationsModel currItem) diff --git a/SHERPA.BBM.UI/Pages/DocMover.razor b/SHERPA.BBM.UI/Pages/DocMover.razor index 1e181cc..cc12344 100644 --- a/SHERPA.BBM.UI/Pages/DocMover.razor +++ b/SHERPA.BBM.UI/Pages/DocMover.razor @@ -10,12 +10,12 @@
- - + +
- - + +
@@ -25,4 +25,5 @@ protected int SelNegIdSx{ get; set; } protected int SelNegIdDx{ get; set; } + } diff --git a/SHERPA.BBM.UI/Pages/Docs.razor.cs b/SHERPA.BBM.UI/Pages/Docs.razor.cs index 8f1a9e7..9d60dcc 100644 --- a/SHERPA.BBM.UI/Pages/Docs.razor.cs +++ b/SHERPA.BBM.UI/Pages/Docs.razor.cs @@ -149,7 +149,8 @@ namespace SHERPA.BBM.UI.Pages NegotiationId = SelectData.NegotiationId, NumDoc = 0, DocType = BbmDocType.Quotazione, - Descript = "New Document" + Descript = "New Document", + IsActive = true }; currItem = newRecord; SelectData.DocIdSrc = 0; @@ -262,7 +263,7 @@ namespace SHERPA.BBM.UI.Pages protected async Task SetActive(SHERPA.BBM.DatabaseModels.DocsModel currRecord) { - // imposto ad attivo SOLO il DOC corrente tra quelli della negoziazione + // imposto ad attivo SOLO il DOC corrente tra quelli della negoziazione (SE NON FOSSE licenza) BBMService.DocSetActive(currRecord); await UpdateData(); } diff --git a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj index ae5bd03..d64a4f7 100644 --- a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj +++ b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj @@ -4,7 +4,7 @@ net5.0 60fcdaab-6c1e-4bec-9d88-f7727ef1c12c wwwroot\favicon.ico - 1.0.2111.2712 + 1.0.2111.2909 diff --git a/SHERPA.BBM/Controllers/BBMController.cs b/SHERPA.BBM/Controllers/BBMController.cs index 0a2345b..dc371f0 100644 --- a/SHERPA.BBM/Controllers/BBMController.cs +++ b/SHERPA.BBM/Controllers/BBMController.cs @@ -596,11 +596,17 @@ namespace SHERPA.BBM.Controllers .DbSetDocs .Where(x => x.NegotiationId == updItem.NegotiationId && x.DocId != updItem.DocId) .ToList(); - foreach (var item in otherData) + + // se NON fosse licenza --> disattivo altri + if (currData.DocType < BbmDocType.Licenza) { - item.IsActive = false; + foreach (var item in otherData) + { + item.IsActive = false; + } } dbCtx.SaveChanges(); + // rileggo dbCtx.Entry(currData).Reload(); // anche altri valori