diff --git a/SHERPA.BBM.CORE/Controllers/BBMController.cs b/SHERPA.BBM.CORE/Controllers/BBMController.cs
index 4d2eebc..1795118 100644
--- a/SHERPA.BBM.CORE/Controllers/BBMController.cs
+++ b/SHERPA.BBM.CORE/Controllers/BBMController.cs
@@ -1048,7 +1048,7 @@ namespace SHERPA.BBM.CORE.Controllers
///
///
///
- public List NegotGetLastDesc(int CompanyId, int CustomerId, int BasketId, string searchVal)
+ public List NegotGetLastDesc(int anno, int companyId, int customerId, int basketId, string searchVal)
{
List dbResult = new List();
using (SHERPABBMContext dbCtx = new SHERPABBMContext(_configuration))
@@ -1056,7 +1056,7 @@ namespace SHERPA.BBM.CORE.Controllers
dbResult = dbCtx
.DbSetNegotiations
// || x.Basket.Company.RagSoc.Contains(searchVal)
- .Where(x => (x.Basket.CompanyId == CompanyId || CompanyId == 1) && (x.CustomerId == CustomerId || CustomerId == 1) && (x.BasketId == BasketId || BasketId == 1) && (x.NegotiationId > 1) && (string.IsNullOrEmpty(searchVal) || x.CodNegotiation.Contains(searchVal) || x.BasePath.Contains(searchVal)))
+ .Where(x => (x.Anno == anno || anno == 0) && (x.Basket.CompanyId == companyId || companyId == 1) && (x.CustomerId == customerId || customerId == 1) && (x.BasketId == basketId || basketId == 1) && (x.NegotiationId > 1) && (string.IsNullOrEmpty(searchVal) || x.CodNegotiation.Contains(searchVal) || x.BasePath.Contains(searchVal)))
.Include(n => n.Basket)
.Include(n => n.DocsNav)
.ThenInclude(d => d.FattNav)
@@ -1124,6 +1124,21 @@ namespace SHERPA.BBM.CORE.Controllers
return done;
}
+
+ public List NegotYears()
+ {
+ List dbResult = new List();
+ using (SHERPABBMContext dbCtx = new SHERPABBMContext(_configuration))
+ {
+ dbResult = dbCtx
+ .DbSetNegotiations
+ .Select(x => x.Anno)
+ .Distinct()
+ .ToList();
+ }
+ return dbResult;
+ }
+
///
/// Aggiunge un nuova Resource
///
diff --git a/SHERPA.BBM.UI/Components/NaviNegot.razor.cs b/SHERPA.BBM.UI/Components/NaviNegot.razor.cs
index 3b465fc..104a30f 100644
--- a/SHERPA.BBM.UI/Components/NaviNegot.razor.cs
+++ b/SHERPA.BBM.UI/Components/NaviNegot.razor.cs
@@ -111,7 +111,7 @@ namespace SHERPA.BBM.UI.Components
{
customersList = await BBMService.CustomersGetAll("");
basketList = await BBMService.BasketsGetAsync(1, "");
- negotiationList = await BBMService.NegotiationsGetAsync(1, SelCustomerId, SelBasketId, "");
+ negotiationList = await BBMService.NegotiationsGetAsync(0, 1, SelCustomerId, SelBasketId, "");
}
diff --git a/SHERPA.BBM.UI/Data/BBM_EFService.cs b/SHERPA.BBM.UI/Data/BBM_EFService.cs
index f99697b..40aafa3 100644
--- a/SHERPA.BBM.UI/Data/BBM_EFService.cs
+++ b/SHERPA.BBM.UI/Data/BBM_EFService.cs
@@ -48,7 +48,7 @@ namespace SHERPA.BBM.UI.Data
StringBuilder sb = new StringBuilder();
sb.AppendLine($"DbController OK");
sb.AppendLine($"CST: {dbController.CustomersCount()} | CNT: {dbController.CountersCount()} | BSK: {dbController.BasketsCount()} | NGT: {dbController.NegotiationsCount()} | DOC: {dbController.DocsCount()} | ITM: {dbController.ItemsCount()} | RES: {dbController.ResourcesCount()}");
- _logger.LogInformation(sb.ToString());
+ _logger.LogInformation(sb.ToString());
#endif
}
}
@@ -57,30 +57,6 @@ namespace SHERPA.BBM.UI.Data
#region Public Methods
- public void Dispose()
- {
- // Clear database controller
- dbController.Dispose();
- }
-
-#if false
- ///
- /// effettua reset del controller (nuova istanza)
- ///
- ///
- public static bool resetController()
- {
- bool answ = false;
- try
- {
- dbController = new CORE.Controllers.BBMController(connStringBBM, connStringFatt);
- }
- catch
- { }
- return answ;
- }
-#endif
-
public void BasketsAdd(CORE.DbModels.BasketsModel newItem)
{
try
@@ -92,38 +68,6 @@ namespace SHERPA.BBM.UI.Data
}
}
-
- ///
- /// Elenco annualità valide x documenti caricati
- ///
- ///
- public Task> DocsYears()
- {
- return Task.FromResult(dbController.DocsYears());
- }
-
- ///
- /// Elenco tags
- ///
- ///
- ///
- ///
- public Task> TagsGetAll(TagType selType)
- {
- return Task.FromResult(dbController.TagsGetAll(selType));
- }
-
- public void TagDelete(CORE.DbModels.TagModel currRecord)
- {
- dbController.TagDelete(currRecord.TagId);
- }
-
- public void TagUpdate(CORE.DbModels.TagModel currRecord)
- {
- dbController.TagUpdate(currRecord);
- }
-
-
public void BasketsDelete(CORE.DbModels.BasketsModel currItem)
{
try
@@ -135,35 +79,6 @@ namespace SHERPA.BBM.UI.Data
}
}
- ///
- /// Elenco tags dato item
- ///
- ///
- ///
- ///
- public Task> TagItemGetByItem(int itemId)
- {
- return Task.FromResult(dbController.TagItemGetByItem(itemId));
- }
-
- ///
- /// Upsert Tag2Item
- ///
- ///
- public void TagItemUpdate(CORE.DbModels.TagItemModel currRecord)
- {
- dbController.TagItemUpdate(currRecord);
- }
-
- ///
- /// Delete Tag2Item
- ///
- ///
- public void TagItemDelete(CORE.DbModels.TagItemModel currRecord)
- {
- dbController.TagItemDelete(currRecord);
- }
-
///
/// Elenco ultimi Baskets
///
@@ -270,6 +185,30 @@ namespace SHERPA.BBM.UI.Data
}
}
+ public void Dispose()
+ {
+ // Clear database controller
+ dbController.Dispose();
+ }
+
+#if false
+ ///
+ /// effettua reset del controller (nuova istanza)
+ ///
+ ///
+ public static bool resetController()
+ {
+ bool answ = false;
+ try
+ {
+ dbController = new CORE.Controllers.BBMController(connStringBBM, connStringFatt);
+ }
+ catch
+ { }
+ return answ;
+ }
+#endif
+
public Task DocGetByKeyAsync(int DocId)
{
return Task.FromResult(dbController.DocGetByKey(DocId));
@@ -314,7 +253,6 @@ namespace SHERPA.BBM.UI.Data
return Task.FromResult(dbController.DocGetLastDesc(anno, basketId, negotiationId, showAll));
}
-
public Task DocsMoveNegot(int DocId, int NegotiationId)
{
return Task.FromResult(dbController.DocsMoveNegot(DocId, NegotiationId));
@@ -325,6 +263,15 @@ namespace SHERPA.BBM.UI.Data
dbController.DocUpdate(currItem);
}
+ ///
+ /// Elenco annualità valide x documenti caricati
+ ///
+ ///
+ public Task> DocsYears()
+ {
+ return Task.FromResult(dbController.DocsYears());
+ }
+
public void ItemAdd(CORE.DbModels.ItemsModel newItem)
{
try
@@ -411,9 +358,9 @@ namespace SHERPA.BBM.UI.Data
return Task.FromResult(dbController.NegotGetAllDesc());
}
- public Task> NegotiationsGetAsync(int CompanyId, int CustomerId, int BasketId, string searchVal)
+ public Task> NegotiationsGetAsync(int anno, int companyId, int customerId, int basketId, string searchVal)
{
- return Task.FromResult(dbController.NegotGetLastDesc(CompanyId, CustomerId, BasketId, searchVal));
+ return Task.FromResult(dbController.NegotGetLastDesc(anno, companyId, customerId, basketId, searchVal));
}
public void NegotiationUpdate(CORE.DbModels.NegotiationsModel currItem)
@@ -427,6 +374,15 @@ namespace SHERPA.BBM.UI.Data
}
}
+ ///
+ /// Elenco annualità valide x negoziazioni
+ ///
+ ///
+ public Task> NegotYears()
+ {
+ return Task.FromResult(dbController.NegotYears());
+ }
+
public void ResourceAdd(CORE.DbModels.ResourcesModel newItem)
{
try
@@ -469,7 +425,7 @@ namespace SHERPA.BBM.UI.Data
public Task> ResourcesGetAsync(int anno, int baskId, int negoId, int docId, BbmResType resType)
{
- //baskId, negoId,
+ //baskId, negoId,
return Task.FromResult(dbController.ResourceGetLastDesc(anno, baskId, negoId, docId, resType));
}
@@ -530,6 +486,56 @@ namespace SHERPA.BBM.UI.Data
return Task.FromResult(dbController.SumTotTrattato(anno));
}
+ public void TagDelete(CORE.DbModels.TagModel currRecord)
+ {
+ dbController.TagDelete(currRecord.TagId);
+ }
+
+ ///
+ /// Delete Tag2Item
+ ///
+ ///
+ public void TagItemDelete(CORE.DbModels.TagItemModel currRecord)
+ {
+ dbController.TagItemDelete(currRecord);
+ }
+
+ ///
+ /// Elenco tags dato item
+ ///
+ ///
+ ///
+ ///
+ public Task> TagItemGetByItem(int itemId)
+ {
+ return Task.FromResult(dbController.TagItemGetByItem(itemId));
+ }
+
+ ///
+ /// Upsert Tag2Item
+ ///
+ ///
+ public void TagItemUpdate(CORE.DbModels.TagItemModel currRecord)
+ {
+ dbController.TagItemUpdate(currRecord);
+ }
+
+ ///
+ /// Elenco tags
+ ///
+ ///
+ ///
+ ///
+ public Task> TagsGetAll(TagType selType)
+ {
+ return Task.FromResult(dbController.TagsGetAll(selType));
+ }
+
+ public void TagUpdate(CORE.DbModels.TagModel currRecord)
+ {
+ dbController.TagUpdate(currRecord);
+ }
+
#endregion Public Methods
}
}
\ No newline at end of file
diff --git a/SHERPA.BBM.UI/Pages/DocMover.razor b/SHERPA.BBM.UI/Pages/DocMover.razor
index b943763..f8952fc 100644
--- a/SHERPA.BBM.UI/Pages/DocMover.razor
+++ b/SHERPA.BBM.UI/Pages/DocMover.razor
@@ -237,7 +237,7 @@
{
customersList = await BBMService.CustomersGetAll("");
basketListSx = await BBMService.BasketsGetAsync(1, "");
- negotiationListSx = await BBMService.NegotiationsGetAsync(1, SelCustomerIdSx, SelBasketIdSx, "");
+ negotiationListSx = await BBMService.NegotiationsGetAsync(yearSel, 1, SelCustomerIdSx, SelBasketIdSx, "");
}
@@ -245,7 +245,7 @@
{
customersList = await BBMService.CustomersGetAll("");
basketListDx = await BBMService.BasketsGetAsync(1, "");
- negotiationListDx = await BBMService.NegotiationsGetAsync(1, SelCustomerIdDx, SelBasketIdDx, "");
+ negotiationListDx = await BBMService.NegotiationsGetAsync(yearSel, 1, SelCustomerIdDx, SelBasketIdDx, "");
}
protected override async Task OnInitializedAsync()
diff --git a/SHERPA.BBM.UI/Pages/Negotiations.razor b/SHERPA.BBM.UI/Pages/Negotiations.razor
index 6597b7e..d0e46cb 100644
--- a/SHERPA.BBM.UI/Pages/Negotiations.razor
+++ b/SHERPA.BBM.UI/Pages/Negotiations.razor
@@ -20,7 +20,7 @@
-