From 1a483b827df2bbc1f603ba4c216cb2a08fbab30b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 3 Jul 2025 15:58:47 +0200 Subject: [PATCH 1/5] Update x compilazione metodi non Async --- MP.Land/MP.Land.csproj | 2 +- MP.Land/Pages/RefreshData.razor | 2 +- MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- MP.Prog/MP.Prog.csproj | 2 +- MP.Prog/Pages/ForceReload.razor.cs | 2 +- MP.Prog/Resources/ChangeLog.html | 2 +- MP.Prog/Resources/VersNum.txt | 2 +- MP.Prog/Resources/manifest.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 115fdd70..706d4fcd 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2507.0111 + 6.16.2507.0315 Debug;Release;Debug_LiManDebug en True diff --git a/MP.Land/Pages/RefreshData.razor b/MP.Land/Pages/RefreshData.razor index 666e03d2..5071e51b 100644 --- a/MP.Land/Pages/RefreshData.razor +++ b/MP.Land/Pages/RefreshData.razor @@ -24,7 +24,7 @@ LicServ.AKVList = new List(); await Task.Delay(100); await DataService.FlushRedisCache(); - await TServ.FlushCache(); + await TServ.FlushCacheAsync(); await Task.Delay(200); // redireziono diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 2e989fd7..87d53175 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo Tablet MAPO - DotNet6 -

Versione: 6.16.2507.0111

+

Versione: 6.16.2507.0315


