diff --git a/GWMS.Data/Controllers/GWMSController.cs b/GWMS.Data/Controllers/GWMSController.cs index 9247f6e..34b1ea7 100644 --- a/GWMS.Data/Controllers/GWMSController.cs +++ b/GWMS.Data/Controllers/GWMSController.cs @@ -139,10 +139,11 @@ namespace GWMS.Data.Controllers return dbResult; } - public List GetOrdersFilt() + public List GetOrdersFilt(int PlantId) { var dbResult = dbCtx .DbSetOrders + .Where(x => (x.PlantId == PlantId || PlantId == 0)) .Include(p => p.Plant) .Include(s => s.Supplier) .Include(t => t.Transporter) diff --git a/GWMS.UI/Data/GWMSDataService.cs b/GWMS.UI/Data/GWMSDataService.cs index e879d0c..b80b703 100644 --- a/GWMS.UI/Data/GWMSDataService.cs +++ b/GWMS.UI/Data/GWMSDataService.cs @@ -171,7 +171,7 @@ namespace GWMS.UI.Data { Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); - dbResult = dbController.GetOrdersFilt(); + dbResult = dbController.GetOrdersFilt(CurrFilter.PlantId); rawData = JsonConvert.SerializeObject(dbResult); redisDataList = Encoding.UTF8.GetBytes(rawData); await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt(true)); diff --git a/GWMS.UI/Pages/Index.razor b/GWMS.UI/Pages/Index.razor index e54d914..ee2c8b6 100644 --- a/GWMS.UI/Pages/Index.razor +++ b/GWMS.UI/Pages/Index.razor @@ -2,6 +2,4 @@

Hello, world!

-Welcome to your new app. - - +Da sistemare homepage... \ No newline at end of file diff --git a/GWMS.UI/Pages/Orders.razor b/GWMS.UI/Pages/Orders.razor index b9c7b64..4ca7bb3 100644 --- a/GWMS.UI/Pages/Orders.razor +++ b/GWMS.UI/Pages/Orders.razor @@ -9,7 +9,33 @@ Ordini
- selettore PLANT +
+
+
+
+ + + +
+ +
+
+
+ aaaa +
+
+ aaaa +
+
@@ -56,7 +82,7 @@
@record.Transporter.TransporterCode | @record.Transporter.TransporterDesc
- @record.OrderQty + @record.OrderQty.ToString("N0") } diff --git a/GWMS.UI/Pages/Orders.razor.cs b/GWMS.UI/Pages/Orders.razor.cs index 45c7270..e39bdde 100644 --- a/GWMS.UI/Pages/Orders.razor.cs +++ b/GWMS.UI/Pages/Orders.razor.cs @@ -17,6 +17,7 @@ namespace GWMS.UI.Pages private OrderModel currRecord = null; private List ListRecords; + private List PlantsList; private List SearchRecords; #endregion Private Fields @@ -24,6 +25,7 @@ namespace GWMS.UI.Pages #region Private Properties private int _currPage { get; set; } = 1; + private int _numRecord { get; set; } = 10; private int currPage @@ -34,7 +36,7 @@ namespace GWMS.UI.Pages if (_currPage != value) { _currPage = value; - var pUpd = Task.Run(async () => await reloadData()); + var pUpd = Task.Run(async () => await ReloadData()); pUpd.Wait(); } } @@ -50,12 +52,31 @@ namespace GWMS.UI.Pages if (_numRecord != value) { _numRecord = value; - var pUpd = Task.Run(async () => await reloadData()); + var pUpd = Task.Run(async () => await ReloadData()); pUpd.Wait(); } } } + private int SelPlantId + { + get + { + int answ = 0; + if (MessageService.Order_Filter != null) + { + answ = MessageService.Order_Filter.PlantId; + } + return answ; + } + set + { + MessageService.Order_Filter.PlantId = value; + var pUpd = Task.Run(async () => await ReloadData()); + pUpd.Wait(); + } + } + private bool ShowCharts { get; set; } = false; #endregion Private Properties @@ -108,7 +129,7 @@ namespace GWMS.UI.Pages #region Private Methods - private async Task reloadData() + private async Task ReloadData() { isLoading = true; SearchRecords = await DataService.OrdersGetFilt(currFilter); @@ -136,7 +157,13 @@ namespace GWMS.UI.Pages MessageService.PageName = "Ordini"; MessageService.PageIcon = "fas fa-file-invoice pr-2"; MessageService.EA_SearchUpdated += OnSeachUpdated; - await reloadData(); + await ReloadAllData(); + } + + protected async Task ReloadAllData() + { + PlantsList = await DataService.PlantsGetAll(); + await ReloadData(); } protected async Task ResetFilter(SelectOrderData newFilter) @@ -145,7 +172,7 @@ namespace GWMS.UI.Pages SearchRecords = null; ListRecords = null; currFilter = SelectOrderData.Init(5, 7); - await reloadData(); + await ReloadAllData(); } protected void Select(OrderModel selRecord) @@ -157,7 +184,7 @@ namespace GWMS.UI.Pages protected async Task UpdateData() { currRecord = null; - await reloadData(); + await ReloadData(); } #endregion Protected Methods diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 9deec5b..c890aa1 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

Versione: 1.0.2106.0318

+

Versione: 1.0.2106.0319


Note di rilascio:
    diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 02cc1fa..f67b557 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2106.0318 +1.0.2106.0319 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 409c109..7b7d143 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2106.0318 + 1.0.2106.0319 http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/GWMS.UI.zip http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/ChangeLog.html false