diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index 586f068a..83d8498c 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -17,6 +17,7 @@ + diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj index 04e8ed68..3d658b8d 100644 --- a/MP.INVE/MP.INVE.csproj +++ b/MP.INVE/MP.INVE.csproj @@ -5,7 +5,7 @@ enable enable MP.INVE - 6.16.2302.316 + 6.16.2302.2309 diff --git a/MP.INVE/Pages/Invio.razor.cs b/MP.INVE/Pages/Invio.razor.cs index 008165df..4e2bd6ca 100644 --- a/MP.INVE/Pages/Invio.razor.cs +++ b/MP.INVE/Pages/Invio.razor.cs @@ -129,8 +129,8 @@ namespace MP.INVE.Pages mostra = true; } - protected override async Task OnAfterRenderAsync(bool firstRender) - { + protected override async Task OnAfterRenderAsync(bool firstRender) + { await Task.Delay(50); if (firstRender) { diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html index d72b423b..000ed40f 100644 --- a/MP.INVE/Resources/ChangeLog.html +++ b/MP.INVE/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOINVE -

Versione: 6.16.2302.316

+

Versione: 6.16.2302.2309


Note di rilascio:
  • diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt index f4429b18..b1641a8c 100644 --- a/MP.INVE/Resources/VersNum.txt +++ b/MP.INVE/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2302.316 +6.16.2302.2309 diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml index 3f8ef48b..7158a0fb 100644 --- a/MP.INVE/Resources/manifest.xml +++ b/MP.INVE/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2302.316 + 6.16.2302.2309 https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html false diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj index ae8af523..028eaea5 100644 --- a/MP.Prog/MP.Prog.csproj +++ b/MP.Prog/MP.Prog.csproj @@ -3,7 +3,7 @@ net6.0 MP.Prog - 6.16.2212.2917 + 6.16.2306.0612 diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html index 88f38ae0..f3014b43 100644 --- a/MP.Prog/Resources/ChangeLog.html +++ b/MP.Prog/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

    Versione: 6.16.2212.2917

    +

    Versione: 6.16.2306.0612


    Note di rilascio:
      diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt index 2641f650..4bc5312b 100644 --- a/MP.Prog/Resources/VersNum.txt +++ b/MP.Prog/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2212.2917 +6.16.2306.0612 diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml index 966edd03..646b64f5 100644 --- a/MP.Prog/Resources/manifest.xml +++ b/MP.Prog/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2212.2917 + 6.16.2306.0612 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 diff --git a/MP.SPEC/.config/dotnet-tools.json b/MP.SPEC/.config/dotnet-tools.json new file mode 100644 index 00000000..b0e38abd --- /dev/null +++ b/MP.SPEC/.config/dotnet-tools.json @@ -0,0 +1,5 @@ +{ + "version": 1, + "isRoot": true, + "tools": {} +} \ No newline at end of file diff --git a/MP.SPEC/Components/Chart/Doughnut.razor b/MP.SPEC/Components/Chart/Doughnut.razor deleted file mode 100644 index 7eddca28..00000000 --- a/MP.SPEC/Components/Chart/Doughnut.razor +++ /dev/null @@ -1 +0,0 @@ - diff --git a/MP.SPEC/Components/Chart/Doughnut.razor.cs b/MP.SPEC/Components/Chart/Doughnut.razor.cs deleted file mode 100644 index db7524d9..00000000 --- a/MP.SPEC/Components/Chart/Doughnut.razor.cs +++ /dev/null @@ -1,59 +0,0 @@ -using Microsoft.AspNetCore.Components; -using Microsoft.JSInterop; -using MP.Data; -using MP.SPEC.Data; -using static System.Net.Mime.MediaTypeNames; - -namespace MP.SPEC.Components.Chart -{ - public partial class Doughnut - { - [Inject] - private IJSRuntime JSRuntime { get; set; } = null!; - - - public enum ChartType - { - Pie, - Bar, - Doughnut - } - - //[Parameter] - public string Id { get; set; } = "myChart"; - - [Parameter] - public ChartType Type { get; set; } - - [Parameter] - public double[] Data { get; set; } = null!; - [Parameter] - public List BackgroundColor { get; set; } = null!; - - [Parameter] - public string[] Labels { get; set; } = null!; - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - var config = new - { - Type = Type.ToString().ToLower(), - Options = new - { - Responsive = true, - }, - Data = new - { - Datasets = new[] - { - new { Data = Data, BackgroundColor = BackgroundColor.Select(x=>x.color), borderColor = BackgroundColor.Select(x=>x.border), borderWidth= 0, offset= 1, borderRadius = 0 - } -}, - Labels = Labels - } - }; - - await JSRuntime.InvokeVoidAsync("setup", Id, config); - } - } -} \ No newline at end of file diff --git a/MP.SPEC/Components/ODLPlot.razor b/MP.SPEC/Components/ODLPlot.razor index ac762f00..a304ea42 100644 --- a/MP.SPEC/Components/ODLPlot.razor +++ b/MP.SPEC/Components/ODLPlot.razor @@ -9,7 +9,7 @@ { @if (Data != null) { - + } } diff --git a/MP.SPEC/Components/ODLPlot.razor.cs b/MP.SPEC/Components/ODLPlot.razor.cs index d14c1fcb..f554545d 100644 --- a/MP.SPEC/Components/ODLPlot.razor.cs +++ b/MP.SPEC/Components/ODLPlot.razor.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Components; +using EgwCoreLib.Razor.Data; +using Microsoft.AspNetCore.Components; using MP.Data.DatabaseModels; using MP.SPEC.Data; diff --git a/MP.SPEC/Data/DoughnutStyling.cs b/MP.SPEC/Data/DoughnutStyling.cs deleted file mode 100644 index 54a76b53..00000000 --- a/MP.SPEC/Data/DoughnutStyling.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Drawing; - -namespace MP.SPEC.Data -{ - public class DoughnutStyling - { - public string color { get; set; } - public string border { get; set; } - - public DoughnutStyling(string color, string border) - { - this.color = color; - this.border = border; - } - } -} diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index f6142ab5..c44b104e 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2302.315 + 6.16.2306.2916 @@ -29,7 +29,7 @@ - + diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index d5e65297..ea67caf6 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

      Versione: 6.16.2302.315

      +

      Versione: 6.16.2306.2916


      Note di rilascio:
      • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 0e6993b1..bc455bdc 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2302.315 +6.16.2306.2916 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 2276dbd6..8b3771a5 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2302.315 + 6.16.2306.2916 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false diff --git a/MP.SPEC/wwwroot/images/LogoEgw.png b/MP.SPEC/wwwroot/images/LogoEgw.png deleted file mode 100644 index 8d5a7c1f..00000000 Binary files a/MP.SPEC/wwwroot/images/LogoEgw.png and /dev/null differ