Note di rilascio:
    diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index 0d6c22cc..73d542ab 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2507.0111 +6.16.2507.0315 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index ee8bb1c0..62008499 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2507.0111 + 6.16.2507.0315 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj index ee015e9c..c11e464a 100644 --- a/MP.Prog/MP.Prog.csproj +++ b/MP.Prog/MP.Prog.csproj @@ -3,7 +3,7 @@ net6.0 MP.Prog - 6.16.2504.0909 + 6.16.2507.0315 True diff --git a/MP.Prog/Pages/ForceReload.razor.cs b/MP.Prog/Pages/ForceReload.razor.cs index a1546f7e..1589a319 100644 --- a/MP.Prog/Pages/ForceReload.razor.cs +++ b/MP.Prog/Pages/ForceReload.razor.cs @@ -26,7 +26,7 @@ namespace MP.Prog.Pages { await Task.Delay(10); await FDService.FlushRedisCache(); - await TServ.FlushCache(); + await TServ.FlushCacheAsync(); message = "Reset done, now redirect!"; await Task.Delay(100); diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html index 024bf124..90159ca1 100644 --- a/MP.Prog/Resources/ChangeLog.html +++ b/MP.Prog/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

    Versione: 6.16.2504.0909

    +

    Versione: 6.16.2507.0315


    Note di rilascio:
      diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt index 31dd2801..73d542ab 100644 --- a/MP.Prog/Resources/VersNum.txt +++ b/MP.Prog/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2504.0909 +6.16.2507.0315 diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml index 2b2ce15d..5b88d093 100644 --- a/MP.Prog/Resources/manifest.xml +++ b/MP.Prog/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2504.0909 + 6.16.2507.0315 https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html false From cd0927c281435e34745c65e9d25293da3d3cb573 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 3 Jul 2025 18:57:59 +0200 Subject: [PATCH 2/5] Update (parziale) sel commesse --- MP.Stats/Components/SelectionFilter.razor | 86 +++++++++++------------ MP.Stats/MP.Stats.csproj | 4 +- MP.Stats/Resources/ChangeLog.html | 2 +- MP.Stats/Resources/VersNum.txt | 2 +- MP.Stats/Resources/manifest.xml | 2 +- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index 853c8941..6d7f846b 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -33,7 +33,7 @@
      -
      +
      -
      - @if (!string.IsNullOrEmpty(SearchCom) && SearchCom.Length >= minChar) - { +
      + @if (!OnlyEnergy) + { +
      - +
      + +
      +
      - @* - @foreach (var item in ddlCommesse) - { - - } - *@ - } -
      + @if (!string.IsNullOrEmpty(SearchCom) && SearchCom.Length >= minChar) + { +
      + +
      + } +
      + }
      -
      -
      -
      -
      - -
      - -
      - @if (!string.IsNullOrEmpty(SearchArt) && SearchArt.Length >= minChar) - { +
      + @if (!OnlyEnergy) + { +
      - +
      + +
      +
      - } -
      + @if (!string.IsNullOrEmpty(SearchArt) && SearchArt.Length >= minChar) + { +
      + +
      + } +
      + }
      diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 0b0befa8..02488d62 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2507.0315 - 6.16.2507.0315 + 6.16.2507.0318 + 6.16.2507.0318 true $(NoWarn);1591 en diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index 168f1c8c..d1dae0ff 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

      Versione: 6.16.2507.0315

      +

      Versione: 6.16.2507.0318


      Note di rilascio:
        diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 73d542ab..97418fc2 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2507.0315 +6.16.2507.0318 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index d86e0fa7..322add68 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2507.0315 + 6.16.2507.0318 https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false From 4f841a09ad0324decd399436e7ed1861c8530aab Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 4 Jul 2025 08:55:14 +0200 Subject: [PATCH 3/5] Fix controllo filtro (grafico) --- MP.Stats/Components/SelectionFilter.razor | 58 +++++++++++--------- MP.Stats/Components/SelectionFilter.razor.cs | 14 ++++- MP.Stats/MP.Stats.csproj | 4 +- MP.Stats/Pages/TrendAnalysis.razor | 17 +++++- MP.Stats/Pages/TrendAnalysis.razor.cs | 39 +++++++++++++ MP.Stats/Resources/ChangeLog.html | 2 +- MP.Stats/Resources/VersNum.txt | 2 +- MP.Stats/Resources/manifest.xml | 2 +- 8 files changed, 105 insertions(+), 33 deletions(-) diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index 6d7f846b..70f52143 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -31,9 +31,9 @@ -
        - -
        +
        + +
        @foreach (var item in ddlAzioni) @@ -61,48 +61,56 @@
        @if (!OnlyEnergy) { +
        -
        - -
        + @if (string.IsNullOrEmpty(SearchCom)) + { + + } + else + { + + } -
        - @if (!string.IsNullOrEmpty(SearchCom) && SearchCom.Length >= minChar) - { -
        - @foreach (var item in ddlCommesse) { } -
        - } + } +
        }
        @if (!OnlyEnergy) { +
        -
        - -
        + @if (string.IsNullOrEmpty(SearchArt)) + { + + } + else + { + + } -
        - @if (!string.IsNullOrEmpty(SearchArt) && SearchArt.Length >= minChar) - { -
        - @foreach (var item in ddlArticoli) { } -
        - } + } +
        }
        @@ -111,7 +119,7 @@

        - +
        diff --git a/MP.Stats/Components/SelectionFilter.razor.cs b/MP.Stats/Components/SelectionFilter.razor.cs index 9fc1ca50..ad4742fd 100644 --- a/MP.Stats/Components/SelectionFilter.razor.cs +++ b/MP.Stats/Components/SelectionFilter.razor.cs @@ -207,8 +207,20 @@ namespace MP.Stats.Components await reloadData(); } - protected void resetFilter() + protected void ResetArt() { + SearchArt = ""; + } + + protected void ResetCom() + { + SearchCom = ""; + } + + protected void ResetFilter() + { + SearchArt = ""; + SearchCom = ""; filterReset.InvokeAsync(SelFilter); } diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 02488d62..ffefb60e 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2507.0318 - 6.16.2507.0318 + 6.16.2507.0408 + 6.16.2507.0408 true $(NoWarn);1591 en diff --git a/MP.Stats/Pages/TrendAnalysis.razor b/MP.Stats/Pages/TrendAnalysis.razor index cb934cb1..f9ed5929 100644 --- a/MP.Stats/Pages/TrendAnalysis.razor +++ b/MP.Stats/Pages/TrendAnalysis.razor @@ -20,8 +20,21 @@
        - Max Points - + Res + + @if (ReqRes == ResolutionLevel.Custom) + { + + } + else + { + @MaxPoints + }
        diff --git a/MP.Stats/Pages/TrendAnalysis.razor.cs b/MP.Stats/Pages/TrendAnalysis.razor.cs index 9e090851..43acabaf 100644 --- a/MP.Stats/Pages/TrendAnalysis.razor.cs +++ b/MP.Stats/Pages/TrendAnalysis.razor.cs @@ -141,6 +141,45 @@ namespace MP.Stats.Pages private List PlotRecords; private List SearchRecords; + protected ResolutionLevel ReqRes + { + get => _reqRes; + set + { + if (_reqRes != value) + { + _reqRes = value; + if (value < ResolutionLevel.Custom) + { + int scale = 256; + switch (value) + { + case ResolutionLevel.Low: + MaxPoints = (int)Math.Round(totalCount / 10 / (double)scale) * scale; + break; + case ResolutionLevel.Med: + MaxPoints = (int)Math.Round(totalCount / 3 / (double)scale) * scale; + break; + case ResolutionLevel.High: + MaxPoints = (int)Math.Round(totalCount / (double)scale) * scale; + break; + default: + break; + } + } + } + } + } + private ResolutionLevel _reqRes = ResolutionLevel.Low; + + protected enum ResolutionLevel + { + Low, + Med, + High, + Custom + } + #endregion Private Fields #region Private Properties diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index d1dae0ff..cd76e83e 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

        Versione: 6.16.2507.0318

        +

        Versione: 6.16.2507.0408


        Note di rilascio:
          diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 97418fc2..2e4bfad5 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2507.0318 +6.16.2507.0408 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index 322add68..30a9a80e 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2507.0318 + 6.16.2507.0408 https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false From 08291444787d563fd9905c4b912bbf7ed2251cbb Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 4 Jul 2025 10:54:30 +0200 Subject: [PATCH 4/5] Inizio gestione calcolo spazio DB --- MP.Data/Controllers/MpLandController.cs | 83 +++++++++++++++ MP.Data/Controllers/MpStatsController.cs | 1 + MP.Data/DbModels/DbSizeModel.cs | 14 +++ MP.Data/MoonProContext.cs | 1 + MP.Data/MoonPro_FluxContext.cs | 1 + MP.Data/MoonPro_STATSContext.cs | 1 + MP.Data/Services/LandDataService.cs | 35 +++++++ MP.Land/Components/DbInfoMan.razor | 38 +++++++ MP.Land/Components/DbInfoMan.razor.cs | 127 +++++++++++++++++++++++ MP.Land/MP.Land.csproj | 2 +- MP.Land/Pages/DbInfo.razor | 3 + MP.Land/Pages/DbInfo.razor.cs | 25 +++++ MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- MP.Land/Shared/NavMenu.razor | 9 ++ MP.Land/appsettings.json | 2 + MP.TaskMan/TaskList.razor | 2 +- 18 files changed, 345 insertions(+), 5 deletions(-) create mode 100644 MP.Data/DbModels/DbSizeModel.cs create mode 100644 MP.Land/Components/DbInfoMan.razor create mode 100644 MP.Land/Components/DbInfoMan.razor.cs create mode 100644 MP.Land/Pages/DbInfo.razor create mode 100644 MP.Land/Pages/DbInfo.razor.cs diff --git a/MP.Data/Controllers/MpLandController.cs b/MP.Data/Controllers/MpLandController.cs index dab9748b..bed9195f 100644 --- a/MP.Data/Controllers/MpLandController.cs +++ b/MP.Data/Controllers/MpLandController.cs @@ -31,6 +31,89 @@ namespace MP.Data.Controllers #region Public Methods + /// + /// Restituisce info dimensione, tabelle e num righe DB gestiti + /// + /// + public List AllDbInfo() + { + List dbResult = new List(); + string stp_DbInfo = @" + ;WITH TableRowCounts AS ( + SELECT + t.name AS TableName, + SUM(p.rows) AS RowNum + FROM sys.tables t + JOIN sys.partitions p ON t.object_id = p.object_id + WHERE p.index_id IN (0, 1) -- heap or clustered index + GROUP BY t.name + ), + LargestTable AS ( + SELECT TOP 1 RowNum, TableName + FROM TableRowCounts + ORDER BY RowNum DESC + ) + SELECT + DB_name() as DbName, + CAST(SUM(size) * 8.0 / 1024 AS DECIMAL(18,2)) AS DbSizeMb, + (SELECT COUNT(*) FROM sys.tables) AS NumTables, + (SELECT TableName FROM LargestTable) AS BigTable, + (SELECT RowNum FROM LargestTable) AS BigTableRows + FROM sys.master_files + WHERE database_id = DB_ID(); + "; + + // leggo per DB principale + if (!string.IsNullOrEmpty(_configuration.GetConnectionString("MP.All"))) + { + using (var dbCtx = new MoonProContext(_configuration)) + { + var singleRes = dbCtx + .DbSetDbSize + .FromSqlRaw(stp_DbInfo) + .AsEnumerable() + .FirstOrDefault(); + if (singleRes != null) + { + dbResult.Add(singleRes); + } + } + } + // leggo per FluxLog + if (!string.IsNullOrEmpty(_configuration.GetConnectionString("MP.FluxLog"))) + { + using (var dbCtx = new MoonPro_FluxContext(_configuration)) + { + var singleRes = dbCtx + .DbSetDbSize + .FromSqlRaw(stp_DbInfo) + .AsEnumerable() + .FirstOrDefault(); + if (singleRes != null) + { + dbResult.Add(singleRes); + } + } + } + // leggo per Stats + if (!string.IsNullOrEmpty(_configuration.GetConnectionString("MP.Stats"))) + { + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + var singleRes = dbCtx + .DbSetDbSize + .FromSqlRaw(stp_DbInfo) + .AsEnumerable() + .FirstOrDefault(); + if (singleRes != null) + { + dbResult.Add(singleRes); + } + } + } + return dbResult; + } + /// /// Elenco da tabella Config /// diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index c0caef66..de6de2a3 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Data; using System.Drawing.Drawing2D; using System.Linq; +using ZXing; using static MP.Core.Objects.Enums; namespace MP.Data.Controllers diff --git a/MP.Data/DbModels/DbSizeModel.cs b/MP.Data/DbModels/DbSizeModel.cs new file mode 100644 index 00000000..1704ae77 --- /dev/null +++ b/MP.Data/DbModels/DbSizeModel.cs @@ -0,0 +1,14 @@ +using System.ComponentModel.DataAnnotations; + +namespace MP.Data.DbModels +{ + public class DbSizeModel + { + [Key] + public string DbName { get; set; } = ""; + public decimal DbSizeMb { get; set; } = 0; + public int NumTables { get; set; } = 0; + public string BigTable { get; set; } = ""; + public long BigTableRows { get; set; } = 0; + } +} diff --git a/MP.Data/MoonProContext.cs b/MP.Data/MoonProContext.cs index ac80eb39..71dd2d6f 100644 --- a/MP.Data/MoonProContext.cs +++ b/MP.Data/MoonProContext.cs @@ -38,6 +38,7 @@ namespace MP.Data #region Public Properties + public virtual DbSet DbSetDbSize { get; set; } public virtual DbSet DbSetAlarmLog { get; set; } public virtual DbSet DbSetAKV { get; set; } public virtual DbSet DbSetAnagEventi { get; set; } diff --git a/MP.Data/MoonPro_FluxContext.cs b/MP.Data/MoonPro_FluxContext.cs index 9c14f8bf..f68e84eb 100644 --- a/MP.Data/MoonPro_FluxContext.cs +++ b/MP.Data/MoonPro_FluxContext.cs @@ -48,6 +48,7 @@ namespace MP.Data #region Public Properties + public virtual DbSet DbSetDbSize { get; set; } public virtual DbSet DbSetArticoli { get; set; } public virtual DbSet DbSetMacchine { get; set; } public virtual DbSet DbSetFluxLog { get; set; } diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index 99a48f37..88fe6708 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -36,6 +36,7 @@ namespace MP.Data #region Public Properties + public virtual DbSet DbSetDbSize { get; set; } public virtual DbSet DbSetAnagFLTrans { get; set; } public virtual DbSet DbSetArticoli { get; set; } public virtual DbSet DbSetAzioniUL { get; set; } diff --git a/MP.Data/Services/LandDataService.cs b/MP.Data/Services/LandDataService.cs index 0fc7e0dc..bb86cc63 100644 --- a/MP.Data/Services/LandDataService.cs +++ b/MP.Data/Services/LandDataService.cs @@ -47,6 +47,41 @@ namespace MP.Data.Services #region Public Methods + /// + /// Restituisce info dimensione, tabelle e num righe DB + /// + /// + public List AllDbInfo() + { + // setup parametri costanti + string source = "DB"; + Stopwatch sw = new Stopwatch(); + sw.Start(); + List result = new List(); + // cerco in redis... + string currKey = $"{redisBaseKey}:DbInfo:ALL"; + RedisValue rawData = redisDb.StringGet(currKey); + if (rawData.HasValue) + { + result = JsonConvert.DeserializeObject>($"{rawData}"); + source = "REDIS"; + } + else + { + result = dbController.AllDbInfo(); + // serializzo e salvo... + rawData = JsonConvert.SerializeObject(result); + redisDb.StringSet(currKey, rawData, UltraFastCache); + } + if (result == null) + { + result = new List(); + } + sw.Stop(); + Log.Debug($"AllDbInfo | {source} | {sw.Elapsed.TotalMilliseconds}ms"); + return result; + } + /// /// Elenco INFO IOB da tab Macchine gestite + RemoteRebootLog /// diff --git a/MP.Land/Components/DbInfoMan.razor b/MP.Land/Components/DbInfoMan.razor new file mode 100644 index 00000000..2a859410 --- /dev/null +++ b/MP.Land/Components/DbInfoMan.razor @@ -0,0 +1,38 @@ +
          +
          +
          Current DB Info
          +
          +
          + @if (ListRecord == null || ListRecord.Count == 0) + { +
          Nessun record disponibile
          + } + else + { + + + + + + + + + + + + @foreach (var item in ListRecord) + { + + + + + + + + } + +
          DB Size (Mb) Num Tab Biggest Tab Num Rows
          @item.DbName@item.DbSizeMb.ToString("N2")@item.NumTables@item.BigTable@item.BigTableRows.ToString("N0")
          + } +
          +
          + diff --git a/MP.Land/Components/DbInfoMan.razor.cs b/MP.Land/Components/DbInfoMan.razor.cs new file mode 100644 index 00000000..aae03d69 --- /dev/null +++ b/MP.Land/Components/DbInfoMan.razor.cs @@ -0,0 +1,127 @@ +using EgwCoreLib.Razor; +using Microsoft.AspNetCore.Components; +using MP.Data.DbModels; +using MP.Data.Services; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace MP.Land.Components +{ + public partial class DbInfoMan + { + #region Protected Properties + + [Inject] + protected LandDataService LDService { get; set; } + + protected List ListRecord { get; set; } = new List(); + + #endregion Protected Properties + + #region Protected Methods + + protected override void OnParametersSet() + { + ReloadData(); + } + + protected void SortRequested(Sorter.SortCallBack e) + { + if (sortField == e.ParamName) + { + sortAsc = e.IsAscending; + } + sortField = e.ParamName; + RefreshDisplay(); + } + + #endregion Protected Methods + + #region Private Fields + + private bool sortAsc = true; + + private string sortField = ""; + + #endregion Private Fields + + #region Private Methods + + private void RefreshDisplay() + { + // se ho ordinamento riordino... + if (!string.IsNullOrEmpty(sortField)) + { + switch (sortField) + { + case "DbName": + if (sortAsc) + { + ListRecord = ListRecord.OrderBy(x => x.DbName).ToList(); + } + else + { + ListRecord = ListRecord.OrderByDescending(x => x.DbName).ToList(); + } + break; + + case "DbSizeMb": + if (sortAsc) + { + ListRecord = ListRecord.OrderBy(x => x.DbSizeMb).ToList(); + } + else + { + ListRecord = ListRecord.OrderByDescending(x => x.DbSizeMb).ToList(); + } + break; + + case "NumTable": + if (sortAsc) + { + ListRecord = ListRecord.OrderBy(x => x.NumTables).ToList(); + } + else + { + ListRecord = ListRecord.OrderByDescending(x => x.NumTables).ToList(); + } + break; + + case "BigTable": + if (sortAsc) + { + ListRecord = ListRecord.OrderBy(x => x.BigTable).ToList(); + } + else + { + ListRecord = ListRecord.OrderByDescending(x => x.BigTable).ToList(); + } + break; + + case "BigTableRows": + if (sortAsc) + { + ListRecord = ListRecord.OrderBy(x => x.BigTableRows).ToList(); + } + else + { + ListRecord = ListRecord.OrderByDescending(x => x.BigTableRows).ToList(); + } + break; + + default: + ListRecord = ListRecord.OrderBy(x => x.DbName).ToList(); + break; + } + } + } + + private void ReloadData() + { + ListRecord = LDService.AllDbInfo(); + } + + #endregion Private Methods + } +} \ No newline at end of file diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 706d4fcd..7cfe02cc 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2507.0315 + 6.16.2507.0410 Debug;Release;Debug_LiManDebug en True diff --git a/MP.Land/Pages/DbInfo.razor b/MP.Land/Pages/DbInfo.razor new file mode 100644 index 00000000..06e365c3 --- /dev/null +++ b/MP.Land/Pages/DbInfo.razor @@ -0,0 +1,3 @@ +@page "/DbInfo" + + diff --git a/MP.Land/Pages/DbInfo.razor.cs b/MP.Land/Pages/DbInfo.razor.cs new file mode 100644 index 00000000..633831f8 --- /dev/null +++ b/MP.Land/Pages/DbInfo.razor.cs @@ -0,0 +1,25 @@ +using Microsoft.AspNetCore.Components; + +namespace MP.Land.Pages +{ + public partial class DbInfo : ComponentBase + { + #region Protected Properties + + [Inject] + protected Data.LMessageService MServ { get; set; } = null!; + + #endregion Protected Properties + + #region Protected Methods + + protected override void OnInitialized() + { + MServ.ShowSearch = true; + MServ.PageName = "DB Info"; + MServ.PageIcon = "fas fa-database"; + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 87d53175..48206a7d 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo Tablet MAPO - DotNet6 -

          Versione: 6.16.2507.0315

          +

          Versione: 6.16.2507.0410


          Note di rilascio:
            diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index 73d542ab..354b295b 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2507.0315 +6.16.2507.0410 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index 62008499..3b3319ac 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2507.0315 + 6.16.2507.0410 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false diff --git a/MP.Land/Shared/NavMenu.razor b/MP.Land/Shared/NavMenu.razor index e06bfc1e..519ba0ba 100644 --- a/MP.Land/Shared/NavMenu.razor +++ b/MP.Land/Shared/NavMenu.razor @@ -99,6 +99,15 @@
        @if (IsSuperAdmin) { +
        + + + @if (showText) + { + DBs Info + } + +
        diff --git a/MP.Land/appsettings.json b/MP.Land/appsettings.json index a53ef24a..c8175eed 100644 --- a/MP.Land/appsettings.json +++ b/MP.Land/appsettings.json @@ -58,9 +58,11 @@ "ConnectionStrings": { "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true", "MP.All": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;", + "MP.FluxLog": "Server=SQL2016DEV;Database=MoonPro_FluxData;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;", "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;", "MP.Land.Auth": "Server=SQL2016DEV;Database=MoonPro_Anagrafica;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;", "MP.Tab": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.Land;", + "MP.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.Land;", //"Redis": "redis.ufficio:26379, serviceName=devel, defaultDatabase=1, keepAlive=180, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, allowAdmin=true", "Redis": "redis.ufficio:26379, serviceName=devel, DefaultDatabase=5, keepAlive=180, connectTimeout=15000, syncTimeout=15000, asyncTimeout=15000, abortConnect=false, ssl=false, allowAdmin=true" }, diff --git a/MP.TaskMan/TaskList.razor b/MP.TaskMan/TaskList.razor index ae310443..1d8418d1 100644 --- a/MP.TaskMan/TaskList.razor +++ b/MP.TaskMan/TaskList.razor @@ -48,7 +48,7 @@ } else if (SearchRecords.Count==0) { -
        Nessun record trovato dati i criteri espressi
        +
        Nessun record trovato
        } else { From 90b568160329609e9b2c95545910c40e8d272c8c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 4 Jul 2025 11:21:38 +0200 Subject: [PATCH 5/5] Fix calcolo size DB x LAND --- MP.Data/MoonProContext.cs | 12 ++++++++---- MP.Land/MP.Land.csproj | 2 +- MP.Land/Pages/IobList.razor | 1 + MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/MP.Data/MoonProContext.cs b/MP.Data/MoonProContext.cs index 71dd2d6f..60c35a10 100644 --- a/MP.Data/MoonProContext.cs +++ b/MP.Data/MoonProContext.cs @@ -123,6 +123,14 @@ namespace MP.Data { string connString = _configuration.GetConnectionString("MP.Data"); if (string.IsNullOrEmpty(connString)) + { + connString = _configuration.GetConnectionString("MP.All"); + } + if (string.IsNullOrEmpty(connString)) + { + connString = _configuration.GetConnectionString("MP.Land"); + } + if (string.IsNullOrEmpty(connString)) { connString = _configuration.GetConnectionString("MP.Mon"); } @@ -130,10 +138,6 @@ namespace MP.Data { connString = _configuration.GetConnectionString("MP.STATS"); } - if (string.IsNullOrEmpty(connString)) - { - connString = _configuration.GetConnectionString("MP.Land"); - } optionsBuilder.UseSqlServer(connString); //optionsBuilder.UseSqlServer("Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;"); diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 7cfe02cc..ef5c9dad 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2507.0410 + 6.16.2507.0411 Debug;Release;Debug_LiManDebug en True diff --git a/MP.Land/Pages/IobList.razor b/MP.Land/Pages/IobList.razor index 03d00c5c..70a03b07 100644 --- a/MP.Land/Pages/IobList.razor +++ b/MP.Land/Pages/IobList.razor @@ -157,6 +157,7 @@ } + diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 48206a7d..9c851c87 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo Tablet MAPO - DotNet6 -

        Versione: 6.16.2507.0410

        +

        Versione: 6.16.2507.0411


        Note di rilascio:
          diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index 354b295b..cd93bcba 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2507.0410 +6.16.2507.0411 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index 3b3319ac..61b93620 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2507.0410 + 6.16.2507.0411 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false